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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -274,10 +274,9 @@


   @Resource

   private GiveVIPApplyInfoService giveVIPApplyInfoService;

	


   @Resource

   private PreviewInfoService previewInfoService;

	


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

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

@@ -2229,25 +2228,25 @@
         if (VersionUtil.greaterThan_2_0_7(acceptData.getPlatform(), acceptData.getVersion())) {

            UserInviteLevelEnum level = null;

            // VIP预览信息

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

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

               String redisContent = previewInfoService.getRedisContent(uid, PreviewEnum.mineInfo);

               if (!StringUtil.isNullOrEmpty(redisContent)) {

                  MineInfoVO vo = new Gson().fromJson(redisContent, MineInfoVO.class);

                  if (vo != null) {

                     if (!StringUtil.isNullOrEmpty(vo.getBalance()))

                        userInfo.setMyHongBao(new BigDecimal(vo.getBalance()));

							


                     if (!StringUtil.isNullOrEmpty(vo.getLevel()))

                         for (UserInviteLevelEnum levelEnum: UserInviteLevelEnum.values()) {

                            if (levelEnum.name().equals(vo.getLevel())) {

                               level = levelEnum;

                               break;

                            }

                         }

                        for (UserInviteLevelEnum levelEnum : UserInviteLevelEnum.values()) {

                           if (levelEnum.name().equals(vo.getLevel())) {

                              level = levelEnum;

                              break;

                           }

                        }

                  }

               }

            }

				


            if (level == null) {

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

                  level = userInviteService.getUserInviteLevelNew(uid);

@@ -2268,7 +2267,9 @@
            UserLevelEnum level = userLevelManager.getUserLevel(uid);



            JSONObject vipAction = null;

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

            String managerLink = userVipConfigService.getValueByKey("vip_manager_link");

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

                  && !StringUtil.isNullOrEmpty(managerLink)) {

               vipAction = new JSONObject();

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

               vipAction.put("jumpDetail",

@@ -2278,7 +2279,6 @@
               JSONObject params = new JSONObject();

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

               vipAction.put("params", params);



            } else {

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

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

@@ -2303,6 +2303,8 @@
               data.put("vipAction", vipAction);



         }

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



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