消息

yujian

2020-04-11 17e98d7bcc27072f97976d24eb504abb02914891

 fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java

@@ -23,6 +23,7 @@
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.vip.UserLevelEnum;

import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.entity.order.CommonOrderGoods;

import com.yeshi.fanli.entity.order.HongBaoOrder;

@@ -36,6 +37,7 @@
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.service.manger.user.UserLevelManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

@@ -76,6 +78,9 @@


   @Resource

   private UserVIPInfoService userVIPInfoService;



   @Resource

   private UserLevelManager userLevelManager;



   /**

    * 添加红包信息

@@ -704,9 +709,11 @@
      UserInfo user = userInfoService.getUserById(commonOrder.getUserInfo().getId());

      if (user == null)

         throw new UserAccountException(1001, "用户不存在/被封禁");

      if (isVIP) {

         hongBao.setUrank(HongBaoV2.RANK_VIP);// VIP的等级设置为100

      } else {

      UserLevelEnum userLevel = userLevelManager.getUserLevel(commonOrder.getUserInfo().getId(),

            commonOrder.getThirdCreateTime());

      if (userLevel != null)

         hongBao.setUrank(userLevel.getOrderRank());

      else {

         hongBao.setUrank(user.getRank());

      }

      hongBao.setOrderType(commonOrder.getSourceType());

@@ -850,8 +857,10 @@
      UserInfo user = userInfoService.getUserById(commonOrder.getUserInfo().getId());

      if (user == null)

         throw new UserAccountException(1001, "用户不存在/被封禁");

      if (isVip)

         hongBao.setUrank(HongBaoV2.RANK_VIP);

      UserLevelEnum userLevel = userLevelManager.getUserLevel(commonOrder.getUserInfo().getId(),

            commonOrder.getThirdCreateTime());

      if (userLevel != null)

         hongBao.setUrank(userLevel.getOrderRank());

      else

         hongBao.setUrank(user.getRank());

      hongBao.setUserInfo(user);