From 97f33855417017ba9bc568234eab8c46b437e5a6 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Sat, 3 Sep 2022 23:12:07 +0800 Subject: [PATCH] fix pay v3 --- .../com/iformall/schedule/SharingOrderRedoSchedule.java | 2 +- .../com/iformall/service/WxProfitSharingOrderService.java | 2 +- .../service/impl/WxProfitSharingOrderServiceImpl.java | 6 +++--- .../pay/service/share/entity/PayShareCalculateAmount.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java index 6340ae985..e9a982e61 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java @@ -71,7 +71,7 @@ public class SharingOrderRedoSchedule { + " ID:" +sharingOrder.getId() + " RES: wxPayOrder is null." ); } - ResultData result = wxProfitSharingOrderService.redoSharingOrder(sharingOrder,wxPayOrder); + ResultData result = wxProfitSharingOrderService.redoSharingOrder(sharingOrder,wxPayOrder,wxPayOrder.getShareAmount()); if (result.code != ResultData.SUCCESS) { logger.error("分账重试失败:" + EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getMessage() + " ID:" +sharingOrder.getId() diff --git a/mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java index 57acf2a0d..6e448afa9 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java @@ -26,7 +26,7 @@ public interface WxProfitSharingOrderService { /** * 分账重试 */ - ResultData redoSharingOrder(WxProfitSharingOrder sharingOrder,WxPayOrder payOrder); + ResultData redoSharingOrder(WxProfitSharingOrder sharingOrder,WxPayOrder payOrder,Integer merchantShareAmount); /** * 分账完结重试 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index 51b3723c7..359e3fd3d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -138,7 +138,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ @Override @Transactional(isolation=Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) - public ResultData redoSharingOrder(WxProfitSharingOrder sharingOrder,WxPayOrder payOrder) { + public ResultData redoSharingOrder(WxProfitSharingOrder sharingOrder,WxPayOrder payOrder,Integer merchantShareAmount) { if(!EnumProfitSharingOrderStatus.shareStatus().contains(sharingOrder.getSharingStatus())){ return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),"分账状态不允许"); @@ -173,7 +173,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ if (null == receiver) { return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),"当前商户未配置收款账号"); } - StringBuffer sb = new StringBuffer("{").append("\"description\":").append(receiver.getId()).append(",\"amount\":").append(sharingOrder.getPayAmount()).append("}"); + StringBuffer sb = new StringBuffer("{").append("\"description\":").append(receiver.getId()).append(",\"amount\":").append(merchantShareAmount).append("}"); if (null == recordJsonArray) { recordJsonArray = JSONArray.parseArray("["+sb.toString()+"]"); }else { @@ -252,7 +252,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ return new ResultData(); } - ResultData resultData = redoSharingOrder(record,payOrder); + ResultData resultData = redoSharingOrder(record,payOrder,sharingOrderDto.getShareAmount()); return resultData; } diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareCalculateAmount.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareCalculateAmount.java index 1e87383f3..cdcc18752 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareCalculateAmount.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareCalculateAmount.java @@ -16,7 +16,7 @@ public class PayShareCalculateAmount implements Serializable{ private Integer realRateAmount;//平台手续费(微信,抖音的支付通道费) private Integer commissionAmount;//平台佣金(微信,抖音平台抽点) - //分账的钱 + //分账的钱 sellerAgentAmount:销售代理的抽成 public Integer getShareAmount() { return payAmount - mallCharge - commissionAmount; }