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()); 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);