From 0b57cfd62e842b309d03467b96a331c673ecad7c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 21 四月 2020 14:08:18 +0800
Subject: [PATCH] 删除普通会员等级
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java | 208 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 138 insertions(+), 70 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java
index b582b81..98fa7c3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
@@ -15,24 +16,29 @@
import com.yeshi.fanli.dao.mybatis.order.InviteOrderSubsidyMapper;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
-import com.yeshi.fanli.entity.bus.user.Order;
+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.exception.order.CommonOrderException;
import com.yeshi.fanli.exception.order.InviteOrderSubsidyException;
+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.InviteOrderSubsidyService;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;
-import com.yeshi.fanli.service.inter.order.OrderService;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
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;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import com.yeshi.fanli.service.manger.user.UserLevelManager;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.user.UserLevelUtil;
@Service
public class InviteOrderSubsidyServiceImpl implements InviteOrderSubsidyService {
-
@Resource
private InviteOrderSubsidyMapper inviteOrderSubsidyMapper;
@@ -46,13 +52,22 @@
private OrderHongBaoMapService orderHongBaoMapService;
@Resource
- private OrderService orderService;
+ private CommonOrderService commonOrderService;
@Resource
private HongBaoManageService hongBaoManageService;
@Resource
private UserVIPInfoService userVIPInfoService;
+
+ @Resource
+ private UserLevelManager userLevelManager;
+
+ @Resource
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
+
+ @Resource
+ private ThreeSaleSerivce threeSaleSerivce;
@Override
public InviteOrderSubsidy getByOrderNoAndType(Long uid, String orderNo, Integer type) {
@@ -64,13 +79,13 @@
return inviteOrderSubsidyMapper.getByOrderNoAndTypeForUpdate(uid, orderNo, type);
}
- @Transactional
- private void addOrderSubsidy(InviteOrderSubsidy orderSubsidy) throws InviteOrderSubsidyException {
- //TODO 纭畾鐢熸晥鏃ユ湡 鏈哄埗2020骞寸敓鏁�
- if (System.currentTimeMillis() < TimeUtil.convertToTimeTemp("2020-01-01", "yyyy-MM-dd")) {
- return;
- }
+ @Override
+ public List<InviteOrderSubsidy> listByOrderNoAndType(String orderNo, Integer type) {
+ return inviteOrderSubsidyMapper.listByOrderNoAndType(orderNo, type);
+ }
+ private void addOrderSubsidy(InviteOrderSubsidy orderSubsidy)
+ throws InviteOrderSubsidyException, CommonOrderException {
if (orderSubsidy.getMoney() == null || StringUtil.isNullOrEmpty(orderSubsidy.getOrderNo())
|| orderSubsidy.getSourceType() == null || orderSubsidy.getUid() == null)
throw new InviteOrderSubsidyException(1, "鏁版嵁涓嶅畬鏁�");
@@ -97,20 +112,35 @@
}
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
public void addOrUpdateByOrder(String orderId, int sourceType) throws InviteOrderSubsidyException {
List<HongBaoOrder> list = hongBaoOrderService.listByOrderIdAndSourceType(orderId, sourceType);
if (list != null && list.size() > 0) {
// 蹇呴』鏄嚜璐鍗曟墠杩斿埄
HongBaoV2 parent = hongBaoV2Service.selectByPrimaryKey(list.get(0).getHongBaoV2().getId());
- if (parent != null && parent.getType() == HongBaoV2.TYPE_ZIGOU) {
- Order order = orderService.findOrderByOrderIdAndType(orderId, sourceType);
+ if (parent != null
+ && (parent.getType() == HongBaoV2.TYPE_SHARE_GOODS || parent.getType() == HongBaoV2.TYPE_ZIGOU)) {//
+
+ List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(sourceType, orderId);
+ if (orderList == null || orderList.size() == 0)
+ throw new InviteOrderSubsidyException(10, "璁㈠崟涓虹┖");
+ CommonOrder firstOrder = orderList.get(0);
+ Date placeOrderTime = firstOrder.getThirdCreateTime();
+
+ if (placeOrderTime.getTime() < Constant.NEW_ORDER_FANLI_RULE_TIME)
+ return;
+
+ int urank = firstOrder.getUrank();
+ UserLevelEnum buyerUserLevel = UserLevelUtil.getByOrderRank(urank);
+ if (buyerUserLevel == null)
+ throw new InviteOrderSubsidyException(11, "鐢ㄦ埛绛夌骇涓虹┖");
+
List<Long> idList = new ArrayList<>();
for (HongBaoOrder ho : list)
if (ho.getHongBaoV2() != null)
idList.add(ho.getHongBaoV2().getId());
- // 鏌ヨ瀛愮孩鍖�
+ // 鏌ヨ璇ヨ鍗曞彿涓嬬殑鎵�鏈夊瓙绾㈠寘
List<HongBaoV2> children = hongBaoV2Service.listChildrenByIds(idList);
if (children != null && children.size() > 0) {
Map<Long, Integer> uidHongBaoMap = new ConcurrentHashMap<>();
@@ -123,44 +153,36 @@
}
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 = InviteOrderSubsidy.STATE_UNKNOWN;
- BigDecimal totalMoney = new BigDecimal(0);
+ // 浜х敓鏀硅鍗曠殑杩斿埄鎬婚噾棰�
+ BigDecimal totalBuyFanLiMoney = new BigDecimal(0);
// 璁＄畻鎬昏繑鍒�
for (HongBaoV2 v2 : hbList) {
if (v2.getState() == HongBaoV2.STATE_BUKELINGQU || v2.getState() == HongBaoV2.STATE_KELINGQU
|| v2.getState() == HongBaoV2.STATE_YILINGQU)
- totalMoney = totalMoney.add(v2.getMoney());
+ totalBuyFanLiMoney = totalBuyFanLiMoney.add(v2.getMoney());
}
-
- BigDecimal firstRate = hongBaoManageService
- .getInviteFirstLevelSubsidyRate(order.getThirdCreateTime().getTime());
- BigDecimal secondRate = hongBaoManageService
- .getInviteSecondLevelSubsidyRate(order.getThirdCreateTime().getTime());
// 璁＄畻濂栧姳閲�
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) {
- BigDecimal rate = null;
- if (type == HongBaoV2.TYPE_YIJI)
- rate = firstRate;
+ 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 || type == HongBaoV2.TYPE_SHARE_YIJI)
+ money = orderHongBaoMoneyComputeService.computeFirstTeamSubsidy(totalBuyFanLiMoney,
+ placeOrderTime, buyerUserLevel, userLevel);
else
- rate = secondRate;
- BigDecimal money = MoneyBigDecimalUtil.div(MoneyBigDecimalUtil.mul(totalMoney, rate),
- new BigDecimal(100));
+ money = orderHongBaoMoneyComputeService.computeSecondTeamSubsidy(totalBuyFanLiMoney,
+ placeOrderTime, buyerUserLevel, userLevel);
+
+ if (money == null)
+ continue;
+
InviteOrderSubsidy orderSubsidy = new InviteOrderSubsidy();
orderSubsidy.setMoney(money);
orderSubsidy.setOriginalMoney(money);
@@ -168,10 +190,30 @@
orderSubsidy.setOrderNo(orderId);
orderSubsidy.setSourceType(sourceType);
orderSubsidy.setState(state);
- // VIP鐢ㄦ埛鎵嶈兘琛ヨ创
- if (userVIPInfoService.isVIP(uid))
+ if (type == HongBaoV2.TYPE_YIJI || type == HongBaoV2.TYPE_SHARE_YIJI)
+ orderSubsidy.setLevel(InviteOrderSubsidy.LEVEL_ONE);
+ else
+ orderSubsidy.setLevel(InviteOrderSubsidy.LEVEL_TWO);
+
+ try {
addOrderSubsidy(orderSubsidy);
+ } catch (CommonOrderException e) {
+ throw new InviteOrderSubsidyException(e.getCode(), e.getMsg());
+ }
}
+ }
+
+ boolean isSettle = false;
+ if (orderList != null)
+ for (CommonOrder commonOrder : orderList) {
+ if (commonOrder.getState() == CommonOrder.STATE_JS
+ || commonOrder.getState() == CommonOrder.STATE_WQ) {
+ isSettle = true;
+ break;
+ }
+ }
+ if (isSettle) {
+ validByOrderIdAndSourceType(orderId, sourceType);
}
}
}
@@ -179,35 +221,12 @@
}
- 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
public long countByOrderIdAndSourceType(String orderId, int sourceType) {
return inviteOrderSubsidyMapper.countByOrderNoAndType(orderId, sourceType);
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
public void invalidByOrderIdAndSourceType(String orderId, int sourceType) {
List<InviteOrderSubsidy> list = inviteOrderSubsidyMapper.listByOrderNoAndType(orderId, sourceType);
@@ -218,14 +237,30 @@
InviteOrderSubsidy update = new InviteOrderSubsidy(subsidy.getId());
update.setState(InviteOrderSubsidy.STATE_INVALID);
update.setUpdateTime(new Date());
+ update.setInValidTime(new Date());
inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);
}
}
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
- public void validByOrderIdAndSourceType(String orderId, int sourceType) {
+ public void validByOrderIdAndSourceType(String orderId, int sourceType) throws InviteOrderSubsidyException {
+ // 鏌ヨ棰勮鍒拌处鏃堕棿
+ List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(sourceType, orderId);
+ if (orderList == null || orderList.size() == 0)
+ throw new InviteOrderSubsidyException(31, "璁㈠崟涓嶅瓨鍦�");
+
+ if (orderList.get(0).getSettleTime() == null)
+ throw new InviteOrderSubsidyException(32, "璁㈠崟灏氭湭纭鏀惰揣");
+
+ // 纭鏀惰揣鏃堕棿鐨勪笅鏈�25鍙峰埌璐�
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(orderList.get(0).getSettleTime());
+ calendar.add(Calendar.MONTH, 1);
+ Date preGetTime = new Date(TimeUtil.convertToTimeTemp(
+ calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-25", "yyyy-M-dd"));
+
List<InviteOrderSubsidy> list = inviteOrderSubsidyMapper.listByOrderNoAndType(orderId, sourceType);
if (list != null && list.size() > 0)
for (InviteOrderSubsidy subsidy : list) {
@@ -233,10 +268,11 @@
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);
}
}
-
}
@Override
@@ -248,4 +284,36 @@
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;
+ }
+
+ @Override
+ public List<InviteOrderSubsidy> listByOrderNoAndTypeAndUid(String orderNo, Integer type, Long uid) {
+ return inviteOrderSubsidyMapper.listByOrderNoAndTypeAndUid(orderNo, type, uid);
+ }
+
}
--
Gitblit v1.8.0