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

@@ -2247,7 +2247,7 @@
                           acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2,

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

               JSONObject params = new JSONObject();

               params.put("url", "");

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

               vipAction.put("params", params);



            } else {

@@ -2255,17 +2255,18 @@
               List<GiveVIPApplyInfo> list = giveVIPApplyInfoService.listByStateAndTargetUid(uid,

                     GiveVIPApplyInfo.STATE_NO_INFO, 1, 20);

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



                  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", "");

                  vipAction.put("params", params);



                  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);

                  }

               }

            }