Просмотр исходного кода

fix shouyintai

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
edf99ce97c
1 измененных файлов: 13 добавлений и 5 удалений
  1. +13
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java

+ 13
- 5
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());


Загрузка…
Отмена
Сохранить