| @@ -39,6 +39,7 @@ import com.iformall.service.pay.service.share.entity.PayShareCalculateAmount; | |||||
| import com.iformall.service.pay.service.share.entity.ShareNotifyAdapterResult; | import com.iformall.service.pay.service.share.entity.ShareNotifyAdapterResult; | ||||
| import com.iformall.utils.*; | import com.iformall.utils.*; | ||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import org.flowable.job.service.JobHandler; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.aop.framework.AopContext; | import org.springframework.aop.framework.AopContext; | ||||
| @@ -438,7 +439,9 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| //todo 注意购物车模式(需测试)每笔子订单算法可能与总订单算法有差 | //todo 注意购物车模式(需测试)每笔子订单算法可能与总订单算法有差 | ||||
| for (WxOrder o : orderList) { | for (WxOrder o : orderList) { | ||||
| int rate = payShareServie.getOfficialCommission(o,payAccount);//抖音分佣率 | int rate = payShareServie.getOfficialCommission(o,payAccount);//抖音分佣率 | ||||
| logger.info("抖音分佣率"+rate); | |||||
| PayShareCalculateAmount oShareAmount = payShareServie.calculateAmount(o.getPayment(),rate, payAccount); | PayShareCalculateAmount oShareAmount = payShareServie.calculateAmount(o.getPayment(),rate, payAccount); | ||||
| logger.info("佣金明细"+ JSON.toJSONString(oShareAmount)); | |||||
| share_amount += oShareAmount.getShareAmount(); | share_amount += oShareAmount.getShareAmount(); | ||||
| rate_amount += oShareAmount.getRateAmount(); | rate_amount += oShareAmount.getRateAmount(); | ||||
| childShares.put(String.valueOf(o.getId()), new WxComposeChildOrderShare(oShareAmount)); | childShares.put(String.valueOf(o.getId()), new WxComposeChildOrderShare(oShareAmount)); | ||||