Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java

@@ -10,21 +10,16 @@
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.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;

@@ -37,7 +32,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;

@@ -89,7 +84,7 @@
   private UserVIPPreInfoService userVIPPreInfoService;



   @Resource

   private MsgAccountDetailService msgAccountDetailService;

   private UserAccountMsgNotificationService userAccountMsgNotificationService;

   

   @Resource

   private UserInviteValidNumService userInviteValidNumService;

@@ -179,12 +174,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());

@@ -192,20 +186,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)

@@ -232,12 +212,13 @@
      if (userInfoExtra == null)

         throw new UserVIPInfoException(1, "用户信息不存在");



      Date upgradeTime = new Date();

      // 通过超级会员

      UserVIPInfo info = new UserVIPInfo();

      info.setId(userVIPInfo.getId());

      info.setSuccessTime(new Date());

      info.setSuccessTime(upgradeTime);

      info.setState(UserVIPInfo.STATE_SUCCESS);

      info.setUpdateTime(new Date());

      info.setUpdateTime(upgradeTime);

      userVIPInfoMapper.updateByPrimaryKeySelective(info);



      try {

@@ -245,29 +226,85 @@
         String giveCoupon = userVipConfigService.getValueByKey("vip_pre_10_gift_givefree_coupon");

         if (!StringUtil.isNullOrEmpty(giveCoupon)) {

            int num = Integer.parseInt(giveCoupon);

            for (int i = 0; i < num; i++) {

               userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.freeCouponGive.name(),

                     UserSystemCoupon.SOURCE_SYSTEM_PUSH, null, false);

            }

				
            // 消息

            MsgOtherSystemGiveDTO dto = new MsgOtherSystemGiveDTO();

            dto.setName("系统赠送 ");

            dto.setReason("恭喜你！成功升级为超级会员");

            dto.setDesc("获得赠送免单券" + num +"张");

            userOtherMsgNotificationService.vipUpgradeReward(uid, "详情查看，对应会员权益", dto);

            userSystemCouponService.freeCouponWin(uid, CouponTypeEnum.freeCouponGive,

                  UserSystemCoupon.SOURCE_SYSTEM_PUSH, num, true);

         }

      } catch (Exception e) {

         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);

			
         // 升级提醒上级

         userVIPPreInfoService.remindBoss(uid, "超级会员", getPassItem(uid), upgradeTime, false);

      } catch (Exception e) {

         e.printStackTrace();

      }

   }





   /**

    * 验证是否符合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);

		
      // 有效粉丝

      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);

      }

		
      String item = "";

      if (doneZiGou >= limitZiGou) {

         item = "返利订单";

      } else if (doneShare >= limitShare) {

         item = "分享订单";

      } else if (doneFirst >= limitFirst && doneSecond >= limitSecond) {

         item = "邀请粉丝";

      }

      return item;

   }

	
	
   /**

    * 验证是否符合VIP

    * @param uid

@@ -338,10 +375,7 @@
      userVIPInfoMapper.updateByPrimaryKeySelective(info);



      // 消息

      MsgAccountVipDTO msgDto = new MsgAccountVipDTO();

      msgDto.setStatus("你的账号仍是高级会员");

      msgDto.setReason(reason);

      msgAccountDetailService.addMsgVIP(uid, "很抱歉！经人工审核你未满足或不符合升级超级会员的条件", "如有疑问请联系我的-人工客服", msgDto);

      userAccountMsgNotificationService.vipUpgradeFail(uid, reason);

   }



}