From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java | 398 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 282 insertions(+), 116 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 1f45dd5..fd6b9db 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,9 +1,5 @@
package com.yeshi.fanli.service.impl.user.vip;
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -11,44 +7,90 @@
import javax.annotation.Resource;
+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.entity.bus.user.HongBaoV2;
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.shop.BanLiShopOrder;
+import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;
+import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.exception.user.vip.UserVIPInfoException;
+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.shop.BanLiShopOrderService;
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;
+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.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;
+import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
@Service
public class UserVIPInfoServiceImpl implements UserVIPInfoService {
@Resource
private UserVIPInfoMapper userVIPInfoMapper;
-
+
+ @Resource
+ private UserInfoService userInfoService;
+
@Resource
private UserInfoExtraService userInfoExtraService;
-
+
@Resource
private UserVipConfigService userVipConfigService;
-
+
+ @Lazy
@Resource
private HongBaoV2CountService hongBaoV2CountService;
-
+
@Resource
private IntegralDetailService integralDetailService;
-
+
@Resource
private BanLiShopOrderService banLiShopOrderService;
+
+ @Resource
+ private UserOtherMsgNotificationService userOtherMsgNotificationService;
+
+ @Resource
+ private ThreeSaleSerivce threeSaleSerivce;
+
+ @Resource
+ private UserInviteSeparateService userInviteSeparateService;
+
+ @Resource
+ private ConfigService configService;
+
+ @Lazy
+ @Resource
+ private UserSystemCouponService userSystemCouponService;
+
+ @Resource
+ private UserVIPPreInfoService userVIPPreInfoService;
+
+ @Resource
+ private UserAccountMsgNotificationService userAccountMsgNotificationService;
+ @Resource
+ private UserInviteValidNumService userInviteValidNumService;
@Override
+ @Transactional(rollbackFor = Exception.class)
public void addUserVIPInfo(UserVIPInfo info) throws UserVIPInfoException {
if (info.getId() == null) {
throw new UserVIPInfoException(1, "淇℃伅涓嶅畬鏁�");
@@ -63,67 +105,17 @@
userVIPInfoMapper.insert(info);
}
- @Transactional
- @Override
- public void passVIPApply(Long uid) throws UserVIPInfoException {
- UserVIPInfo userInfo = userVIPInfoMapper.selectByPrimaryKeyForUpdate(uid);
- if (userInfo == null) {
- throw new UserVIPInfoException(1, "鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
- }
- if (userInfo.getState() != UserVIPInfo.STATE_VERIFING) {
- throw new UserVIPInfoException(2, "鐢宠鏈浜庡鏍哥姸鎬�");
- }
-
- UserVIPInfo info = new UserVIPInfo();
- info.setId(userInfo.getId());
- info.setSuccessTime(new Date());
- info.setState(UserVIPInfo.STATE_SUCCESS);
- info.setUpdateTime(new Date());
- userVIPInfoMapper.updateByPrimaryKeySelective(info);
- }
-
- @Transactional
- @Override
- public void rejectVIPApply(Long uid, String reason) throws UserVIPInfoException {
- UserVIPInfo userInfo = userVIPInfoMapper.selectByPrimaryKeyForUpdate(uid);
- if (userInfo == null) {
- throw new UserVIPInfoException(1, "鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
- }
- if (userInfo.getState() != UserVIPInfo.STATE_VERIFING) {
- throw new UserVIPInfoException(2, "鐢宠鏈浜庡鏍哥姸鎬�");
- }
-
- UserVIPInfo info = new UserVIPInfo();
- info.setId(userInfo.getId());
- info.setState(UserVIPInfo.STATE_INVALID);
- info.setUpdateTime(new Date());
- userVIPInfoMapper.updateByPrimaryKeySelective(info);
- }
-
- @Transactional
- @Override
- public void applyVIP(Long uid) throws UserVIPInfoException {
- UserVIPInfo userInfo = userVIPInfoMapper.selectByPrimaryKeyForUpdate(uid);
- if (userInfo == null) {
- throw new UserVIPInfoException(1, "鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
- }
-
- if (userInfo.getState() != UserVIPInfo.STATE_INVALID) {
- throw new UserVIPInfoException(2, "宸茬粡鐢宠杩�");
- }
-
- UserVIPInfo info = new UserVIPInfo();
- info.setId(userInfo.getId());
- info.setApplyTime(new Date());
- info.setState(UserVIPInfo.STATE_VERIFING);
- info.setUpdateTime(new Date());
- userVIPInfoMapper.updateByPrimaryKeySelective(info);
- }
@Override
public boolean isVIP(Long uid) {
+ return isVIP(uid, System.currentTimeMillis());
+ }
+
+ @Override
+ public boolean isVIP(Long uid, Long time) {
UserVIPInfo userInfo = userVIPInfoMapper.selectByPrimaryKey(uid);
- if (userInfo != null && userInfo.getState() == UserVIPInfo.STATE_SUCCESS)
+ if (userInfo != null && userInfo.getState() == UserVIPInfo.STATE_SUCCESS
+ && userInfo.getSuccessTime().getTime() < time)
return true;
else
return false;
@@ -155,61 +147,235 @@
return map;
}
-
+
@Override
- public boolean verifyConform(Long uid) {
- if (uid == null || uid <= 0)
- return false;
-
- UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
- if (extra == null)
- return false;
-
- String limtDate = userVipConfigService.getValueByKey("vip_execute_time");
- Date executeDate = null;
+ public List<UserVIPInfo> listQuery(int page, int count, String key, Integer state) {
+ return userVIPInfoMapper.listQuery((page - 1) * count, count, key, state);
+ }
+
+ @Override
+ public long countQuery(String key, Integer state) {
+ return userVIPInfoMapper.countQuery(key, state);
+ }
+
+
+ @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, "璇峰厛鍗囩骇涓洪珮绾т細鍛�");
+ }
+
+ if (!verifyVip(uid))
+ throw new UserVIPInfoException(1, "涓嶆弧瓒冲崌绾ф潯浠�");
+
+ UserVIPInfo userInfo = userVIPInfoMapper.selectByPrimaryKeyForUpdate(uid);
+ if (userInfo == null) {
+ userInfo = new UserVIPInfo();
+ userInfo.setId(uid);
+ addUserVIPInfo(userInfo);
+ }
+
+ if (userInfo.getState() != UserVIPInfo.STATE_INVALID)
+ throw new UserVIPInfoException(2, "绯荤粺宸叉敹鍒颁綘鐨勮秴绾т細鍛樺崌绾х敵璇凤紝灏嗕細灏藉揩瀹屾垚瀹℃牳");
+
+ UserVIPInfo info = new UserVIPInfo();
+ info.setId(userInfo.getId());
+ info.setApplyTime(new Date());
+ info.setState(UserVIPInfo.STATE_VERIFING);
+ info.setUpdateTime(new Date());
+ userVIPInfoMapper.updateByPrimaryKeySelective(info);
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public void passVIPApply(Long uid) throws UserVIPInfoException {
+ UserVIPInfo userVIPInfo = userVIPInfoMapper.selectByPrimaryKeyForUpdate(uid);
+ if (userVIPInfo == null) {
+ throw new UserVIPInfoException(1, "鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ if (userVIPInfo.getState() != UserVIPInfo.STATE_VERIFING) {
+ throw new UserVIPInfoException(2, "鐢宠鏈浜庡鏍哥姸鎬�");
+ }
+
+ UserVIPPreInfo latestProcess = userVIPPreInfoService.getLatestProcessInfo(uid);
+ if (latestProcess == null || latestProcess.getProcess() != UserVIPPreInfo.PROCESS_2) {
+ throw new UserVIPInfoException(1, "璇ョ敤鎴疯繕涓嶆槸楂樼骇浼氬憳");
+ }
+
+ if (!verifyVip(uid))
+ throw new UserVIPInfoException(1, "绯荤粺楠岃瘉锛氫笉婊¤冻鍗囩骇鏉′欢");
+
+ // 棰濆淇℃伅
+ UserInfoExtra userInfoExtra = userInfoExtraService.getByUidForUpdate(uid);
+ if (userInfoExtra == null)
+ throw new UserVIPInfoException(1, "鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+
+ Date upgradeTime = new Date();
+ // 閫氳繃瓒呯骇浼氬憳
+ UserVIPInfo info = new UserVIPInfo();
+ info.setId(userVIPInfo.getId());
+ info.setSuccessTime(upgradeTime);
+ info.setState(UserVIPInfo.STATE_SUCCESS);
+ info.setUpdateTime(upgradeTime);
+ userVIPInfoMapper.updateByPrimaryKeySelective(info);
+
try {
- SimpleDateFormat format = new SimpleDateFormat("yyyy-mm-dd");
- executeDate = format.parse(limtDate);
- } catch (ParseException e) {
+ // 璧犻�佸厤鍗曞埜
+ String giveCoupon = userVipConfigService.getValueByKey("vip_pre_10_gift_givefree_coupon");
+ if (!StringUtil.isNullOrEmpty(giveCoupon)) {
+ int num = Integer.parseInt(giveCoupon);
+ userSystemCouponService.freeCouponWin(uid, CouponTypeEnum.freeCouponGive,
+ UserSystemCoupon.SOURCE_SYSTEM_PUSH, num, true);
+ }
+ } catch (Exception e) {
+ throw new UserVIPInfoException(1, "鍒歌禒閫佸け璐�");
+ }
+
+ try {
+ // 鍗囩骇娑堟伅
+ UserVIPPreInfo pre1 = userVIPPreInfoService.getVipByProcess(uid, UserVIPPreInfo.PROCESS_2);
+ int days = DateUtil.daysBetween(pre1.getCreateTime(), new Date());
+ userAccountMsgNotificationService.vipUpgradeSuccess(uid, days);
+
+ // 鍗囩骇鎻愰啋涓婄骇
+ userVIPPreInfoService.remindBoss(uid, "瓒呯骇浼氬憳", getPassItem(uid), upgradeTime, false);
+ } catch (Exception e) {
e.printStackTrace();
}
- if (executeDate == null)
- return false;
+ }
+
+
+ /**
+ * 楠岃瘉鏄惁绗﹀悎VIP
+ * @param uid
+ * @return
+ */
+ private String getPassItem(Long uid) {
+ // 鑷喘璁㈠崟
+ long doneZiGou = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
+ HongBaoV2.TYPE_ZIGOU);
+ // 鍒嗕韩璁㈠崟
+ long doneShare = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
+ HongBaoV2.TYPE_SHARE_GOODS);
- // 1銆佺洿鎺ョ矇涓濓紙浠� 2020 骞� 1 鏈� 1 鏃ヨ捣鐩存帴绮変笣浜х敓鏈夋晥璁㈠崟锛�
- BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));
- long teamNum = hongBaoV2CountService.countValidOrderTeamUserByUid(uid, executeDate.getTime(), payMoney);
- if (extra.getFirstLoginTime() == null || extra.getFirstLoginTime().getTime() < executeDate.getTime()) {
- long limitNum = Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_old_user"));
- if (teamNum < limitNum)
- return false;
- } else {
- long limitNum = Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_new_user"));
- if (teamNum < limitNum)
- return false;
+ // 鏈夋晥绮変笣
+ int doneFirst = 0;
+ int doneSecond = 0;
+ UserInviteValidNum userInviteValidNum = userInviteValidNumService.selectByPrimaryKey(uid);
+ if (userInviteValidNum != null) {
+ doneFirst = userInviteValidNum.getNumFirst() == null ? 0 : userInviteValidNum.getNumFirst();
+ doneSecond = userInviteValidNum.getNumSecond() == null ? 0 : userInviteValidNum.getNumSecond();
+ }
+
+ long limitZiGou = 0;
+ String zigou = userVipConfigService.getValueByKey("vip_pre_10_zigou_order_count");
+ if (!StringUtil.isNullOrEmpty(zigou)) {
+ limitZiGou = Long.parseLong(zigou);
}
- // 2銆佺疮璁¤嚜璐繑鍒┾墺100 鍏冿紙浠庢敞鍐屾澘鏍楀揩鐪佽捣锛夛紱
- BigDecimal fanMoney = new BigDecimal(userVipConfigService.getValueByKey("require_fan_money"));
- BigDecimal purchase = hongBaoV2CountService.getRewardMoneyBySelf(uid);
- if (purchase.compareTo(fanMoney) < 0)
- return false;
-
- // 3銆佺疮璁￠噾甯佲墺10000 鏋氾紙浠庢敞鍐屾澘鏍楀揩鐪佽捣锛夛紱
- BigDecimal goldCoin = integralDetailService.getCumulativeMoney(uid);
- BigDecimal limitGoldCoin = new BigDecimal(userVipConfigService.getValueByKey("require_gold_coin"));
- if (goldCoin.compareTo(limitGoldCoin) < 0)
- return false;
-
- // 4銆佷娇鐢ㄧ孩鍖呪墺1 娆�
- List<Integer> list = new ArrayList<Integer>();
- list.add(BanLiShopOrder.STATE_SUCCESS);
- long useHongBao = banLiShopOrderService.countByUidAndState(uid, list);
- long limitHongBao = Long.parseLong(userVipConfigService.getValueByKey("require_shop_buy"));
- if (useHongBao < limitHongBao)
- return false;
-
- // 绗﹀悎鏉′欢
- return true;
+ long limitShare = 0;
+ String share = userVipConfigService.getValueByKey("vip_pre_10_share_order_count");
+ if (!StringUtil.isNullOrEmpty(share)) {
+ limitShare = Long.parseLong(share);
+ }
+
+ long limitFirst = 0;
+ String first = userVipConfigService.getValueByKey("vip_pre_10_first_level_team_count");
+ if (!StringUtil.isNullOrEmpty(first)) {
+ limitFirst = Long.parseLong(first);
+ }
+
+ long limitSecond = 0;
+ String second = userVipConfigService.getValueByKey("vip_pre_10_second_level_team_count");
+ if (!StringUtil.isNullOrEmpty(second)) {
+ limitSecond = Long.parseLong(second);
+ }
+
+ String item = "";
+ if (doneZiGou >= limitZiGou) {
+ item = "杩斿埄璁㈠崟";
+ } else if (doneShare >= limitShare) {
+ item = "鍒嗕韩璁㈠崟";
+ } else if (doneFirst >= limitFirst && doneSecond >= limitSecond) {
+ item = "閭�璇风矇涓�";
+ }
+ return item;
}
+
+
+ /**
+ * 楠岃瘉鏄惁绗﹀悎VIP
+ * @param uid
+ * @return
+ */
+ private boolean verifyVip(Long uid) {
+ // 鑷喘璁㈠崟
+ long doneZiGou = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
+ HongBaoV2.TYPE_ZIGOU);
+ // 鍒嗕韩璁㈠崟
+ long doneShare = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
+ HongBaoV2.TYPE_SHARE_GOODS);
+
+ // 鏈夋晥绮変笣
+ int doneFirst = 0;
+ int doneSecond = 0;
+ UserInviteValidNum userInviteValidNum = userInviteValidNumService.selectByPrimaryKey(uid);
+ if (userInviteValidNum != null) {
+ doneFirst = userInviteValidNum.getNumFirst() == null ? 0 : userInviteValidNum.getNumFirst();
+ doneSecond = userInviteValidNum.getNumSecond() == null ? 0 : userInviteValidNum.getNumSecond();
+ }
+
+ long limitZiGou = 0;
+ String zigou = userVipConfigService.getValueByKey("vip_pre_10_zigou_order_count");
+ if (!StringUtil.isNullOrEmpty(zigou)) {
+ limitZiGou = Long.parseLong(zigou);
+ }
+
+ long limitShare = 0;
+ String share = userVipConfigService.getValueByKey("vip_pre_10_share_order_count");
+ if (!StringUtil.isNullOrEmpty(share)) {
+ limitShare = Long.parseLong(share);
+ }
+
+ long limitFirst = 0;
+ String first = userVipConfigService.getValueByKey("vip_pre_10_first_level_team_count");
+ if (!StringUtil.isNullOrEmpty(first)) {
+ limitFirst = Long.parseLong(first);
+ }
+
+ long limitSecond = 0;
+ String second = userVipConfigService.getValueByKey("vip_pre_10_second_level_team_count");
+ if (!StringUtil.isNullOrEmpty(second)) {
+ limitSecond = Long.parseLong(second);
+ }
+
+ if (doneZiGou >= limitZiGou || doneShare >= limitShare || (doneFirst >= limitFirst && doneSecond >= limitSecond)) {
+ return true;
+ }
+ return false;
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public void rejectVIPApply(Long uid, String reason) throws UserVIPInfoException {
+ UserVIPInfo userInfo = userVIPInfoMapper.selectByPrimaryKeyForUpdate(uid);
+ if (userInfo == null) {
+ throw new UserVIPInfoException(1, "鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ if (userInfo.getState() != UserVIPInfo.STATE_VERIFING) {
+ throw new UserVIPInfoException(2, "鐢宠鏈浜庡鏍哥姸鎬�");
+ }
+
+ UserVIPInfo info = new UserVIPInfo();
+ info.setId(userInfo.getId());
+ info.setState(UserVIPInfo.STATE_INVALID);
+ info.setUpdateTime(new Date());
+ userVIPInfoMapper.updateByPrimaryKeySelective(info);
+
+ // 娑堟伅
+ userAccountMsgNotificationService.vipUpgradeFail(uid, reason);
+ }
+
}
--
Gitblit v1.8.0