2.0.5部分bug修改

admin

2019-12-05 0ec43b39d1232e2e494a35f7d9437a76950aa483

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

@@ -89,6 +89,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.redpack.RedPackForbidService;

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

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

@@ -106,6 +107,7 @@
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;

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

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

@@ -225,16 +227,21 @@


   @Resource

   private UserInfoModifyRecordService userInfoModifyRecordService;

	


   @Resource

   private BindRemindService bindRemindService;

	


   @Resource

   private RedPackBalanceService redPackBalanceService;



   @Resource

   private UserRankService userRankService;



   @Resource

   private UserVIPInfoService userVIPInfoService;

   

   @Resource

   private RedPackForbidService redPackForbidService;

	


   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -281,7 +288,7 @@
            userActiveLog.setOsVersion(acceptData.getOsVersion());

            userActiveLog.setDeviceType(acceptData.getDeviceType());

            userActiveLog.setDevice(acceptData.getDevice());

				


            userActiveLogService.addUserActiveLog(userActiveLog);



            outUserInfo(acceptData, out, remotIP, find, acceptData.getDevice());

@@ -1226,7 +1233,7 @@
      } else if (etype == 111) {

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

      } else if (etype == 110) {

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

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

      }



   }

@@ -2165,26 +2172,38 @@
         // 1.6.5 之后返回 微信号提示

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

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

			


         // 查询是否为VIP

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

            userInfo.setVip(userVIPInfoService.isVIP(uid));

         }



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

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

         if (userInfoExtra.getInviteCodeState() != null

               && userInfoExtra.getInviteCodeState() == UserInfoExtra.INVITE_CODE_SATTE_VALID_UPDATED)

            data.put("invitCodeUpdated", true);// 邀请码是否已经修改过

         else

            data.put("invitCodeUpdated", false);

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

			
         data.put("vipLink", configService.get("vip_link"));// 超级会员升级链接



         // 2.0.1之后绑定手机号

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

            boolean bindPhone = false;

            if (StringUtil.isNullOrEmpty(userInfo.getPhone())) 
            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())) {

            data.put("redPackLock", redPackForbidService.verifyForbid(uid));

            boolean verifyForbid = redPackForbidService.verifyForbid(uid);

            data.put("redPackLock", verifyForbid);

         }

			


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

			


         final UserInfo uuser = userInfo;

         ThreadUtil.run(new Runnable() {

            public void run() {

@@ -2299,7 +2318,7 @@
    */

   @RequestMapping(value = "saveInfo")

   public void saveInfo(AcceptData acceptData, String nickName, String weiXin, Integer sex, Long uid,

         PrintWriter out) {

         String inviteCode, PrintWriter out) {

      try {

         if (uid == null) {

            out.print(JsonUtil.loadFalseResult("用户未登录"));

@@ -2352,6 +2371,28 @@
               userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.gender, sex + "");

            }

         }



         if (!StringUtil.isNullOrEmpty(inviteCode)) {// 邀请码不为空

            inviteCode = inviteCode.trim();

            if (inviteCode.length() >= 4 && inviteCode.length() <= 12) {



               if (!userVIPInfoService.isVIP(uid)) {

                  out.print(JsonUtil.loadFalseResult(20, "只有超级会员才能修改"));

                  return;

               }



               try {

                  userInfoExtraService.updateInviteCode(inviteCode, uid);

                  out.print(JsonUtil.loadTrueResult("保存成功"));

                  return;

               } catch (UserInfoExtraException e) {

                  out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));

               }

            } else {

               out.print(JsonUtil.loadFalseResult(1, "邀请码必须为4到12位"));

               return;

            }

         }

         out.print(JsonUtil.loadTrueResult("保存成功"));

      } catch (UserInfoException e) {

         out.print(JsonUtil.loadFalseResult(e.getMsg()));