From 91ffe4a128d8356d473775c2f2b9719a9cccccda Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 11 Oct 2019 10:10:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8D=A1=E6=94=AF=E4=BB=98=E5=BC=82?= =?UTF-8?q?=E5=B8=B8][=E4=BF=AE=E6=94=B9]:=E4=B8=8D=E5=88=86=E8=B4=A6,=20?= =?UTF-8?q?=E5=8D=A1=E6=94=AF=E4=BB=98=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxPayOrderServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 003c319d5..494a7ac01 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -226,6 +226,8 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setPayVendor(EnumPayWay.PAY_WAY_WEAPP.getCode()); record.setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); record.setShare(isShare.getCode()); + record.setShareAmount(0); // 不分账时,默认设为0 + record.setRateAmount(0); // 不分账时,默认设为0 if (isShare == EnumPayShare.YES) { // 分账金额 int iChargeFee = PayUtils.getPayRate(record.getPayAmount(), payAccount.getRate(), false); From c524bc4209dfa5d2267637b80f83cebe21877904 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 11 Oct 2019 10:14:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8D=A1=E6=94=AF=E4=BB=98=E5=BC=82?= =?UTF-8?q?=E5=B8=B8][=E4=BF=AE=E6=94=B9]:=E4=B8=8D=E5=88=86=E8=B4=A6,=20?= =?UTF-8?q?=E5=8D=A1=E6=94=AF=E4=BB=98=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxOrderServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 a6aa3088c..e871ff126 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -714,7 +714,11 @@ public class WxOrderServiceImpl implements WxOrderService { } catch (Exception e) { logger.error("payOrder not found:" + e.getMessage()); } - fee = payOrder.getPayAmount() - payOrder.getShareAmount(); + if (payOrder.getShareAmount() != null) { + fee = payOrder.getPayAmount() - payOrder.getShareAmount(); + } else { + fee = payOrder.getPayAmount(); + } cardInfo.setTransactionId(payOrder.getTransactionId()); cardInfo.setShareFeeAmount(payOrder.getShareAmount()); cardInfo.setRemainingShareFeeAmount(payOrder.getShareAmount());