From ee5c8055b1c0dd7c67a9025a76b10bd287c93d9a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 09:52:27 +0800
Subject: [PATCH] 资金明细增加团队分红
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java | 134 +++++++++++++++++++++-----------------------
1 files changed, 63 insertions(+), 71 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 fdad217..2596787 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
@@ -22,23 +22,22 @@
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.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.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
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;
@Service
-public class InviteOrderSubsidyServiceImplV2 implements InviteOrderSubsidyServiceV2 {
-
+public class InviteOrderSubsidyServiceImplV2 implements InviteOrderSubsidyService {
@Resource
private InviteOrderSubsidyMapper inviteOrderSubsidyMapper;
@@ -79,9 +78,13 @@
return inviteOrderSubsidyMapper.getByOrderNoAndTypeForUpdate(uid, orderNo, type);
}
- @Transactional(rollbackFor = Exception.class)
+ @Override
+ public List<InviteOrderSubsidy> listByOrderNoAndType(String orderNo, Integer type) {
+ return inviteOrderSubsidyMapper.listByOrderNoAndType(orderNo, type);
+ }
+
private void addOrderSubsidy(InviteOrderSubsidy orderSubsidy)
- throws InviteOrderSubsidyException, OrderTeamRewardException, CommonOrderException {
+ throws InviteOrderSubsidyException, CommonOrderException {
if (orderSubsidy.getMoney() == null || StringUtil.isNullOrEmpty(orderSubsidy.getOrderNo())
|| orderSubsidy.getSourceType() == null || orderSubsidy.getUid() == null)
throw new InviteOrderSubsidyException(1, "鏁版嵁涓嶅畬鏁�");
@@ -101,12 +104,10 @@
update.setState(orderSubsidy.getState());
update.setUpdateTime(new Date());
inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);
- //TODO 鍒犻櫎娣诲姞濂栧姳
} else {// 娣诲姞
if (orderSubsidy.getCreateTime() == null)
orderSubsidy.setCreateTime(new Date());
inviteOrderSubsidyMapper.insertSelective(orderSubsidy);
- //TODO 鍒犻櫎娣诲姞濂栧姳
}
}
@@ -117,15 +118,18 @@
if (list != null && list.size() > 0) {
// 蹇呴』鏄嚜璐鍗曟墠杩斿埄
HongBaoV2 parent = hongBaoV2Service.selectByPrimaryKey(list.get(0).getHongBaoV2().getId());
- if (parent != null && parent.getUrank() != UserLevelEnum.superVIP.getOrderRank()
- && (parent.getType() == HongBaoV2.TYPE_SHARE_GOODS || parent.getType() == HongBaoV2.TYPE_ZIGOU)) {// 涓嶆槸瓒呯骇浼氬憳鐨勮嚜璐�/鍒嗕韩鎵嶈ˉ璐�
- boolean isShare = (parent.getType() == HongBaoV2.TYPE_SHARE_GOODS);
+ 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 = null;
for (UserLevelEnum level : UserLevelEnum.values())
@@ -152,18 +156,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 = InviteOrderSubsidy.STATE_UNKNOWN;
// 浜х敓鏀硅鍗曠殑杩斿埄鎬婚噾棰�
BigDecimal totalBuyFanLiMoney = new BigDecimal(0);
@@ -180,14 +173,18 @@
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);
@@ -196,53 +193,35 @@
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 (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);
}
}
}
}
- }
-
- 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
@@ -308,18 +287,31 @@
inviteOrderSubsidyMapper.updateByPrimaryKeySelective(orderSubsidy);
}
-
@Override
- public BigDecimal sumRecievedMoneyByUid(long uid, Integer level) {
- return inviteOrderSubsidyMapper.sumRecievedMoneyByUid(uid, level);
+ 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) {
- return inviteOrderSubsidyMapper.sumValidMoneyByUidAndDate(uid, day, 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