帮助中心版本区分

yujian

2020-01-03 2d538eff0cfe0eadff3cb9d9c1db9e45f6109ab1

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

@@ -108,8 +108,10 @@
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.service.inter.user.vip.UserVipConfigService;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FilePathEnum;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.HongBaoUtil;

import com.yeshi.fanli.util.RedisManager;

@@ -241,6 +243,9 @@
   private UserVIPInfoService userVIPInfoService;

   

   @Resource

   private UserVipConfigService userVipConfigService;

	
   @Resource

   private RedPackForbidService redPackForbidService;



   private static final String PASSWORD_MAX_ERROR = "password_max_error";

@@ -359,7 +364,7 @@
            form.setPortrait(weiXinUser.getHeadimgurl());

            String wxHeadImg = COSManager.getInstance()

                  .uploadFile(HttpUtil.getAsInputStream(weiXinUser.getHeadimgurl()),

                        Constant.WXHEADURL + UUID.randomUUID().toString())

                        FilePathEnum.userPortrait.getPath() + UUID.randomUUID().toString())

                  .getUrl();

            form.setWxPic(wxHeadImg);

            form.setNickName(weiXinUser.getNickname());

@@ -697,7 +702,7 @@
         find.setWxUnionId(weiXinUser.getUnionid());

         String wxHeadImg = COSManager.getInstance()

               .uploadFile(HttpUtil.getAsInputStream(weiXinUser.getHeadimgurl()),

                     Constant.WXHEADURL + UUID.randomUUID().toString())

                     FilePathEnum.userPortrait.getPath() + UUID.randomUUID().toString())

               .getUrl();

         find.setWxPic(wxHeadImg);

      } else { // 绑定淘宝

@@ -2173,8 +2178,11 @@
            userInfo.setWeiXinTip("添加微信号后，你的邀请人和直接粉丝可以通过微信与你建立联系。");



         // 查询是否为VIP

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

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

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

				
            boolean verifyForbid = redPackForbidService.verifyForbid(uid);

            data.put("redPackLock", verifyForbid);

         }



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

@@ -2184,7 +2192,7 @@
         else

            data.put("invitCodeUpdated", false);

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

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

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



         // 2.0.1之后绑定手机号

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

@@ -2193,13 +2201,6 @@
               bindPhone = bindRemindService.bindRemind(uid, BindRemind.TYPE_PHONE);

            data.put("bindPhone", bindPhone);

         }



         // 2.0.2 版本

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

            boolean verifyForbid = redPackForbidService.verifyForbid(uid);

            data.put("redPackLock", verifyForbid);

         }



         

         if  (!StringUtil.isNullOrEmpty(invitCode)) {

            // 2.0.6 返回邀请人

@@ -2383,12 +2384,6 @@
         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.updateInviteCodeVip(inviteCode, uid);

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