From aa774af6df16ef11e1e34ac5aeed9aae0cb3e8e2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 09 四月 2020 16:25:03 +0800
Subject: [PATCH] 团队分红完善
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 c1d4fc7..5865465 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
@@ -37,7 +37,6 @@
import com.yeshi.fanli.entity.order.HongBaoOrder;
import com.yeshi.fanli.entity.order.HongBaoV2SettleTemp;
import com.yeshi.fanli.entity.order.InviteOrderSubsidy;
-import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.exception.money.InviteOrderSubsidyDebtException;
import com.yeshi.fanli.exception.money.OrderMoneySettleException;
@@ -62,7 +61,6 @@
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
-import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;
@Service
public class OrderMoneySettleServiceImpl implements OrderMoneySettleService {
@@ -114,6 +112,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 +152,7 @@
// 涓婄骇鐢ㄦ埛涓嶆槸姝ｅ父鐢ㄦ埛锛岃鍗曞潎涓嶈兘鍒拌处
UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());
if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {
+ invalidHongBaoForbidden(item.getId());
hongBaoList.remove(i);
i--;
}
@@ -210,6 +218,7 @@
// 涓婄骇鐢ㄦ埛涓嶆槸姝ｅ父鐢ㄦ埛锛岃鍗曞潎涓嶈兘鍒拌处
UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());
if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {
+ invalidHongBaoForbidden(item.getId());
hongBaoList.remove(i);
i--;
}
@@ -269,6 +278,7 @@
// 涓婄骇鐢ㄦ埛涓嶆槸姝ｅ父鐢ㄦ埛锛岃鍗曞潎涓嶈兘鍒拌处
UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());
if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {
+ invalidHongBaoForbidden(item.getId());
hongBaoList.remove(i);
i--;
}
@@ -479,11 +489,12 @@
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)));
}
}
}
} catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
throw new OrderMoneySettleException(2, "缁存潈璁㈠崟鍑洪敊");
}
}
@@ -1051,4 +1062,5 @@
}
return debtMoney;
}
+
}
--
Gitblit v1.8.0