From 7f819132bf31c1f5bcbba7c26ab8ce4a984b45d6 Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 12 May 2022 16:12:40 +0800 Subject: [PATCH] fix bug --- .../schedule/CouponOrderExpiringSchedule.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java index 11f15e373..a4d39e6f8 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java @@ -215,14 +215,14 @@ public class CouponOrderExpiringSchedule { wxSharingOrderDto.setPayTimeEnd(wxPayOrder.getPayTimeEnd()); wxSharingOrderDto.updateTenantInfo(wxPayOrder); wxSharingOrderDto.setTransactionId(wxPayOrder.getTransactionId()); -// if (wxPayOrder.getChildOrderShare(co.getOrderId()).getRateAmount() != null) { -// // 实际分账金额为 分账金额 + 通道费差 -// wxSharingOrderDto.setShareAmount(wxPayOrder.getChildOrderShare(co.getOrderId()).getShareAmount()+wxPayOrder.getChildOrderShare(co.getOrderId()).getRateAmount()); -// } else { -// // 未设置通道费差 -// wxSharingOrderDto.setShareAmount(wxPayOrder.getChildOrderShare(co.getOrderId()).getShareAmount()); -// } - wxSharingOrderDto.setShareAmount(wxPayOrder.getPayAmount()); + if (wxPayOrder.getChildOrderShare(co.getOrderId()).getRateAmount() != null) { + // 实际分账金额为 分账金额 + 通道费差 + wxSharingOrderDto.setShareAmount(wxPayOrder.getChildOrderShare(co.getOrderId()).getShareAmount()+wxPayOrder.getChildOrderShare(co.getOrderId()).getRateAmount()); + } else { + // 未设置通道费差 + wxSharingOrderDto.setShareAmount(wxPayOrder.getChildOrderShare(co.getOrderId()).getShareAmount()); + } + //wxSharingOrderDto.setShareAmount(wxPayOrder.getPayAmount()); wxProfitSharingOrderService.finishSharingOrder(wxSharingOrderDto,wxPayOrder.getPayVendor(),wxPayOrder.getShare()); }