|
|
@@ -215,14 +215,14 @@ public class CouponOrderExpiringSchedule { |
|
|
wxSharingOrderDto.setPayTimeEnd(wxPayOrder.getPayTimeEnd()); |
|
|
wxSharingOrderDto.setPayTimeEnd(wxPayOrder.getPayTimeEnd()); |
|
|
wxSharingOrderDto.updateTenantInfo(wxPayOrder); |
|
|
wxSharingOrderDto.updateTenantInfo(wxPayOrder); |
|
|
wxSharingOrderDto.setTransactionId(wxPayOrder.getTransactionId()); |
|
|
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()); |
|
|
wxProfitSharingOrderService.finishSharingOrder(wxSharingOrderDto,wxPayOrder.getPayVendor(),wxPayOrder.getShare()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|