From a56bd9db6b5c989fb2eaecd3a854ac6782b55f95 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 26 十月 2019 14:44:19 +0800
Subject: [PATCH] 淘宝维权退款服务修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java
index 4ce8b28..e81ca91 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java
@@ -13,6 +13,7 @@
 
 import javax.annotation.Resource;
 
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -107,6 +108,7 @@
 	@Resource
 	private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
 
+	@Lazy
 	@Resource
 	private UserSystemCouponService userSystemCouponService;
 
@@ -432,6 +434,7 @@
 						firstHongbao.setType(HongBaoV2.TYPE_YIJI);
 						firstHongbao.setVersion(2);
 						firstHongbao.setState(hongBao.getState());
+						firstHongbao.setOrderType(commonOrder.getSourceType());
 
 						if (hongBao.getState() == HongBaoV2.STATE_KELINGQU) {
 							firstHongbao.setMoney(
@@ -480,6 +483,7 @@
 							secondHongbao.setType(HongBaoV2.TYPE_ERJI);
 							secondHongbao.setVersion(2);
 							secondHongbao.setState(hongBao.getState());
+							secondHongbao.setOrderType(commonOrder.getSourceType());
 							if (hongBao.getState() == HongBaoV2.STATE_KELINGQU) {
 								secondHongbao.setMoney(MoneyBigDecimalUtil.mul(hongBao.getMoney(),
 										secondRate.divide(new BigDecimal(100))));
@@ -707,6 +711,7 @@
 
 			UserInfo user = userInfoService.getUserById(commonOrder.getUserInfo().getId());
 			hongBao.setUrank(user.getRank());
+			hongBao.setOrderType(commonOrder.getSourceType());
 			hongBaoV2Mapper.insertSelective(hongBao);
 			// 娣诲姞绾㈠寘涓庤鍗曠殑鏄犲皠
 			HongBaoOrder hongBaoOrder = new HongBaoOrder();
@@ -748,6 +753,7 @@
 				firstHongbao.setType(HongBaoV2.TYPE_YIJI);
 				firstHongbao.setVersion(2);
 				firstHongbao.setState(hongBao.getState());
+				firstHongbao.setOrderType(commonOrder.getSourceType());
 
 				if (hongBao.getState() == HongBaoV2.STATE_KELINGQU) {
 					firstHongbao.setMoney(
@@ -800,6 +806,7 @@
 					secondHongbao.setType(HongBaoV2.TYPE_ERJI);
 					secondHongbao.setVersion(2);
 					secondHongbao.setState(hongBao.getState());
+					secondHongbao.setOrderType(commonOrder.getSourceType());
 					if (hongBao.getState() == HongBaoV2.STATE_KELINGQU) {
 						secondHongbao.setMoney(
 								MoneyBigDecimalUtil.mul(hongBao.getMoney(), secondRate.divide(new BigDecimal(100))));
@@ -903,6 +910,7 @@
 			UserInfo user = userInfoService.getUserById(commonOrder.getUserInfo().getId());
 			hongBao.setUrank(user.getRank());
 			hongBao.setUserInfo(user);
+			hongBao.setOrderType(commonOrder.getSourceType());
 			hongBaoV2Mapper.insertSelective(hongBao);
 			// 鎻掑叆绾㈠寘涓庤鍗曟槧灏�
 			HongBaoOrder hongBaoOrder = new HongBaoOrder();
@@ -956,6 +964,7 @@
 					child.setUrank(boss.getRank());
 					child.setVersion(2);
 					child.setCreateTime(new Date());
+					child.setOrderType(commonOrder.getSourceType());
 					if (child.getMoney().compareTo(new BigDecimal(0)) > 0) {
 						hongBaoV2Mapper.insertSelective(child);
 						// 娣诲姞閫氱煡
@@ -1080,6 +1089,13 @@
 	}
 
 	@Override
+	public List<HongBaoV2> listChildrenByIds(List<Long> idList) {
+		if (idList == null || idList.size() == 0)
+			return null;
+		return hongBaoV2Mapper.listChildrenByIds(idList);
+	}
+
+	@Override
 	public List<Long> getUidByNear30DayShareSucceed() {
 		return hongBaoV2Mapper.getUidByNear30DayShareSucceed();
 	}
@@ -1128,4 +1144,10 @@
 			return hongBaoV2List.get(0);
 		return null;
 	}
+
+	@Override
+	public List<HongBaoV2> listByIds(List<Long> idList) {
+		return hongBaoV2Mapper.listByIds(idList);
+	}
+
 }

--
Gitblit v1.8.0