From ff6c109cff6f584509bf8ba42e2c9ae749ee9fb7 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 5 Sep 2022 11:17:32 +0800 Subject: [PATCH] // test --- .../impl/WxProfitSharingOrderServiceImpl.java | 6 +++-- .../share/douyin/TtPayShareService.java | 24 +++++++++---------- 2 files changed, 16 insertions(+), 14 deletions(-) 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 dd1100249..c5fee23f2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -267,9 +267,11 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ public ResultData createSharingOrder(WxSharingOrderDto sharingOrderDto,WxPayOrder payOrder) { PayShareAdapterService payShareAdapterService = payServiceFactory.getPayShareAdapterService(payOrder.getPayVendor(),payOrder.getPayVersion()); - + //创建分账订单 WxProfitSharingOrder record = payShareAdapterService.createSharingOrder(sharingOrderDto,payOrder); - + //处理各种抽点 +// handleSharingOrder(record,payOrder); + //实际调用分账 ResultData resultData = redoSharingOrder(record,payOrder); return resultData; } diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java index c8986d44d..039541c0e 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java @@ -155,18 +155,18 @@ public class TtPayShareService extends PayShareBaseAdapterService{ @Override 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)){ +// }