From c524bc4209dfa5d2267637b80f83cebe21877904 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 11 Oct 2019 10:14:26 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E6=94=AF=E4=BB=98=E5=BC=82=E5=B8=B8]?= =?UTF-8?q?[=E4=BF=AE=E6=94=B9]:=E4=B8=8D=E5=88=86=E8=B4=A6,=20=E5=8D=A1?= =?UTF-8?q?=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());