| @@ -152,7 +152,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{ | |||||
| @Override | @Override | ||||
| public PayShareResult haveReciversShare(WxAppinfo appInfo,WxPayAccount payAccount,WxProfitSharingOrder record,JSONArray receivers) throws MallinkException { | public PayShareResult haveReciversShare(WxAppinfo appInfo,WxPayAccount payAccount,WxProfitSharingOrder record,JSONArray receivers) throws MallinkException { | ||||
| String before3dayStr = DateUtils.getTimeBefore(2, new Date()); | String before3dayStr = DateUtils.getTimeBefore(2, new Date()); | ||||
| Date before3day = DateUtils.stringToDate(before3dayStr); | Date before3day = DateUtils.stringToDate(before3dayStr); | ||||
| @@ -267,13 +267,12 @@ public class TtPayShareService extends PayShareBaseAdapterService{ | |||||
| WxOrder order = wxOrderMapper.selectById(orderId, tenantEntity.getTenantId()); | WxOrder order = wxOrderMapper.selectById(orderId, tenantEntity.getTenantId()); | ||||
| if(EnumOrderCpsStatus.ORDER_IS_CPS.getCode().equals(order.getCpsStatus())){ | if(EnumOrderCpsStatus.ORDER_IS_CPS.getCode().equals(order.getCpsStatus())){ | ||||
| OrderCps orderCps = orderCpsMapper.selectById(orderId, tenantEntity.getTenantId()); | 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{ | }else{ | ||||
| return -1;//还未查询到达人佣金 | return -1;//还未查询到达人佣金 | ||||
| } | } | ||||
| return 0; | |||||
| } | } | ||||
| @Override | @Override | ||||