Merge remote-tracking branch 'origin/div' into div

yujian

2020-05-14 752d00df1ac102f3645e0c98943ae18f8b7e9c3f

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

@@ -58,6 +58,8 @@
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

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

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

import com.yeshi.fanli.entity.bus.user.vip.GiveVIPApplyInfo;

import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;

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

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

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

@@ -77,6 +79,7 @@
import com.yeshi.fanli.exception.user.UserInfoExtraException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.config.AppVersionService;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;

@@ -111,8 +114,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.invite.UserInviteService;

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

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

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

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

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FilePathEnum;

@@ -258,7 +263,14 @@
   @Resource

   private TeamFansInfoService teamFansInfoService;



   @Resource

   private UserLevelManager userLevelManager;

   

   @Resource

   private JumpDetailV2Service jumpDetailV2Service;



   @Resource

   private GiveVIPApplyInfoService giveVIPApplyInfoService;



   private static final String EXTRACT_MIN_MONEY = ConfigKeyEnum.extractMoneyMin.getKey();

   private static final String EXTRACT_MAX_MONEY = ConfigKeyEnum.extractMoneyMAX.getKey();

@@ -1931,7 +1943,6 @@
      out.print(JsonUtil.loadTrueResult("保存成功"));

   }





   /**

    * 设置界面开关状态

    * 

@@ -2223,6 +2234,45 @@
         

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

            data.put("fansCountLink", configService.get(ConfigKeyEnum.teamStatisticsLink.getKey()));

            // 会员动作

            // 查询是否为超级会员，是的话返回超会管理链接

            UserLevelEnum level = userLevelManager.getUserLevel(uid);



            JSONObject vipAction = null;

            if (level == UserLevelEnum.superVIP || level == UserLevelEnum.tearcher) {

               vipAction = new JSONObject();

               vipAction.put("name", "超会管理");

               vipAction.put("jumpDetail",

                     jumpDetailV2Service.getByTypeCache("web",

                           acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2,

                           Integer.parseInt(acceptData.getVersion())));

               JSONObject params = new JSONObject();

               params.put("url", userVipConfigService.getValueByKey("vip_manager_link"));

               vipAction.put("params", params);



            } else {

               // 查询是否可以提交会员申请，是的话返回资料填写页面

               List<GiveVIPApplyInfo> list = giveVIPApplyInfoService.listByStateAndTargetUid(uid,

                     GiveVIPApplyInfo.STATE_NO_INFO, 1, 20);

               if (list != null && list.size() > 0) {

                  String link = userVipConfigService.getValueByKey("apply_vip_upload_info_link");

                  if (!StringUtil.isNullOrEmpty(link)) {

                     vipAction = new JSONObject();

                     vipAction.put("name", "申请会员");

                     vipAction.put("jumpDetail",

                           jumpDetailV2Service.getByTypeCache("web",

                                 acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2,

                                 Integer.parseInt(acceptData.getVersion())));

                     JSONObject params = new JSONObject();

                     params.put("url", link.replace("[ID]", list.get(0).getId()));

                     vipAction.put("params", params);

                  }

               }

            }



            if (vipAction != null)

               data.put("vipAction", vipAction);



         }



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