From 0019bfde4bb8188bc7d8d9ae7878d117c7bd539c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 02 四月 2020 17:07:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java | 39 +--------------------------------------
1 files changed, 1 insertions(+), 38 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java
index dd22ec2..464cada 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java
@@ -23,19 +23,16 @@
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.money.InviteOrderSubsidyDebt;
-import com.yeshi.fanli.entity.money.OrderTeamRewardDebt;
import com.yeshi.fanli.entity.money.UserMoneyDebt;
import com.yeshi.fanli.entity.money.UserMoneyDebt.UserMoneyDebtTypeEnum;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.order.HongBaoOrder;
import com.yeshi.fanli.entity.order.InviteOrderSubsidy;
-import com.yeshi.fanli.entity.order.OrderTeamReward;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanDrawBack;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.exception.money.InviteOrderSubsidyDebtException;
-import com.yeshi.fanli.exception.money.OrderTeamRewardDebtException;
import com.yeshi.fanli.exception.money.UserMoneyDebtException;
import com.yeshi.fanli.exception.money.UserMoneyDetailException;
import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
@@ -48,7 +45,6 @@
import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
import com.yeshi.fanli.service.inter.money.tb.TaoBaoWeiQuanDrawBackService;
import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyService;
-import com.yeshi.fanli.service.inter.order.OrderTeamRewardService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@@ -91,9 +87,6 @@
@Resource
private InviteOrderSubsidyService inviteOrderSubsidyService;
-
- @Resource
- private OrderTeamRewardService orderTeamRewardService;
@Resource
private InviteOrderSubsidyDebtService inviteOrderSubsidyDebtService;
@@ -607,40 +600,10 @@
throw new TaoBaoWeiQuanException(101, "閭�璇疯鍗曡ˉ璐村紓甯�");
}
- doOrderTeamReard(subSidy.getId(), settleMent, weiQuanMoney, tradeId);
+ //TODO 鍒犻櫎鍥㈤槦濂栧姳缁存潈澶勭悊
}
}
- /**
- * 鍥㈤槦濂栧姳缁存潈澶勭悊
- * @Title: doOrderTeamReard
- * @Description:
- * @param subsidyId
- * void 杩斿洖绫诲瀷
- * @throws
- */
- private void doOrderTeamReard(Long subsidyId, BigDecimal settleMent, BigDecimal weiQuanMoney, String tradeId)
- throws TaoBaoWeiQuanException {
- List<OrderTeamReward> list = orderTeamRewardService.listBySubsidyId(subsidyId);
- if (list != null)
- for (OrderTeamReward reward : list) {
- BigDecimal drawBackMoney = computeDrawBackMoney(settleMent, weiQuanMoney, reward.getOriginalMoney());
- if (drawBackMoney.compareTo(new BigDecimal(0)) <= 0)
- return;
- OrderTeamRewardDebt debt = new OrderTeamRewardDebt();
- debt.setBeiZhu("璁㈠崟鍞悗");
- debt.setOriginMoney(drawBackMoney);
- debt.setUid(reward.getUid());
- debt.setCreateTime(new Date());
- debt.setTradeId(tradeId);
- debt.setSourceId(reward.getId());
- try {
- orderTeamRewardDebtService.addDebt(debt);
- } catch (OrderTeamRewardDebtException e) {
- throw new TaoBaoWeiQuanException(102, "鍥㈤槦濂栧姳寮傚父");
- }
- }
- }
@Override
public TaoBaoWeiQuanDrawBack selectByOrderItemId(String orderItemId) {
--
Gitblit v1.8.0