From aa774af6df16ef11e1e34ac5aeed9aae0cb3e8e2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 09 四月 2020 16:25:03 +0800
Subject: [PATCH] 团队分红完善
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java | 61 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
index c99ebf7..d8006e2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.user.vip;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -14,6 +15,7 @@
import com.yeshi.fanli.dao.mybatis.user.vip.UserVIPPreInfoMapper;
import com.yeshi.fanli.dto.msg.MsgAccountVipDTO;
+import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -27,7 +29,9 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
+import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserInviteSeparateService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;
@@ -39,6 +43,9 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
+import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
+import com.yeshi.fanli.vo.msg.CommonMsgItemVO;
+import com.yeshi.fanli.vo.msg.CommonMsgItemVOFactory;
@Service
public class UserVIPPreInfoServiceImpl implements UserVIPPreInfoService {
@@ -76,6 +83,12 @@
@Resource
private UserInviteSeparateService userInviteSeparateService;
+
+ @Resource
+ private UserInfoService userInfoService;
+
+ @Resource
+ private UserOtherMsgNotificationService userOtherMsgNotificationService;
@Override
@@ -210,6 +223,11 @@
*/
@Transactional(rollbackFor = Exception.class)
private boolean oneProcess(Long uid, long countZiGou, long countShare, long firstTeam, long secondTeam) {
+ UserVIPPreInfo oldInfo = userVIPPreInfoMapper.selectByUidAndProcess(uid, UserVIPPreInfo.PROCESS_1);
+ if (oldInfo != null) {
+ return true;
+ }
+
boolean process = false;
String msg = "";
@@ -267,6 +285,8 @@
// 璧犻�侀噾甯�
String goldcoin = userVipConfigService.getValueByKey("vip_pre_3_gift_goldcoin");
if (!StringUtil.isNullOrEmpty(goldcoin)) {
+
+ int goldcoinNum = Integer.parseInt(goldcoin);
// 娣诲姞閲戝竵鏄庣粏
IntegralDetail detail = new IntegralDetail();
detail.setTitle("鍗囩骇VIP绂忓埄");
@@ -279,7 +299,15 @@
// 娣诲姞閲戝竵
userInfoExtraService.addGoldCoinByUid(uid, Integer.parseInt(goldcoin));
- //TODO 娑堟伅
+ // 娑堟伅
+ List<CommonMsgItemVO> listMsg = new ArrayList<>();
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鐘� 鎬�", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO("鎭枩浣狅紒鎴愬姛鍗囩骇涓烘櫘閫氫細鍛�", ClientTextStyleVO.COLOR_CONTENT)));
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("濂� 鍔�", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO("鑾峰緱閲戝竵" + goldcoinNum+"鏋�", ClientTextStyleVO.COLOR_CONTENT)));
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶� 娉�", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO("璇︽儏鏌ョ湅锛屽搴斾細鍛樻潈鐩�", ClientTextStyleVO.COLOR_CONTENT)));
+ userOtherMsgNotificationService.createMsgOtherDetail(uid, listMsg, MsgTypeOtherTypeEnum.vipUpgradeReward);
}
// 鏄惁瀛樺湪涓嬬骇鑴辩鏈熼檺 -鏇存柊涓嶈劚绂�
@@ -302,7 +330,13 @@
if (threeSale == null)
return;
+ // 楠岃瘉涓婄骇鏄惁姝ｅ父
Long bossId = threeSale.getBoss().getId();
+ UserInfo userInfo = userInfoService.getUserById(bossId);
+ if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {
+ return;
+ }
+
// 楠岃瘉涓婄骇鏄惁宸叉槸浼氬憳
UserVIPPreInfo oldInfo = userVIPPreInfoMapper.selectByUidAndProcess(bossId, UserVIPPreInfo.PROCESS_1);
if (oldInfo != null) {
@@ -311,9 +345,6 @@
// 娣诲姞鑴辩鍏崇郴鍊掕鏃�
userInviteSeparateService.addPreSeparateRecord(uid, bossId);
-
- // TODO 娑堟伅
-
}
@@ -332,11 +363,11 @@
boolean process = false;
String msg = "";
- long limitZiGou = 0;
- String zigou = userVipConfigService.getValueByKey("vip_pre_7_zigou_order_count");
- if (!StringUtil.isNullOrEmpty(zigou)) {
- limitZiGou = Long.parseLong(zigou);
- }
+ long limitZiGou = 10;
+// String zigou = userVipConfigService.getValueByKey("vip_pre_7_zigou_order_count");
+// if (!StringUtil.isNullOrEmpty(zigou)) {
+// limitZiGou = Long.parseLong(zigou);
+// }
long limitShare = 0;
String share = userVipConfigService.getValueByKey("vip_pre_7_share_order_count");
@@ -391,10 +422,16 @@
userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(),
UserSystemCoupon.SOURCE_SYSTEM_PUSH, percent, false);
}
+
+ List<CommonMsgItemVO> listMsg = new ArrayList<>();
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鐘� 鎬�", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO("鎭枩浣狅紒鎴愬姛鍗囩骇涓洪珮绾т細鍛�", ClientTextStyleVO.COLOR_CONTENT)));
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("濂� 鍔�", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO("鑾峰緱杩斿埄濂栧姳鍒�" + num +"寮�", ClientTextStyleVO.COLOR_CONTENT)));
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶� 娉�", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO("璇︽儏鏌ョ湅锛屽搴斾細鍛樻潈鐩�", ClientTextStyleVO.COLOR_CONTENT)));
+ userOtherMsgNotificationService.createMsgOtherDetail(uid, listMsg, MsgTypeOtherTypeEnum.vipUpgradeReward);
}
-
- // TODO 鍙戝埜娑堟伅
-
} catch (Exception e) {
e.printStackTrace();
LogHelper.error(e);
--
Gitblit v1.8.0