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/UserVipController.java

@@ -82,6 +82,31 @@
      }

   }



   @RequestMapping(value = "getApplyInfo")

   public void getApplyInfo(AcceptData acceptData, String id, Long uid, String callback, PrintWriter out) {

      if (StringUtil.isNullOrEmpty(id)) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请上传id"));

         return;

      }



      GiveVIPApplyInfo info = giveVIPApplyInfoService.selectByPrimaryKey(id);

      if (info == null) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("申请信息不存在"));

         return;

      }



      // 查询开通人是否为他的下级

      ThreeSaleDetail detail = threeSaleDetailService.getByBossUidAndWorkerUid(info.getSourceUid(),

            info.getTargetUid());

      if (detail == null && info.getTargetUid().longValue() != uid) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("该用户不是您的粉丝"));

         return;

      }



      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(info)));



   }



   // 提交申请信息

   @RequestMapping(value = "uploadApplyInfo")

   public void uploadApplyInfo(AcceptData acceptData, GiveVIPApplyInfo info, String callback,

@@ -132,8 +157,9 @@
         if (imgList.size() > 0)

            info.setImgList(imgList);

         info.setState(GiveVIPApplyInfo.STATE_NOT_VERIFY);

         giveVIPApplyInfoService.updateGiveVIPApplyInfo(info);

			
      }

      giveVIPApplyInfoService.updateGiveVIPApplyInfo(info);

      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("资料提交成功"));

   }



@@ -171,9 +197,9 @@


      Gson gson = gb.create();



      if (Constant.IS_TEST) {

         count = 100;

      }

      // if (Constant.IS_TEST) {

      // count = 100;

      // }



      JSONObject data = new JSONObject();

      data.put("list", gson.toJson(recordList));