iso版本改为81

yujian

2020-05-18 bf052072dbce8c74f1eeff6adb4af1c73e94ffce

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

@@ -26,10 +26,12 @@
import com.google.gson.JsonSerializationContext;

import com.google.gson.JsonSerializer;

import com.yeshi.fanli.entity.accept.AcceptData;

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

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

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

import com.yeshi.fanli.exception.ParamsException;

import com.yeshi.fanli.exception.user.vip.GiveVIPApplyInfoException;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleDetailService;

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

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

import com.yeshi.fanli.util.Constant;

@@ -57,8 +59,19 @@
   @Resource

   private UserVipConfigService userVipConfigService;



   @Resource

   private ThreeSaleDetailService threeSaleDetailService;



   @RequestMapping(value = "applyVip")

   public void applyVip(AcceptData acceptData, GiveVIPApplyInfo info, String callback, PrintWriter out) {

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

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

            info.getTargetUid());

      if (detail == null) {

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

         return;

      }



      try {

         info = giveVIPApplyInfoService.addGiveVIPApplyInfo(info);

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("申请成功"));

@@ -134,8 +147,8 @@
      if (Constant.IS_TEST) {

         page = 1;

      }

      List<GiveVIPApplyInfo> list = giveVIPApplyInfoService.listByTargetUid(uid, page, Constant.PAGE_SIZE);

      long count = giveVIPApplyInfoService.countByTargetUid(uid);

      List<GiveVIPApplyInfo> list = giveVIPApplyInfoService.listBySourceUid(uid, page, Constant.PAGE_SIZE);

      long count = giveVIPApplyInfoService.countBySourceUid(uid);

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

      String vipLink = userVipConfigService.getValueByKey("vip_link");