From d960fdbfe07a65cb80ccb764bfb15ce78ebfd84a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 10 四月 2020 18:21:04 +0800
Subject: [PATCH] 消息修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java | 92 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 83 insertions(+), 9 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 0343fa6..82ebf90 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
@@ -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;
@@ -19,7 +20,9 @@
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.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;
@@ -27,9 +30,11 @@
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.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
@Service
public class InviteOrderSubsidyServiceImplV2 implements InviteOrderSubsidyServiceV2 {
@@ -61,6 +66,9 @@
@Resource
private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
+ @Resource
+ private ThreeSaleSerivce threeSaleSerivce;
+
@Override
public InviteOrderSubsidy getByOrderNoAndType(Long uid, String orderNo, Integer type) {
return inviteOrderSubsidyMapper.getByOrderNoAndType(uid, orderNo, type);
@@ -72,7 +80,8 @@
}
@Transactional(rollbackFor = Exception.class)
- private void addOrderSubsidy(InviteOrderSubsidy orderSubsidy) throws InviteOrderSubsidyException {
+ private void addOrderSubsidy(InviteOrderSubsidy orderSubsidy)
+ throws InviteOrderSubsidyException, OrderTeamRewardException, CommonOrderException {
if (orderSubsidy.getMoney() == null || StringUtil.isNullOrEmpty(orderSubsidy.getOrderNo())
|| orderSubsidy.getSourceType() == null || orderSubsidy.getUid() == null)
throw new InviteOrderSubsidyException(1, "鏁版嵁涓嶅畬鏁�");
@@ -92,10 +101,12 @@
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 鍒犻櫎娣诲姞濂栧姳
}
}
@@ -106,7 +117,9 @@
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.getUrank() != UserLevelEnum.superVIP.getOrderRank()
+ && (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)
@@ -164,7 +177,7 @@
// 璁＄畻濂栧姳閲�
for (Iterator<Long> its = uidHongBaoMap.keySet().iterator(); its.hasNext();) {
Long uid = its.next();
- UserLevelEnum userLevel = userLevelManager.getUserLevel(uid);
+ UserLevelEnum userLevel = userLevelManager.getUserLevel(uid, placeOrderTime);
int type = uidHongBaoMap.get(uid);
if (type == HongBaoV2.TYPE_YIJI || type == HongBaoV2.TYPE_ERJI) {
@@ -183,9 +196,24 @@
orderSubsidy.setOrderNo(orderId);
orderSubsidy.setSourceType(sourceType);
orderSubsidy.setState(state);
+ if (type == HongBaoV2.TYPE_YIJI)
+ orderSubsidy.setLevel(InviteOrderSubsidy.LEVEL_ONE);
+ else
+ orderSubsidy.setLevel(InviteOrderSubsidy.LEVEL_TWO);
// 浼氬憳鎵嶈兘琛ヨ创
- if (userLevel != UserLevelEnum.daRen)
- addOrderSubsidy(orderSubsidy);
+ 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);
+ }
+ }
}
}
}
@@ -222,7 +250,7 @@
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);
@@ -233,14 +261,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) {
@@ -248,10 +292,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
@@ -263,4 +308,33 @@
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