Przeglądaj źródła

// test

release_toaliyun_real
xhxu 3 lat temu
rodzic
commit
ff6c109cff
2 zmienionych plików z 16 dodań i 14 usunięć
  1. +4
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
  2. +12
    -12
      mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java

+ 4
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java Wyświetl plik

@@ -267,9 +267,11 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
public ResultData createSharingOrder(WxSharingOrderDto sharingOrderDto,WxPayOrder payOrder) { public ResultData createSharingOrder(WxSharingOrderDto sharingOrderDto,WxPayOrder payOrder) {


PayShareAdapterService payShareAdapterService = payServiceFactory.getPayShareAdapterService(payOrder.getPayVendor(),payOrder.getPayVersion()); PayShareAdapterService payShareAdapterService = payServiceFactory.getPayShareAdapterService(payOrder.getPayVendor(),payOrder.getPayVersion());
//创建分账订单
WxProfitSharingOrder record = payShareAdapterService.createSharingOrder(sharingOrderDto,payOrder); WxProfitSharingOrder record = payShareAdapterService.createSharingOrder(sharingOrderDto,payOrder);

//处理各种抽点
// handleSharingOrder(record,payOrder);
//实际调用分账
ResultData resultData = redoSharingOrder(record,payOrder); ResultData resultData = redoSharingOrder(record,payOrder);
return resultData; return resultData;
} }


+ 12
- 12
mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java Wyświetl plik

@@ -155,18 +155,18 @@ public class TtPayShareService extends PayShareBaseAdapterService{
@Override @Override
public PayShareResult haveReciversShare(WxAppinfo appInfo,WxPayAccount payAccount,WxProfitSharingOrder record,JSONArray receivers,Integer mchType) throws MallinkException { public PayShareResult haveReciversShare(WxAppinfo appInfo,WxPayAccount payAccount,WxProfitSharingOrder record,JSONArray receivers,Integer mchType) throws MallinkException {
//判断佣金是否已经出来了,没出来返回错误
WxOrder order = wxOrderMapper.selectById(record.getSingleOrderId(), appInfo.getTenantId());
if(EnumOrderCpsStatus.ORDER_DEF_CPS.getCode().equals(order.getCpsStatus())){
//如果没有查询到佣金
return new PayShareResult(false, EnumProfitSharingOrderStatus.PROFIT_SHARING_APPLY_FAILED.getCode(),"订单未同步cps", null,null);
}
//TODO 购物车逻辑待处理。抖音只能所有订单都核销了才能核销
//TODO 总分要算佣金。
if(EnumPayMchType.TOTAL.getCode().equals(mchType)){
}
// //判断佣金是否已经出来了,没出来返回错误
// WxOrder order = wxOrderMapper.selectById(record.getSingleOrderId(), appInfo.getTenantId());
// if(EnumOrderCpsStatus.ORDER_DEF_CPS.getCode().equals(order.getCpsStatus())){
// //如果没有查询到佣金
// return new PayShareResult(false, EnumProfitSharingOrderStatus.PROFIT_SHARING_APPLY_FAILED.getCode(),"订单未同步cps", null,null);
// }
//
// //TODO 购物车逻辑待处理。抖音只能所有订单都核销了才能核销
//
// //TODO 总分要算佣金。
// if(EnumPayMchType.TOTAL.getCode().equals(mchType)){
// }


Ładowanie…
Anuluj
Zapisz