From ae18b82458f50dd07ea5afff9b8cd0be4608fb45 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 02 四月 2020 17:01:50 +0800
Subject: [PATCH] 删除团队奖励相关代码
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java | 89 +-------------------------------------------
1 files changed, 2 insertions(+), 87 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java
index b80b4ca..fdad217 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java
@@ -4,11 +4,9 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.Resource;
@@ -18,13 +16,10 @@
import com.yeshi.fanli.dao.mybatis.order.InviteOrderSubsidyMapper;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
-import com.yeshi.fanli.entity.bus.user.ThreeSale;
-import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
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.order.OrderTeamReward;
import com.yeshi.fanli.exception.order.CommonOrderException;
import com.yeshi.fanli.exception.order.InviteOrderSubsidyException;
import com.yeshi.fanli.exception.order.OrderTeamRewardException;
@@ -34,7 +29,6 @@
import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyServiceV2;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
-import com.yeshi.fanli.service.inter.order.OrderTeamRewardService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
@@ -73,9 +67,6 @@
private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
@Resource
- private OrderTeamRewardService orderTeamRewardService;
-
- @Resource
private ThreeSaleSerivce threeSaleSerivce;
@Override
@@ -110,86 +101,12 @@
update.setState(orderSubsidy.getState());
update.setUpdateTime(new Date());
inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);
- // 娣诲姞濂栧姳
- addTeamReward(old.getId());
+ //TODO 鍒犻櫎娣诲姞濂栧姳
} else {// 娣诲姞
if (orderSubsidy.getCreateTime() == null)
orderSubsidy.setCreateTime(new Date());
inviteOrderSubsidyMapper.insertSelective(orderSubsidy);
- // 娣诲姞濂栧姳
- addTeamReward(orderSubsidy.getId());
- }
- }
-
- // 娣诲姞鍥㈤槦濂栧姳
- private void addTeamReward(Long subsidyId) throws OrderTeamRewardException, CommonOrderException {
- // 鏌ヨ鍥㈤槦濂栧姳鐨勪汉
- // 璁＄畻鐩稿簲鐨勬瘮渚�
- InviteOrderSubsidy subsidy = inviteOrderSubsidyMapper.selectByPrimaryKeyForUpdate(subsidyId);
- if (subsidy == null)
- throw new OrderTeamRewardException(20, "琛ヨ创涓嶅瓨鍦�");
-
- // 鑾峰彇涓�4绾х敤鎴�
- List<CommonOrder> commonOrderList = commonOrderService.listBySourceTypeAndOrderId(subsidy.getSourceType(),
- subsidy.getOrderNo());
- if (commonOrderList == null || commonOrderList.size() == 0) {
- throw new CommonOrderException(1, "璁㈠崟涓嶅瓨鍦�");
- }
-
- Date orderTime = commonOrderList.get(0).getThirdCreateTime();
-
- Long sourceUid = commonOrderList.get(0).getUserInfo().getId();
-
- List<ThreeSale> bossList = threeSaleSerivce.getMyBossDeepList(sourceUid, 4);
- // 鏃犻渶瑕佸洟闃熷鍔辩殑涓婄骇
- if (bossList.size() < 3)
- return;
-
- Set<Long> rewardUid = new HashSet<>();
- for (int i = 2; i < bossList.size(); i++) {
- rewardUid.add(bossList.get(i).getBoss().getId());
- }
-
- // 鍒犻櫎琛ヨ创鐢ㄦ埛鐨勪笅绾х敤鎴�
- for (int i = 0; i < bossList.size(); i++) {
- if (bossList.get(i).getBoss().getId().longValue() == subsidy.getUid()) {
- break;
- } else {
- bossList.remove(i);
- i--;
- }
- }
-
- for (int i = 1; i < bossList.size(); i++) {
- if (rewardUid.contains(bossList.get(i).getBoss().getId())) {
- UserInfo boss = bossList.get(i).getBoss();
- if (i == 1) {
- if (bossList.get(i).getSucceedTime() < subsidy.getCreateTime().getTime()) {
- UserLevelEnum userLevel = userLevelManager.getUserLevel(boss.getId(), orderTime);
- BigDecimal rewardMoney = orderHongBaoMoneyComputeService
- .computeFirstTeamReward(subsidy.getMoney(), subsidy.getCreateTime(), userLevel);
-
- if (rewardMoney != null) {
- // 娣诲姞濂栧姳
- orderTeamRewardService.addOrUpdate(subsidy, rewardMoney, boss.getId(),
- OrderTeamReward.LEVEL_ONE);
- }
- }
- } else if (i == 2) {
- if (bossList.get(i).getSucceedTime() < subsidy.getCreateTime().getTime()) {
- UserLevelEnum userLevel = userLevelManager.getUserLevel(boss.getId(), orderTime);
- BigDecimal rewardMoney = orderHongBaoMoneyComputeService
- .computeSecondTeamReward(subsidy.getMoney(), subsidy.getCreateTime(), userLevel);
-
- if (rewardMoney != null) {
- // 娣诲姞濂栧姳
- orderTeamRewardService.addOrUpdate(subsidy, rewardMoney, boss.getId(),
- OrderTeamReward.LEVEL_TWO);
- }
- }
- }
-
- }
+ //TODO 鍒犻櫎娣诲姞濂栧姳
}
}
@@ -346,7 +263,6 @@
update.setUpdateTime(new Date());
update.setInValidTime(new Date());
inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);
- orderTeamRewardService.invalidByOrderIdAndSourceType(subsidy.getId());
}
}
}
@@ -379,7 +295,6 @@
update.setValidTime(new Date());
update.setPreGetTime(preGetTime);
inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);
- orderTeamRewardService.validByOrderIdAndSourceType(subsidy.getId(), preGetTime);
}
}
}
--
Gitblit v1.8.0