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

admin

2019-11-15 534a87e48dfbaff65605995ec2a29211e0a8f45a

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

@@ -44,6 +44,7 @@
import com.yeshi.fanli.entity.AppVersionInfo;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.user.AccountMessage;

import com.yeshi.fanli.entity.bus.user.BindRemind;

import com.yeshi.fanli.entity.bus.user.BindingAccount;

import com.yeshi.fanli.entity.bus.user.Extract;

import com.yeshi.fanli.entity.bus.user.ExtractRecord;

@@ -54,14 +55,15 @@
import com.yeshi.fanli.entity.bus.user.UserActiveLog;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;

import com.yeshi.fanli.entity.bus.user.WeiXinUser;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.common.Config;

import com.yeshi.fanli.entity.goods.CollectionGoodsV2;

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;

@@ -88,8 +90,10 @@
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;

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

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

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

@@ -99,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;

@@ -221,6 +226,16 @@


   @Resource

   private UserInfoModifyRecordService userInfoModifyRecordService;

	
   @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";

@@ -1210,7 +1225,7 @@
      } else if (etype == 3) {

         out.print(JsonUtil.loadFalseResult("提现金额大于我的红包"));

      } else if (etype == 111) {

         out.print(JsonUtil.loadFalseResult("更换了手机号后7天内不允许提现"));

         out.print(JsonUtil.loadFalseResult("修改手机号后，7天内无法提现"));

      } else if (etype == 110) {

         out.print(JsonUtil.loadFalseResult("有维权订单尚未扣款"));

      }

@@ -2075,6 +2090,7 @@
         userActiveLog.setVersionCode(acceptData.getVersion());

         userActiveLog.setOsVersion(acceptData.getOsVersion());

         userActiveLog.setDeviceType(acceptData.getDeviceType());

         userActiveLog.setDevice(acceptData.getDevice());

         userActiveLogService.addUserActiveLog(userActiveLog);



         // 处理用户信息

@@ -2150,12 +2166,32 @@
         // 1.6.5 之后返回 微信号提示

         if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))

            userInfo.setWeiXinTip("添加微信号后，你的邀请人和一级队员可以通过微信与你建立联系。");



			
         data.put("user", JsonUtil.getConvertBigDecimalToStringBuilder(gsonBuilder).create().toJson(userInfo));

         data.put("invitCode", invitCode); // 邀请码

         data.put("welfareCenterNews", welfareCenterNews);// 福利中心消息

			
         // 2.0.1之后绑定手机号

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

            boolean bindPhone = false;

            if (StringUtil.isNullOrEmpty(userInfo.getPhone())) 
               bindPhone = bindRemindService.bindRemind(uid, BindRemind.TYPE_PHONE);

            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;

         ThreadUtil.run(new Runnable() {

            public void run() {