From 3528948b7cac5060c93b94514041a7321b60bccc Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 13 Sep 2022 18:25:24 +0800 Subject: [PATCH] // --- .../pay/service/share/douyin/TtPayShareService.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 ee988e181..6d58dc754 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 @@ -152,7 +152,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{ @Override public PayShareResult haveReciversShare(WxAppinfo appInfo,WxPayAccount payAccount,WxProfitSharingOrder record,JSONArray receivers) throws MallinkException { - + String before3dayStr = DateUtils.getTimeBefore(2, new Date()); Date before3day = DateUtils.stringToDate(before3dayStr); @@ -267,13 +267,12 @@ public class TtPayShareService extends PayShareBaseAdapterService{ WxOrder order = wxOrderMapper.selectById(orderId, tenantEntity.getTenantId()); if(EnumOrderCpsStatus.ORDER_IS_CPS.getCode().equals(order.getCpsStatus())){ OrderCps orderCps = orderCpsMapper.selectById(orderId, tenantEntity.getTenantId()); - if(orderCps != null){ - return orderCps.getCommissionAmount(); - } + return orderCps.getCommissionAmount(); + }else if(EnumOrderCpsStatus.ORDER_NO_CPS.getCode().equals(order.getCpsStatus())){ + return 0; }else{ return -1;//还未查询到达人佣金 } - return 0; } @Override