From b83e2f7d2a3953da2b36a4801be37ec0a7a38238 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 13 Sep 2022 17:57:26 +0800 Subject: [PATCH] // --- .../iformall/service/impl/WxPayOrderServiceImpl.java | 2 +- .../service/impl/WxProfitSharingOrderServiceImpl.java | 7 +++++++ .../pay/service/share/douyin/TtPayShareService.java | 11 +++-------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 3e49fa62a..65ce7f87c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -583,8 +583,8 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } merchant_uid = receiver.getReceiverAccount(); } - int rate = payShareServie.getOfficialCommission(order,payAccount);//抖音分佣率 int systemAmount = OrderHelper.getAmount(order.getPayment(), payAccount.getSystemRate());//系统扣点 + int rate = payShareServie.getOfficialCommission(order,payAccount);//抖音分佣率 PayShareCalculateAmount oShareAmount = payShareServie.calculateAmount(order.getPayment(),rate,systemAmount, payAccount); childShares.put(String.valueOf(order.getId()), new WxComposeChildOrderShare(oShareAmount,merchant_id,merchant_uid,order.getId())); record.setShareAmount(oShareAmount.getMerchantShareAmount()); 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 ea10a1d8b..6fad5e02a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -154,6 +154,13 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ int cpsCommission = payShareAdapterService.getCPSCommission(sharingOrder,sharingOrder.getSingleOrderId()); if(cpsCommission < 0){ + WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder(); + updSharingOrder.updateTenantInfo(sharingOrder); + updSharingOrder.setId(sharingOrder.getId()); + updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_APPLY_FAILED.getCode()); + updSharingOrder.setErrorMsg("未获取到达人佣金"); + updSharingOrder.setUpdateTime(currentDate); + wxProfitSharingOrderMapper.updateById(updSharingOrder); return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),"未获取到达人佣金"); } 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 fc75625ed..ee988e181 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 @@ -96,15 +96,13 @@ public class TtPayShareService extends PayShareBaseAdapterService{ public PayShareCalculateAmount calculateAmount(Integer payAmount,Integer officialCommissionRate,Integer systemAmount, WxPayAccount payAccount) { int mallCharge = OrderHelper.getMallCharge(payAmount, payAccount,true); Integer realRateAmount = OrderHelper.getRealRateAmount(payAmount, payAccount); - int officialCommission = PayUtils.getPayRate(payAmount, officialCommissionRate, true); + int officialCommission = PayUtils.getPayRate(payAmount, officialCommissionRate, true);//抖音抽成 return new PayShareCalculateAmount(payAmount,mallCharge,realRateAmount,officialCommission,systemAmount); } @Override public PayShareResult noReciverShare(WxAppinfo appInfo,WxPayAccount payAccount,WxProfitSharingOrder record) { - if(EnumProfitSharingOrderStatus.PROFIT_SHARING_UNKNOWN.getCode().equals(record.getSharingStatus())){ - return new PayShareResult(false, EnumProfitSharingOrderStatus.PROFIT_SHARING_UNKNOWN.getCode(),"分账准备中", null,null); - } + String before3dayStr = DateUtils.getTimeBefore(2, new Date()); Date before3day = DateUtils.stringToDate(before3dayStr); if(before3day.before(record.getCreateTime())){ @@ -154,10 +152,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{ @Override public PayShareResult haveReciversShare(WxAppinfo appInfo,WxPayAccount payAccount,WxProfitSharingOrder record,JSONArray receivers) throws MallinkException { - - if(EnumProfitSharingOrderStatus.PROFIT_SHARING_UNKNOWN.getCode().equals(record.getSharingStatus())){ - return new PayShareResult(false, EnumProfitSharingOrderStatus.PROFIT_SHARING_UNKNOWN.getCode(),"分账准备中", null,null); - } + String before3dayStr = DateUtils.getTimeBefore(2, new Date()); Date before3day = DateUtils.stringToDate(before3dayStr);