From f9d7608116931b243a3e369136ff68bb7189f6bd Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 31 Oct 2019 22:38:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=94=B6=E9=93=B6=E5=8F=B0][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E6=94=B6=E9=93=B6=E5=8F=B0bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V201910312205__ALTER_ORDER.sql | 2 ++ .../java/com/iformall/controller/WxMicroPayController.java | 3 ++- .../src/main/java/com/iformall/domain/po/WxOrder.java | 4 ++-- .../java/com/iformall/service/impl/WxOrderServiceImpl.java | 2 +- .../com/iformall/service/impl/WxPayOrderServiceImpl.java | 5 ++--- 5 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201910312205__ALTER_ORDER.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201910312205__ALTER_ORDER.sql b/mallinkAdmin/src/main/resources/db/migration/V201910312205__ALTER_ORDER.sql new file mode 100644 index 000000000..1fdcd40bf --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201910312205__ALTER_ORDER.sql @@ -0,0 +1,2 @@ +ALTER TABLE `wx_order` +CHANGE COLUMN `real_payment` `total_payment` int(11) NULL COMMENT '总计支付金额'; \ No newline at end of file diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java index ca8084873..dc90b8207 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -417,9 +417,10 @@ public class WxMicroPayController extends BaseController { try { couponPayOrder = wxCouponOrderService.microPayPreVerify(microOrder, wxCouponOrder, wxMerchantBUser, payPrice); remainPrice = microOrder.getPayment() - couponPayOrder.getPayAmount(); + // 更新实际支付金额 WxOrder updateOrder = new WxOrder(); updateOrder.setId(microOrder.getId()); - updateOrder.setRealPayment(remainPrice); + updateOrder.setPayment(remainPrice); wxOrderService.saveOrUpdate(updateOrder); } catch (MallinkException e) { logger.error("核销异常: " + e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java index 8bc7a8256..b890d3cf9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java @@ -91,8 +91,8 @@ public class WxOrder extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="POS SN",name="posOrderCreateSn") private String posOrderCreateSn; - @io.swagger.annotations.ApiModelProperty(value="实际支付金额(分),收银台用券时使用",name="realPayment") - private Integer realPayment; + @io.swagger.annotations.ApiModelProperty(value="总计支付金额(分),收银台用券时使用",name="totalPayment") + private Integer totalPayment; @TableField(exist = false) protected List statusS; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 83a990ef2..89c22e2fc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -595,7 +595,7 @@ public class WxOrderServiceImpl implements WxOrderService { record.setProductId(user.getId()); record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); record.setPayment(payment); - record.setRealPayment(payment); + record.setTotalPayment(payment); record.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); record.setDetail(bodyStr); record.setCreateDate(curr); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index c2dcd2903..ce00a6a99 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -1316,7 +1316,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { WxAppinfo appinfo = wxAppinfoService.getCAppInfo(order.getTenantId()); - // add c_user + // add c_user, 收银台支付和券支付可能不是同一个人 Date curDate = new Date(); WxCUser userQ = new WxCUser(); userQ.setOpenId(openId); @@ -1360,10 +1360,9 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "支付订单数据库更新失败: " + e.getMessage()); } - // B端收银台核销券处理 + // B端收银台核销券处理, 收银台支付和券支付可能不是同一个人 WxPayOrder payOrderQ = new WxPayOrder(); payOrderQ.setOrderId(order.getId()); - payOrderQ.setCUserId(userQ.getId()); payOrderQ.setPayFrom(EnumPayFrom.INSIDE_B.getCode()); payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); try {