|
|
|
@@ -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); |
|
|
|
|