From bdaf77dd56843dc4b2a1f30359429f73bbf5e600 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 20 Aug 2020 18:04:44 +0800 Subject: [PATCH] update --- .../com/iformall/controller/WxMicroPayController.java | 3 ++- .../service/impl/WxCouponOrderServiceImpl.java | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java index 642cb6663..4f45cedd6 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -447,7 +447,8 @@ public class WxMicroPayController extends BaseController { if (wxCouponOrder != null) { try { couponPayOrder = wxCouponOrderService.microPayPreVerify(microOrder, wxCouponOrder, wxMerchantBUser, payPrice,payWay,ipStr,authCode); - remainPrice = microOrder.getPayment() - couponPayOrder.getPayAmount(); + //remainPrice = microOrder.getPayment() - couponPayOrder.getPayAmount(); + remainPrice = couponPayOrder.getPayAmount(); // 更新实际支付金额 WxOrder updateOrder = new WxOrder(); updateOrder.setId(microOrder.getId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 1546cef53..14dceb4ef 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1370,11 +1370,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { setPayOrderNo(String.valueOf(payOrderId)); setIp(ipstr); setAuthCode(authCode); - if (microOrder.getPayment() > wxCoupon.getPrice()) { - setPayAmount(wxCoupon.getPrice()); - } else { - setPayAmount(microOrder.getPayment()); - } + setPayAmount(microOrder.getPayment() - wxCoupon.getPrice()); +// if (microOrder.getPayment() > wxCoupon.getPrice()) { +// setPayAmount(wxCoupon.getPrice()); +// } else { +// setPayAmount(microOrder.getPayment()); +// } setPayVendor(payWay.getCode()); setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); setShare(EnumPayShare.NO.getCode());