Browse Source

fix pay v3

release_toaliyun_real
lin 3 years ago
parent
commit
97f3385541
4 changed files with 6 additions and 6 deletions
  1. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java
  3. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareCalculateAmount.java

+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java View File

@@ -71,7 +71,7 @@ public class SharingOrderRedoSchedule {
+ " ID:" +sharingOrder.getId() + " ID:" +sharingOrder.getId()
+ " RES: wxPayOrder is null." ); + " RES: wxPayOrder is null." );
} }
ResultData result = wxProfitSharingOrderService.redoSharingOrder(sharingOrder,wxPayOrder);
ResultData result = wxProfitSharingOrderService.redoSharingOrder(sharingOrder,wxPayOrder,wxPayOrder.getShareAmount());
if (result.code != ResultData.SUCCESS) { if (result.code != ResultData.SUCCESS) {
logger.error("分账重试失败:" + EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getMessage() logger.error("分账重试失败:" + EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getMessage()
+ " ID:" +sharingOrder.getId() + " ID:" +sharingOrder.getId()


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java View File

@@ -26,7 +26,7 @@ public interface WxProfitSharingOrderService {
/** /**
* 分账重试 * 分账重试
*/ */
ResultData redoSharingOrder(WxProfitSharingOrder sharingOrder,WxPayOrder payOrder);
ResultData redoSharingOrder(WxProfitSharingOrder sharingOrder,WxPayOrder payOrder,Integer merchantShareAmount);


/** /**
* 分账完结重试 * 分账完结重试


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java View File

@@ -138,7 +138,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ


@Override @Override
@Transactional(isolation=Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @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())){ if(!EnumProfitSharingOrderStatus.shareStatus().contains(sharingOrder.getSharingStatus())){
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),"分账状态不允许"); return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),"分账状态不允许");
@@ -173,7 +173,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
if (null == receiver) { if (null == receiver) {
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),"当前商户未配置收款账号"); 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) { if (null == recordJsonArray) {
recordJsonArray = JSONArray.parseArray("["+sb.toString()+"]"); recordJsonArray = JSONArray.parseArray("["+sb.toString()+"]");
}else { }else {
@@ -252,7 +252,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
return new ResultData(); return new ResultData();
} }


ResultData resultData = redoSharingOrder(record,payOrder);
ResultData resultData = redoSharingOrder(record,payOrder,sharingOrderDto.getShareAmount());
return resultData; return resultData;
} }




+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareCalculateAmount.java View File

@@ -16,7 +16,7 @@ public class PayShareCalculateAmount implements Serializable{
private Integer realRateAmount;//平台手续费(微信,抖音的支付通道费) private Integer realRateAmount;//平台手续费(微信,抖音的支付通道费)
private Integer commissionAmount;//平台佣金(微信,抖音平台抽点) private Integer commissionAmount;//平台佣金(微信,抖音平台抽点)
//分账的钱
//分账的钱 sellerAgentAmount:销售代理的抽成
public Integer getShareAmount() { public Integer getShareAmount() {
return payAmount - mallCharge - commissionAmount; return payAmount - mallCharge - commissionAmount;
} }


Loading…
Cancel
Save