删除普通会员等级

admin

2020-04-21 0b57cfd62e842b309d03467b96a331c673ecad7c

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

@@ -45,6 +45,7 @@
import com.yeshi.fanli.service.inter.user.vip.UserLevelUpgradedNotifyService;

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

@@ -114,6 +115,10 @@


   @Resource

   private ThreeSaleSerivce threeSaleSerivce;

	
   @Resource

   private UserVipConfigService userVipConfigService;

	


   /**

    * s 首页配置信息

@@ -372,15 +377,14 @@
            // TODO 验证是否是导师

            

            JSONObject inner = new JSONObject();

            inner.put("link", "https://www.baidu.com/");

            inner.put("link", userVipConfigService.getValueByKey("vip_link"));

            inner.put("ion", "http://img.flqapp.com/resource/vip/icon_vip.png");

            inner.put("title", "免费升级 享会员权益");

            inner.put("btnName", "升级会员");

            if (uid != null) {

               // 是否导师 TODO

					
               if (userVIPInfoService.isVIP(uid)) {

                  inner.put("link", "https://www.baidu.com/");

                  inner.put("link", userVipConfigService.getValueByKey("vip_link"));

                  inner.put("ion", "http://img.flqapp.com/resource/vip/icon_tearcher.png");

                  inner.put("title", "拿五险与津贴 享导师权益");

                  inner.put("btnName", "升级会员");

@@ -434,7 +438,7 @@
         if (vipInfo != null && vipInfo.getState() == UserVIPInfo.STATE_SUCCESS)

            time = vipInfo.getSuccessTime();



      } else if (level == UserLevelEnum.highVIP || level == UserLevelEnum.normalVIP) {

      } else if (level == UserLevelEnum.highVIP) {

         UserVIPPreInfo info = userVIPPreInfoService.selectByUidAndProcess(uid, level.getLevel());

         if (info != null)

            time = info.getCreateTime();