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/order/InviteOrderSubsidyServiceImplV2.java | 201 ++++++++++++++-----------------------------------
1 files changed, 59 insertions(+), 142 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 dbbece5..dcadc32 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,23 +16,19 @@
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;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
-import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyServiceV2;
+import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyService;
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;
@@ -43,7 +37,7 @@
import com.yeshi.fanli.util.TimeUtil;
@Service
-public class InviteOrderSubsidyServiceImplV2 implements InviteOrderSubsidyServiceV2 {
+public class InviteOrderSubsidyServiceImplV2 implements InviteOrderSubsidyService {
@Resource
private InviteOrderSubsidyMapper inviteOrderSubsidyMapper;
@@ -73,9 +67,6 @@
private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
@Resource
- private OrderTeamRewardService orderTeamRewardService;
-
- @Resource
private ThreeSaleSerivce threeSaleSerivce;
@Override
@@ -86,6 +77,11 @@
@Override
public InviteOrderSubsidy getByOrderNoAndTypeForUpdate(Long uid, String orderNo, Integer type) {
return inviteOrderSubsidyMapper.getByOrderNoAndTypeForUpdate(uid, orderNo, type);
+ }
+
+ @Override
+ public List<InviteOrderSubsidy> listByOrderNoAndType(String orderNo, Integer type) {
+ return inviteOrderSubsidyMapper.listByOrderNoAndType(orderNo, type);
}
@Transactional(rollbackFor = Exception.class)
@@ -110,86 +106,10 @@
update.setState(orderSubsidy.getState());
update.setUpdateTime(new Date());
inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);
- // 娣诲姞濂栧姳
- addTeamReward(old.getId());
} 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);
- }
- }
- }
-
- }
}
}
@@ -200,9 +120,8 @@
if (list != null && list.size() > 0) {
// 蹇呴』鏄嚜璐鍗曟墠杩斿埄
HongBaoV2 parent = hongBaoV2Service.selectByPrimaryKey(list.get(0).getHongBaoV2().getId());
- if (parent != null && parent.getUrank() != UserLevelEnum.superVIP.getOrderRank()
+ if (parent != null
&& (parent.getType() == HongBaoV2.TYPE_SHARE_GOODS || parent.getType() == HongBaoV2.TYPE_ZIGOU)) {// 涓嶆槸瓒呯骇浼氬憳鐨勮嚜璐�/鍒嗕韩鎵嶈ˉ璐�
- boolean isShare = (parent.getType() == HongBaoV2.TYPE_SHARE_GOODS);
List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(sourceType, orderId);
if (orderList == null || orderList.size() == 0)
@@ -235,18 +154,7 @@
}
List<HongBaoV2> hbList = hongBaoV2Service.listByIds(idList);
- int state = InviteOrderSubsidy.STATE_UNKNOWN;
- // 纭畾鏄惁浣跨敤浜嗗鍔卞埜
- if (orderHongBaoMapService.selectByOrderIdAndSourceType(orderId, sourceType) != null) {
- state = InviteOrderSubsidy.STATE_INVALID;
- } else {
- // 纭畾鏄惁杩斿埄鍒拌处5澶╁悗
- if (recieveMoneyMoreThan(hbList, 5)) {
- state = InviteOrderSubsidy.STATE_VALID;
- } else {
- state = InviteOrderSubsidy.STATE_UNKNOWN;
- }
- }
+ Integer state = null;
// 浜х敓鏀硅鍗曠殑杩斿埄鎬婚噾棰�
BigDecimal totalBuyFanLiMoney = new BigDecimal(0);
@@ -255,22 +163,33 @@
if (v2.getState() == HongBaoV2.STATE_BUKELINGQU || v2.getState() == HongBaoV2.STATE_KELINGQU
|| v2.getState() == HongBaoV2.STATE_YILINGQU)
totalBuyFanLiMoney = totalBuyFanLiMoney.add(v2.getMoney());
+
+ if (state == null && (v2.getState() == HongBaoV2.STATE_KELINGQU
+ || v2.getState() == HongBaoV2.STATE_YILINGQU)) {// 绾㈠寘鐘舵�佷负宸查鍙栨垨鑰呮槸寰呴鍙栵紝鍒欒缃负琛ヨ创鏈夋晥
+ state = InviteOrderSubsidy.STATE_VALID;
+ }
}
+ if (state == null)
+ state = InviteOrderSubsidy.STATE_UNKNOWN;
// 璁＄畻濂栧姳閲�
for (Iterator<Long> its = uidHongBaoMap.keySet().iterator(); its.hasNext();) {
Long uid = its.next();
UserLevelEnum userLevel = userLevelManager.getUserLevel(uid, placeOrderTime);
int type = uidHongBaoMap.get(uid);
- if (type == HongBaoV2.TYPE_YIJI || type == HongBaoV2.TYPE_ERJI) {
+ if (type == HongBaoV2.TYPE_YIJI || type == HongBaoV2.TYPE_ERJI
+ || type == HongBaoV2.TYPE_SHARE_YIJI || type == HongBaoV2.TYPE_SHARE_ERJI) {
BigDecimal money = null;
- if (type == HongBaoV2.TYPE_YIJI)
+ if (type == HongBaoV2.TYPE_YIJI || type == HongBaoV2.TYPE_SHARE_YIJI)
money = orderHongBaoMoneyComputeService.computeFirstTeamSubsidy(totalBuyFanLiMoney,
placeOrderTime, buyerUserLevel, userLevel);
else
money = orderHongBaoMoneyComputeService.computeSecondTeamSubsidy(totalBuyFanLiMoney,
placeOrderTime, buyerUserLevel, userLevel);
+
+ if (money == null)
+ continue;
InviteOrderSubsidy orderSubsidy = new InviteOrderSubsidy();
orderSubsidy.setMoney(money);
@@ -279,23 +198,17 @@
orderSubsidy.setOrderNo(orderId);
orderSubsidy.setSourceType(sourceType);
orderSubsidy.setState(state);
- if (type == HongBaoV2.TYPE_YIJI)
+ if (type == HongBaoV2.TYPE_YIJI || type == HongBaoV2.TYPE_SHARE_YIJI)
orderSubsidy.setLevel(InviteOrderSubsidy.LEVEL_ONE);
else
orderSubsidy.setLevel(InviteOrderSubsidy.LEVEL_TWO);
- // 浼氬憳鎵嶈兘琛ヨ创
- if (userLevel != UserLevelEnum.daRen) {
- try {
- addOrderSubsidy(orderSubsidy);
- } catch (OrderTeamRewardException e) {
- throw new InviteOrderSubsidyException(e.getCode(), e.getMsg());
- } catch (CommonOrderException e) {
- throw new InviteOrderSubsidyException(e.getCode(), e.getMsg());
- }
- // 鍒嗕韩璧氫笉鑳戒娇鐢ㄨ繑鍒╁鍔卞埜锛屼笉鐢ㄧ瓑寰�5澶�
- if (isShare) {
- validByOrderIdAndSourceType(orderId, sourceType);
- }
+
+ try {
+ addOrderSubsidy(orderSubsidy);
+ } catch (OrderTeamRewardException e) {
+ throw new InviteOrderSubsidyException(e.getCode(), e.getMsg());
+ } catch (CommonOrderException e) {
+ throw new InviteOrderSubsidyException(e.getCode(), e.getMsg());
}
}
}
@@ -303,29 +216,6 @@
}
}
- }
-
- private boolean recieveMoneyMoreThan(List<HongBaoV2> hbList, int day) {
- // 鏄惁鍏ㄩ儴鏄埌璐︾姸鎬佹垨澶辨晥鐘舵��
- int invalidCount = 0;// 澶辨晥涓暟
- int recieveCount = 0;// 鍒拌处鐨勪釜鏁�
- long maxGetTime = 0;
- for (HongBaoV2 v2 : hbList) {
- if (v2.getState() == HongBaoV2.STATE_SHIXIAO)
- invalidCount++;
- else if (v2.getState() == HongBaoV2.STATE_YILINGQU) {
- recieveCount++;
- if (v2.getGetTime() != null && v2.getGetTime().getTime() > maxGetTime)
- maxGetTime = v2.getGetTime().getTime();
-
- }
- }
- if (invalidCount + recieveCount == hbList.size() && recieveCount > 0 && maxGetTime > 0) {// 鍏ㄩ儴宸插埌璐�
- // 鏌ヨ鍒拌处鏃堕棿璺濈褰撳墠鏃堕棿鏄惁瓒呰繃鎸囧畾澶�
- if (System.currentTimeMillis() - maxGetTime > 1000 * 60 * 60 * 24L * day)
- return true;
- }
- return false;
}
@Override
@@ -344,8 +234,8 @@
InviteOrderSubsidy update = new InviteOrderSubsidy(subsidy.getId());
update.setState(InviteOrderSubsidy.STATE_INVALID);
update.setUpdateTime(new Date());
+ update.setInValidTime(new Date());
inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);
- orderTeamRewardService.invalidByOrderIdAndSourceType(subsidy.getId());
}
}
}
@@ -375,9 +265,9 @@
InviteOrderSubsidy update = new InviteOrderSubsidy(subsidy.getId());
update.setState(InviteOrderSubsidy.STATE_VALID);
update.setUpdateTime(new Date());
+ update.setValidTime(new Date());
update.setPreGetTime(preGetTime);
inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);
- orderTeamRewardService.validByOrderIdAndSourceType(subsidy.getId(), preGetTime);
}
}
}
@@ -391,4 +281,31 @@
inviteOrderSubsidyMapper.updateByPrimaryKeySelective(orderSubsidy);
}
+ @Override
+ public BigDecimal sumRecievedMoneyByUid(long uid, Integer level) {
+ BigDecimal money = inviteOrderSubsidyMapper.sumRecievedMoneyByUid(uid, level);
+ if (money == null) {
+ money = new BigDecimal(0);
+ }
+ return money;
+ }
+
+ @Override
+ public BigDecimal sumValidMoneyByUidAndDate(long uid, Integer day, Integer level) {
+ BigDecimal money = inviteOrderSubsidyMapper.sumValidMoneyByUidAndDate(uid, day, level);
+ if (money == null) {
+ money = new BigDecimal(0);
+ }
+ return money;
+ }
+
+ @Override
+ public BigDecimal sumMoneyByUidAndDateAndState(long uid, Integer day, Integer level, Integer state) {
+ BigDecimal money = inviteOrderSubsidyMapper.sumMoneyByUidAndDateAndState(uid, day, level, state);
+ if (money == null) {
+ money = new BigDecimal(0);
+ }
+ return money;
+ }
+
}
--
Gitblit v1.8.0