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