From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java | 76 +++++++++++++++++--------------------
1 files changed, 35 insertions(+), 41 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 271cde1..e6d0237 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,17 +22,14 @@
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;
@@ -43,7 +40,6 @@
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;
@@ -83,9 +79,6 @@
@Resource
private UserMoneyService userMoneyService;
-
- @Resource
- private InviteOrderSubsidyService inviteOrderSubsidyService;
@Resource
private InviteOrderSubsidyDebtService inviteOrderSubsidyDebtService;
@@ -274,8 +267,24 @@
userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail);
// 鏂扮増閫氱煡
+ List<CommonOrder> orderList = commonOrderMapper.listBySourceTypeAndOrderNo(Constant.SOURCE_TYPE_TAOBAO,
+ orderId);
+ int goodsCount = 0;
+ for (CommonOrder co : orderList) {
+ if (co.getState() != CommonOrder.STATE_SX)
+ goodsCount += co.getCount();
+ }
+
+ BigDecimal fanliMoney = new BigDecimal(0);
+ List<HongBaoOrder> hongBaoOrderList = hongBaoOrderMapper.listDetailByOrderIdAndSourceType(orderId,
+ Constant.SOURCE_TYPE_TAOBAO);
+ for (HongBaoOrder hb : hongBaoOrderList) {
+ fanliMoney = fanliMoney.add(hb.getHongBaoV2().getMoney());
+ }
+
userMoneyMsgNotificationService.fanliOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO,
- drawBackMoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
+ drawBackMoney, fanliMoney, goodsCount, orderList.get(0).getThirdCreateTime());
+
} else {// 璁板綍璧勯噾璁板綍锛屼絾鏄笉鏄剧ず缁欑敤鎴�
UserMoneyDetail userMoneyDetail = null;
@@ -469,9 +478,25 @@
}
}
userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail);
- userMoneyMsgNotificationService.shareOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO, drawBackMoney,
- userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
+ // 鏂扮増閫氱煡
+ List<CommonOrder> orderList = commonOrderMapper.listBySourceTypeAndOrderNo(Constant.SOURCE_TYPE_TAOBAO,
+ orderId);
+ int goodsCount = 0;
+ for (CommonOrder co : orderList) {
+ if (co.getState() != CommonOrder.STATE_SX)
+ goodsCount += co.getCount();
+ }
+
+ BigDecimal fanliMoney = new BigDecimal(0);
+ List<HongBaoOrder> hongBaoOrderList = hongBaoOrderMapper.listDetailByOrderIdAndSourceType(orderId,
+ Constant.SOURCE_TYPE_TAOBAO);
+ for (HongBaoOrder hb : hongBaoOrderList) {
+ fanliMoney = fanliMoney.add(hb.getHongBaoV2().getMoney());
+ }
+
+ userMoneyMsgNotificationService.shareOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO, drawBackMoney,
+ fanliMoney, goodsCount, orderList.get(0).getThirdCreateTime());
}
}
@@ -525,10 +550,6 @@
weiQuanDrawBack.setOrderItemId(weiQuanOrder.getOrderItemId());
weiQuanDrawBack.setUser(child.getUserInfo());
taoBaoWeiQuanDrawBackMapper.insertSelective(weiQuanDrawBack);// 鍔犲叆杩旇繕璁板綍
-
- // 鍔犲叆閭�璇疯ˉ璐磋繑杩樿褰�
- doInviteOrderSubsidy(orderId, Constant.SOURCE_TYPE_TAOBAO, uid, settleMent, wqMoney);
-
// 濡傛灉璧勯噾澶т簬0鎵嶆墸闄�
if (drawBackMoney != null && drawBackMoney.compareTo(new BigDecimal(0)) > 0) {
@@ -565,33 +586,6 @@
drawBackMoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao());
}
}
- }
- }
-
- /**
- * 閭�璇疯鍗曡ˉ璐寸淮鏉冨鐞�
- *
- * @param orderId
- * @param sourceType
- */
- private void doInviteOrderSubsidy(String orderId, int sourceType, Long uid, BigDecimal settleMent,
- BigDecimal weiQuanMoney) 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());
- try {
- inviteOrderSubsidyDebtService.addDebt(debt);
- } catch (InviteOrderSubsidyDebtException e) {
- throw new TaoBaoWeiQuanException(101, "閭�璇疯鍗曡ˉ璐村紓甯�");
- }
}
}
--
Gitblit v1.8.0