红包功能改为2.1版本后再放开

admin

2019-11-15 534a87e48dfbaff65605995ec2a29211e0a8f45a

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java

@@ -63,6 +63,7 @@
import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.money.UserMoneyDetail;

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

import com.yeshi.fanli.entity.redpack.RedPackBalance;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

@@ -89,6 +90,7 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinDetailService;

import com.yeshi.fanli.service.inter.user.AccountMessageService;

import com.yeshi.fanli.service.inter.user.BindRemindService;

@@ -101,6 +103,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserRankService;

import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;

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

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

@@ -226,6 +229,13 @@
   

   @Resource

   private BindRemindService bindRemindService;

	
   @Resource

   private RedPackBalanceService redPackBalanceService;

	
   @Resource

   private UserRankService userRankService;

	


   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -2169,6 +2179,17 @@
            data.put("bindPhone", bindPhone);

         }

         

         // 2.0.2 版本

         if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

            RedPackBalance redPackBalance = redPackBalanceService.selectByPrimaryKey(uid);

            if (redPackBalance != null && redPackBalance.getState() != null && 
                  redPackBalance.getState() == RedPackBalance.STATE_LOCKED) {

               data.put("redPackLock", RedPackBalance.STATE_LOCKED);

            } else {

               data.put("redPackLock", RedPackBalance.STATE_INIT);

            }

         }

			
         out.print(JsonUtil.loadTrueResult(data));

         

         final UserInfo uuser = userInfo;