Преглед изворни кода

fix pay v3 share

release_toaliyun_real
zhengfangyuan пре 3 година
родитељ
комит
705532dd30
2 измењених фајлова са 6 додато и 1 уклоњено
  1. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java

+ 3
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java Прегледај датотеку

@@ -267,6 +267,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ


WxProfitSharingOrder record = payShareAdapterService.createSharingOrder(sharingOrderDto,mchType,share); WxProfitSharingOrder record = payShareAdapterService.createSharingOrder(sharingOrderDto,mchType,share);


//抖音模式涉及到佣金,无法实时分账
if(EnumPayWay.PAY_WAY_TT.getCode().equals(payWay)){ if(EnumPayWay.PAY_WAY_TT.getCode().equals(payWay)){
return new ResultData(); return new ResultData();
} }
@@ -283,6 +284,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId());
PayShareResult shareResult = null; PayShareResult shareResult = null;
JSONArray jsonArray = null; JSONArray jsonArray = null;
//总分模式,收款账户分账 //总分模式,收款账户分账
if (EnumPayMchType.TOTAL.getCode() == mchType) { if (EnumPayMchType.TOTAL.getCode() == mchType) {
if(StringUtils.isNotBlank(record.getReceivers())){ if(StringUtils.isNotBlank(record.getReceivers())){
@@ -341,7 +343,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
wxProfitSharingResultMapper.insert(result); wxProfitSharingResultMapper.insert(result);
}); });
}catch (Exception e) { }catch (Exception e) {
logger.error("分账详细信息为null");
logger.error("分账详细信息为null",e);
// return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID); // return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID);
} }
return new ResultData(shareResult.getData()); return new ResultData(shareResult.getData());


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java Прегледај датотеку

@@ -125,6 +125,9 @@ public class WxPayShareV3Service extends PayShareBaseAdapterService{
record.setReceivers(calV3ReceiversAmount(sharingOrderDto, psReceiverList)); record.setReceivers(calV3ReceiversAmount(sharingOrderDto, psReceiverList));
wxProfitSharingOrderMapper.updateById(record); wxProfitSharingOrderMapper.updateById(record);
} }
//直连的方式,暂时不支持分账
}else if (mchType == EnumPayMchType.DIRECT.getCode()) {
} }
return record; return record;
} }


Loading…
Откажи
Сачувај