From 84ef38cf73b59fa25e43e83604c03c40e91ca1d4 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 10 Nov 2018 17:39:58 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=94=AF=E4=BB=98=E7=8A=B6=E6=80=81=E6=95=B4?= =?UTF-8?q?=E7=90=86][=E6=94=AF=E4=BB=98]:=E6=94=AF=E4=BB=98=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxPayBillController.java | 4 +-- .../service/impl/WxPayBillServiceImpl.java | 30 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java index 769f6bedd..ea1cc5ba9 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxPayBillController.java @@ -126,10 +126,10 @@ public class WxPayBillController extends BaseController { payBill.setPayBillStatus(status); payBill.setFailReason(reasonStr); try { - if(status.equals(EnumPayStatus.PAY_WAY_SUCCESS.getCode()) && !payBillIdStr.equals(EnumPayStatus.PAY_WAY_WAIT.getCode())) { + if(status.equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()) && !payBillIdStr.equals(EnumPayStatus.PAY_STATUS_WAIT.getCode())) { // 有价券不走update, callback更新 payBill = wxPayBillService.getById(payBillId); - if(payBill.getPayBillStatus().equals(EnumPayStatus.PAY_WAY_SUCCESS.getCode())) { + if(payBill.getPayBillStatus().equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode())) { return new ResultData(Result.SUCCESS, "支付状态更新成功"); } else { return new ResultData(ErrorCode.PAY_ORDER_ERROR, "支付未状态,请等待!!"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java index facc63942..4b4be7b3a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java @@ -111,7 +111,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { // 2. check 是否有支付订单 Date currentDate = new Date(); - record.setPayBillStatus(EnumPayStatus.PAY_WAY_WAIT.getCode()); + record.setPayBillStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); List list = wxPayBillMapper.findList(record); String payBillNo; if (list.size() <= 0) { @@ -129,7 +129,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { record.setPayBillNo(payBillNo); record.setPayAmount((Integer) bill.get("owe")); record.setPayVendor(EnumPayWay.PAY_WAY_WEAPP.getCode()); - record.setPayBillStatus(EnumPayStatus.PAY_WAY_WAIT.getCode()); + record.setPayBillStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); record.setShare(isShare.getCode()); int sqlRow = wxPayBillMapper.insertSelective(record); @@ -398,13 +398,13 @@ public class WxPayBillServiceImpl implements WxPayBillService { //USERPAYING--用户支付中 //PAYERROR--支付失败(其他原因,如银行返回失败) if ("SUCCESS".equals(trade_state)) { - record.setPayBillStatus(EnumPayStatus.PAY_WAY_SUCCESS.getCode()); + record.setPayBillStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); handlePayBillStatusUpdate(record); } else if ("USERPAYING".equals(trade_state)) { - record.setPayBillStatus(EnumPayStatus.PAY_WAY_WAIT.getCode()); + record.setPayBillStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); handlePayBillStatusUpdate(record); } else { - record.setPayBillStatus(EnumPayStatus.PAY_WAY_FAIL.getCode()); + record.setPayBillStatus(EnumPayStatus.PAY_STATUS_FAIL.getCode()); handlePayBillStatusUpdate(record); } return new ResultData(Result.SUCCESS, "订单查询成功", returnMap); @@ -488,7 +488,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { Map returnMap = WxPayment.xmlToMap(response); String result_code = returnMap.get("result_code"); if ("SUCCESS".equals(result_code)) { - record.setPayBillStatus(EnumPayStatus.PAY_WAY_CANCEL.getCode()); + record.setPayBillStatus(EnumPayStatus.PAY_STATUS_CANCEL.getCode()); handlePayBillStatusUpdate(record); return new ResultData(Result.SUCCESS, "订单关闭成功", returnMap); } else { @@ -646,7 +646,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { Date currentDate = new Date(); EnumPayStatus payStatus = EnumPayStatus.getEnum(record.getPayBillStatus()); // 判断支付状态 - if (payStatus == EnumPayStatus.PAY_WAY_SUCCESS) { + if (payStatus == EnumPayStatus.PAY_STATUS_SUCCESS) { // 已经是成功状态,只更新transactionId try { record.setUpdateTime(currentDate); @@ -658,7 +658,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { } return; } - if (payStatus != EnumPayStatus.PAY_WAY_WAIT) { + if (payStatus != EnumPayStatus.PAY_STATUS_WAIT) { logger.error("pay success handle, payBill " + record.getPayBillNo() + "is paid success , billId : " + record.getBillId()); return; @@ -683,7 +683,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { updateBill.setId(record.getId()); updateBill.setBillId(record.getBillId()); updateBill.setUpdateTime(currentDate); - updateBill.setPayBillStatus(EnumPayStatus.PAY_WAY_SUCCESS.getCode()); + updateBill.setPayBillStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); updateBill.setTransactionId(transactionId); try { wxPayBillMapper.updateByPrimaryKeySelective(updateBill); @@ -709,7 +709,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void handlePayBillStatusUpdate(WxPayBill record) { // 判断支付状态 - if (record.getPayBillStatus().equals(EnumPayStatus.PAY_WAY_WAIT.getCode())) { + if (record.getPayBillStatus().equals(EnumPayStatus.PAY_STATUS_WAIT.getCode())) { logger.error("pay handle, payBill " + record.getPayBillNo() + "is complete, billId : " + record.getBillId()); return; @@ -761,13 +761,13 @@ public class WxPayBillServiceImpl implements WxPayBillService { throw new MallinkException(ErrorCode.PAY_ORDER_NOT_FOUND); } - if (record.getPayBillStatus().equals(EnumPayStatus.PAY_WAY_CANCEL.getCode())) { + if (record.getPayBillStatus().equals(EnumPayStatus.PAY_STATUS_CANCEL.getCode())) { // 支付订单取消 if (record.getPayAmount() > 0) { payBillQ = new WxPayBill(); payBillQ.setTenantId(bill.get("tenantId").toString()); payBillQ.setBillId(record.getBillId()); - payBillQ.setPayBillStatus(EnumPayStatus.PAY_WAY_WAIT.getCode()); + payBillQ.setPayBillStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); List payBills = wxPayBillMapper.select(payBillQ); for (WxPayBill payBill : payBills) { payBillClose(appInfo, payBill); @@ -775,7 +775,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { } } else { // 支付订单成功? - if (updateBill.getPayBillStatus().equals(EnumPayStatus.PAY_WAY_SUCCESS.getCode())) { + if (updateBill.getPayBillStatus().equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode())) { if (StringUtils.isBlank(updateBill.getTransactionId())) { // 回调已设置成功 // 继续修改订单状态 @@ -783,7 +783,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { // 回调异常 throw new MallinkException(ErrorCode.PAY_ORDER_ERROR.getCode(), "transactionId未获取"); } - } else if (updateBill.getPayBillStatus().equals(EnumPayStatus.PAY_WAY_WAIT.getCode())) { + } else if (updateBill.getPayBillStatus().equals(EnumPayStatus.PAY_STATUS_WAIT.getCode())) { // 回调未返回,主动检查支付订单状态 try { record.setPayBillNo(String.valueOf(record.getId())); @@ -821,7 +821,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { } // 修改账单状态 - if (record.getPayBillStatus().equals(EnumPayStatus.PAY_WAY_SUCCESS.getCode())) { + if (record.getPayBillStatus().equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode())) { try { int _count = wxBillAllService.updateBill(bill); if (_count > 1) {