From 401ad675eaa4872ad76a15748a9f171eeda3b29f Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 12 May 2022 19:49:56 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=BE=AE=E4=BF=A1=E5=88=86=E8=B4=A6?= =?UTF-8?q?=E5=AE=8C=E7=BB=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schedule/CouponOrderExpiringSchedule.java | 16 ++++++++-------- .../pay/service/share/wx/WxPayShareService.java | 2 +- 2 files changed, 9 insertions(+), 9 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()); } diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/WxPayShareService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/WxPayShareService.java index f7423dcf9..f257d481a 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/WxPayShareService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/WxPayShareService.java @@ -82,7 +82,7 @@ public class WxPayShareService extends PayShareBaseAdapterService{ psFCmd.setNonce_str(Utility.generate32UUID()); psFCmd.setTransaction_id(transcationId); psFCmd.setOut_order_no(record.getId().toString()); - psFCmd.setAmount(amount); + //psFCmd.setAmount(amount); psFCmd.setDescription("分账已完结"); psFCmd.setSign_type("HMAC-SHA256");