From 06bbeaeb73178a6cff0f207a1a284a73f6445e25 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 02 四月 2020 17:04:13 +0800
Subject: [PATCH] 消息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java | 78 +++++++++------------------------------
1 files changed, 18 insertions(+), 60 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java
index 5f194e4..4423789 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.user.vip;
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -13,14 +14,13 @@
import com.yeshi.fanli.dao.mybatis.user.vip.UserVIPInfoMapper;
import com.yeshi.fanli.dto.msg.MsgAccountVipDTO;
-import com.yeshi.fanli.dto.msg.MsgOtherVIPDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherSystemGiveDTO;
import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;
import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail.MsgTypeAccountTypeEnum;
+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;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
-import com.yeshi.fanli.entity.bus.user.UserInviteSeparate;
import com.yeshi.fanli.entity.bus.user.UserInviteValidNum;
import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
@@ -45,7 +45,9 @@
import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
+import com.yeshi.fanli.vo.msg.CommonMsgItemVO;
+import com.yeshi.fanli.vo.msg.CommonMsgItemVOFactory;
@Service
public class UserVIPInfoServiceImpl implements UserVIPInfoService {
@@ -166,71 +168,17 @@
return userVIPInfoMapper.countQuery(key, state);
}
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void inviteSeparate(Long workerId, Long bossId) {
- if (workerId == null || bossId == null)
- return;
-
- // 鏌ヨ璁板綍
- UserInviteSeparate userInviteSeparate = userInviteSeparateService.selectByWorkerIdAndBossId(workerId, bossId);
- if (userInviteSeparate == null)
- return;
-
- // 鏄惁瀛樺湪閭�璇峰叧绯�
- ThreeSale threeSale = threeSaleSerivce.getMyBoss(workerId);
- if (threeSale == null)
- return;
- Long bossIdExist = threeSale.getBoss().getId();
- if (bossIdExist == null || bossId.longValue() != bossIdExist.longValue())
- return;
-
- // 涓婄骇浼氬憳鎯呭喌
- boolean separate = false;
- UserVIPInfo userVIPInfo = userVIPInfoMapper.selectByPrimaryKey(bossId);
- if (userVIPInfo != null && userVIPInfo.getState() != null
- && userVIPInfo.getState() == UserVIPInfo.STATE_SUCCESS) {
- if (userInviteSeparate.getEndTime().getTime() < userVIPInfo.getSuccessTime().getTime()) {
- separate = true; // 缁撴潫鏃堕棿宸茬粡瓒呰繃
- }
- } else {
- separate = true; // 涓婄骇闈炰細鍛�
- }
-
- if (!separate) {
- // 鏈劚绂�
- userInviteSeparateService.updateStateByWorkerIdAndBossId(workerId, bossId,
- UserInviteSeparate.STATE_INVALID);
- } else {
- // 鑴辩鍏崇郴
- userInviteSeparateService.updateStateByWorkerIdAndBossId(workerId, bossId,
- UserInviteSeparate.STATE_SUCCESS);
-
- // 鑴辩閭�璇峰叧绯�
- threeSaleSerivce.inviteSeparate(workerId, bossId);
-
- int limitDays = Integer.parseInt(userVipConfigService.getValueByKey("invite_separate_limit_days"));
- // 娑堟伅
- UserInfo userInfo = userInfoService.selectByPKey(workerId);
- MsgOtherVIPDTO msgboss = new MsgOtherVIPDTO();
- msgboss.setContent1(userInfo.getNickName() + workerId + "浜�"
- + TimeUtil.formatDateDot(userInviteSeparate.getCreateTime()) + "鎴愬姛鍗囩骇鎴愪负瓒呯骇浼氬憳 ");
- msgboss.setContent2("寰堥仐鎲撅紝浣犳湭鑳藉湪" + limitDays + "澶╁崌绾т负瓒呯骇浼氬憳 ");
- msgboss.setContent3("宸蹭笌鍏惰劚绂婚個璇峰叧绯�");
- userOtherMsgNotificationService.teamSplitCallBoss(bossId, "濡傛湁鐤戦棶璇疯仈绯绘垜鐨�-浜哄伐瀹㈡湇", msgboss);
- }
- }
@Transactional(rollbackFor = Exception.class)
@Override
public void applyVIP(Long uid) throws UserVIPInfoException {
UserVIPPreInfo latestProcess = userVIPPreInfoService.getLatestProcessInfo(uid);
if (latestProcess == null || latestProcess.getProcess() != UserVIPPreInfo.PROCESS_2) {
- throw new UserVIPInfoException(1, "璇ョ敤鎴疯繕涓嶆槸楂樼骇浼氬憳");
+ throw new UserVIPInfoException(1, "璇峰厛鍗囩骇涓洪珮绾т細鍛�");
}
if (!verifyVip(uid))
- throw new UserVIPInfoException(1, "绯荤粺楠岃瘉锛氫笉婊¤冻鍗囩骇鏉′欢");
+ throw new UserVIPInfoException(1, "涓嶆弧瓒冲崌绾ф潯浠�");
UserVIPInfo userInfo = userVIPInfoMapper.selectByPrimaryKeyForUpdate(uid);
if (userInfo == null) {
@@ -306,6 +254,16 @@
userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.freeCouponGive.name(),
UserSystemCoupon.SOURCE_SYSTEM_PUSH, null, 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);
}
} catch (Exception e) {
throw new UserVIPInfoException(1, "鍒歌禒閫佸け璐�");
--
Gitblit v1.8.0