From 469bba3a544b3beef0c170f6fce5804c9e8a9676 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 10 四月 2020 17:02:51 +0800
Subject: [PATCH] 消息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java | 46 +++++++++++++---------------------------------
1 files changed, 13 insertions(+), 33 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 4423789..d98c06e 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
@@ -11,22 +11,17 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.dao.mybatis.user.vip.UserVIPInfoMapper;
-import com.yeshi.fanli.dto.msg.MsgAccountVipDTO;
-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.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
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;
import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
-import com.yeshi.fanli.exception.msg.MsgAccountDetailException;
import com.yeshi.fanli.exception.user.vip.UserVIPInfoException;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
@@ -39,7 +34,7 @@
import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;
-import com.yeshi.fanli.service.inter.user.msg.MsgAccountDetailService;
+import com.yeshi.fanli.service.inter.user.msg.UserAccountMsgNotificationService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService;
import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
@@ -94,7 +89,7 @@
private UserVIPPreInfoService userVIPPreInfoService;
@Resource
- private MsgAccountDetailService msgAccountDetailService;
+ private UserAccountMsgNotificationService userAccountMsgNotificationService;
@Resource
private UserInviteValidNumService userInviteValidNumService;
@@ -184,12 +179,11 @@
if (userInfo == null) {
userInfo = new UserVIPInfo();
userInfo.setId(uid);
- // 娣诲姞璁板綍
addUserVIPInfo(userInfo);
}
if (userInfo.getState() != UserVIPInfo.STATE_INVALID)
- throw new UserVIPInfoException(2, "宸茬粡鐢宠杩�");
+ throw new UserVIPInfoException(2, "绯荤粺宸叉敹鍒颁綘鐨勮秴绾т細鍛樺崌绾х敵璇凤紝灏嗕細灏藉揩瀹屾垚瀹℃牳");
UserVIPInfo info = new UserVIPInfo();
info.setId(userInfo.getId());
@@ -197,20 +191,6 @@
info.setState(UserVIPInfo.STATE_VERIFING);
info.setUpdateTime(new Date());
userVIPInfoMapper.updateByPrimaryKeySelective(info);
-
- MsgAccountDetail detail = new MsgAccountDetail();
- detail.setTitle("灏婃暚鐨勯珮绾т細鍛橈紝绯荤粺宸叉敹鍒颁綘鐨勮秴绾т細鍛樺崌绾х敵璇凤紝姝ｅ湪鍙楃悊涓�");
- detail.setBeiZhu("濡傛湁鐤戦棶璇疯仈绯绘垜鐨�-浜哄伐瀹㈡湇");
- detail.setRead(false);
- detail.setCreateTime(new Date());
- detail.setUser(new UserInfo(uid));
- detail.setContent("鎴戜滑灏嗕細鍦�48灏忔椂鍐呭畬鎴愬鏍�");
- detail.setType(MsgTypeAccountTypeEnum.vipApply);
- try {
- msgAccountDetailService.addMsgAccountDetail(detail);
- } catch (MsgAccountDetailException e) {
- e.printStackTrace();
- }
}
@Transactional(rollbackFor = Exception.class)
@@ -269,11 +249,14 @@
throw new UserVIPInfoException(1, "鍒歌禒閫佸け璐�");
}
- // 娑堟伅
- MsgAccountVipDTO msgDto = new MsgAccountVipDTO();
- msgDto.setStatus("宸插皢浣犵殑璐︽埛鐢遍珮绾т細鍛樺崌绾т负瓒呯骇浼氬憳");
- msgDto.setEquity("浠庢敹鍒版湰娑堟伅璧凤紝浣犲皢鑾峰緱鍏ㄩ儴瓒呯骇浼氬憳鏉冪泭");
- msgAccountDetailService.addMsgVIP(uid, "鎭枩浣狅紒缁忎汉宸ュ鏍镐綘婊¤冻鍗囩骇瓒呯骇浼氬憳鏉′欢", "濡傛湁鐤戦棶璇疯仈绯绘垜鐨�-浜哄伐瀹㈡湇", msgDto);
+ // 鍗囩骇娑堟伅
+ try {
+ UserVIPPreInfo pre1 = userVIPPreInfoService.getVipByProcess(uid, UserVIPPreInfo.PROCESS_2);
+ int days = DateUtil.daysBetween(pre1.getCreateTime(), new Date());
+ userAccountMsgNotificationService.vipUpgradeSuccess(uid, days);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/**
@@ -346,10 +329,7 @@
userVIPInfoMapper.updateByPrimaryKeySelective(info);
// 娑堟伅
- MsgAccountVipDTO msgDto = new MsgAccountVipDTO();
- msgDto.setStatus("浣犵殑璐﹀彿浠嶆槸楂樼骇浼氬憳");
- msgDto.setReason(reason);
- msgAccountDetailService.addMsgVIP(uid, "寰堟姳姝夛紒缁忎汉宸ュ鏍镐綘鏈弧瓒虫垨涓嶇鍚堝崌绾ц秴绾т細鍛樼殑鏉′欢", "濡傛湁鐤戦棶璇疯仈绯绘垜鐨�-浜哄伐瀹㈡湇", msgDto);
+ userAccountMsgNotificationService.vipUpgradeFail(uid, reason);
}
}
--
Gitblit v1.8.0