From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java | 54 +++---------------------------------------------------
1 files changed, 3 insertions(+), 51 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 ca0bf1e..6dc2b39 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
@@ -22,28 +22,23 @@
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanDrawBackMapper;
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.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.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.UserMoneyDebtException;
import com.yeshi.fanli.exception.money.UserMoneyDetailException;
import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.service.inter.money.InviteOrderSubsidyDebtService;
import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;
import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.money.UserMoneyService;
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.tb.TaoBaoWeiQuanOrderService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@@ -84,11 +79,6 @@
@Resource
private UserMoneyService userMoneyService;
- @Resource
- private InviteOrderSubsidyService inviteOrderSubsidyService;
-
- @Resource
- private InviteOrderSubsidyDebtService inviteOrderSubsidyDebtService;
@Resource
private UserMoneyDetailService userMoneyDetailService;
@@ -227,7 +217,7 @@
// 閫�娆鹃噾棰�
BigDecimal drawBackMoney = computeDrawBackMoney(settleMent, wqMoney, userGetMoney);
userSubMoneyMap.put(uid, drawBackMoney);
- if (subMoneySync) {
+ if (subMoneySync) {//鍚屾鍑忓幓璧勯噾
// 璁＄畻璧勯噾鏄惁鍏呰冻
UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
if (user != null && user.getMyHongBao().compareTo(drawBackMoney) < 0)// 璧勯噾涓嶈冻
@@ -527,7 +517,7 @@
settleMent = settleMent.add(taoBaoOrder.getSettlement());
}
- // 鏌ヨ涓嬬骇瀛愮敤鎴�
+
CommonOrder commonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,
weiQuanOrder.getOrderItemId());
if (commonOrder == null)
@@ -538,6 +528,7 @@
if (hongbaoOrder == null || hongbaoOrder.getHongBaoV2() == null)
throw new TaoBaoWeiQuanException(3, "绾㈠寘鏈夎");
+ // 鏌ヨ涓嬬骇瀛愮敤鎴�
List<HongBaoV2> childList = hongBaoV2Mapper.listChildrenById(hongbaoOrder.getHongBaoV2().getId());
if (childList != null)
@@ -557,11 +548,6 @@
weiQuanDrawBack.setOrderItemId(weiQuanOrder.getOrderItemId());
weiQuanDrawBack.setUser(child.getUserInfo());
taoBaoWeiQuanDrawBackMapper.insertSelective(weiQuanDrawBack);// 鍔犲叆杩旇繕璁板綍
-
- // 鍔犲叆閭�璇疯ˉ璐磋繑杩樿褰�
- doInviteOrderSubsidy(orderId, Constant.SOURCE_TYPE_TAOBAO, uid, settleMent, wqMoney,
- weiQuanOrder.getOrderItemId());
-
// 濡傛灉璧勯噾澶т簬0鎵嶆墸闄�
if (drawBackMoney != null && drawBackMoney.compareTo(new BigDecimal(0)) > 0) {
@@ -593,42 +579,8 @@
userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail);
- // 鏂扮増閫氱煡
- userMoneyMsgNotificationService.inviteOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO,
- drawBackMoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao());
}
}
- }
- }
-
- /**
- * 閭�璇疯鍗曡ˉ璐寸淮鏉冨鐞�
- *
- * @param orderId
- * @param sourceType
- */
- private void doInviteOrderSubsidy(String orderId, int sourceType, Long uid, BigDecimal settleMent,
- BigDecimal weiQuanMoney, String tradeId) throws TaoBaoWeiQuanException {
- InviteOrderSubsidy subSidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, orderId, sourceType);
- if (subSidy != null)// 娣诲姞鍊熻捶鍏崇郴
- {
- BigDecimal drawBackMoney = computeDrawBackMoney(settleMent, weiQuanMoney, subSidy.getOriginalMoney());
- if (drawBackMoney.compareTo(new BigDecimal(0)) <= 0)
- return;
- InviteOrderSubsidyDebt debt = new InviteOrderSubsidyDebt();
- debt.setBeiZhu("璁㈠崟鍞悗:" + orderId + "-" + sourceType);
- debt.setOriginMoney(drawBackMoney);
- debt.setUid(uid);
- debt.setCreateTime(new Date());
- debt.setSourceId(subSidy.getId());
- debt.setTradeId(tradeId);
- try {
- inviteOrderSubsidyDebtService.addDebt(debt);
- } catch (InviteOrderSubsidyDebtException e) {
- throw new TaoBaoWeiQuanException(101, "閭�璇疯鍗曡ˉ璐村紓甯�");
- }
-
- // TODO 鍒犻櫎鍥㈤槦濂栧姳缁存潈澶勭悊
}
}
--
Gitblit v1.8.0