From bc161bdb71eeefd2ce534aebff65cecfb28ce1f0 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 30 Sep 2021 12:47:47 +0800 Subject: [PATCH] fix mircpay bug --- .../iformall/controller/WxMicroPayController.java | 2 -- .../service/impl/WxPayOrderServiceImpl.java | 13 ++++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java index ac5be331e..b693979ac 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -381,8 +381,6 @@ public class WxMicroPayController extends BaseController { @PostMapping("pay_order_create_v2") public ResultData saveMicopayPayOrder(@RequestBody Map paramMap, HttpServletRequest request) { logger.info("saveMicopayPayOrder: " + paramMap.toString()); - Integer i = null; - System.out.println(i.intValue()); String orderIdStr = paramMap.get("orderId"); String couponOrderIdStr = paramMap.get("couponOrderId"); String authCode = paramMap.get("authCode"); 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 fabc0e7f5..3c92ea37a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -515,7 +515,18 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } } else { record = list.get(0); - record.setShare(isShare.getCode()); + if (null == record.getShare()) { + if (isShare == EnumPayShare.YES) { + int iChargeFee = OrderHelper.getMallCharge(record.getPayAmount(), payAccount); + Integer share_amount = record.getPayAmount() - iChargeFee; + if (share_amount <= 0) { + isShare = EnumPayShare.NO; + } + } + record.setShare(isShare.getCode()); + }else { + isShare = EnumPayShare.getEnum(record.getShare()); + } payOrderNo = String.valueOf(record.getId()); }