From edf99ce97c97be17036de50c8320b3cdf8c69a1d Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 28 Apr 2021 13:18:48 +0800 Subject: [PATCH] fix shouyintai --- .../service/impl/WxPayOrderServiceImpl.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) 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 6dd7a0533..fddd7ce1e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -1068,11 +1068,19 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { merchantSubsidy.setMerchantId(wxMerchantBUser.getMerchantId()); merchantSubsidy.setCouponOrderId(0L); merchantSubsidy.setCouponType(0); - merchantSubsidy.setOrderPayment(record.getPayAmount()); - merchantSubsidy.setReceiverPayment(record.getPayAmount()); - merchantSubsidy.setRealPayment(record.getPayAmount()); - merchantSubsidy.setSubsidy(record.getPayAmount()); - merchantSubsidy.setRealSubsidy(record.getPayAmount()); + if (null == record.getPayAmount()) { + merchantSubsidy.setOrderPayment(order.getPayment()); + merchantSubsidy.setReceiverPayment(order.getPayment()); + merchantSubsidy.setRealPayment(order.getPayment()); + merchantSubsidy.setSubsidy(order.getPayment()); + merchantSubsidy.setRealSubsidy(order.getPayment()); + }else { + merchantSubsidy.setOrderPayment(record.getPayAmount()); + merchantSubsidy.setReceiverPayment(record.getPayAmount()); + merchantSubsidy.setRealPayment(record.getPayAmount()); + merchantSubsidy.setSubsidy(record.getPayAmount()); + merchantSubsidy.setRealSubsidy(record.getPayAmount()); + } merchantSubsidy.setCreateDate(curDate); merchantSubsidy.setUpdateDate(curDate); merchantSubsidy.setStatus(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode());