From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java
index 3ffecd1..e054f1c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java
@@ -114,6 +114,15 @@
 	@Resource
 	private HongBaoV2SettleTempService hongBaoV2SettleTempService;
 
+	//涓嬬骇琚皝绂侊紝绾㈠寘澶辨晥
+	private void invalidHongBaoForbidden(Long id) {
+		HongBaoV2 updateHongBaoV2 = new HongBaoV2(id);
+		updateHongBaoV2.setState(HongBaoV2.STATE_SHIXIAO);
+		updateHongBaoV2.setBeizhu("灏佺澶辨晥");
+		updateHongBaoV2.setUpdateTime(new Date());
+		hongBaoV2Mapper.updateByPrimaryKeySelective(updateHongBaoV2);
+	}
+
 	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void inviteSettleTB(Long uid) throws OrderMoneySettleException {
@@ -145,6 +154,7 @@
 						// 涓婄骇鐢ㄦ埛涓嶆槸姝e父鐢ㄦ埛锛岃鍗曞潎涓嶈兘鍒拌处
 						UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());
 						if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {
+							invalidHongBaoForbidden(item.getId());
 							hongBaoList.remove(i);
 							i--;
 						}
@@ -210,6 +220,7 @@
 						// 涓婄骇鐢ㄦ埛涓嶆槸姝e父鐢ㄦ埛锛岃鍗曞潎涓嶈兘鍒拌处
 						UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());
 						if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {
+							invalidHongBaoForbidden(item.getId());
 							hongBaoList.remove(i);
 							i--;
 						}
@@ -269,6 +280,7 @@
 						// 涓婄骇鐢ㄦ埛涓嶆槸姝e父鐢ㄦ埛锛岃鍗曞潎涓嶈兘鍒拌处
 						UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());
 						if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {
+							invalidHongBaoForbidden(item.getId());
 							hongBaoList.remove(i);
 							i--;
 						}
@@ -479,7 +491,7 @@
 						Long uid = its.next();
 						if (userSubMoneyMap.get(uid) != null) {
 							// 鍑忓幓缁存潈璧勯噾
-							userMoney.put(uid, userMoney.get(uid).subtract(userSubMoneyMap.get(uid)));														
+							userMoney.put(uid, userMoney.get(uid).subtract(userSubMoneyMap.get(uid)));
 						}
 					}
 				}

--
Gitblit v1.8.0