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

yujian

2020-05-06 a4637ae9d71aa4a624b217ed3a1483f0e3a3a7ed

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

@@ -2,10 +2,12 @@


import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;



import javax.annotation.Resource;



import org.json.JSONArray;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

@@ -17,8 +19,13 @@
import com.yeshi.fanli.entity.bus.homemodule.FloatAD.FloatADTypeEnum;

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;

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

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

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

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

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

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

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

import com.yeshi.fanli.entity.common.JumpDetailV2;

import com.yeshi.fanli.entity.config.AppHomeFloatImg;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

@@ -34,13 +41,20 @@
import com.yeshi.fanli.service.inter.user.UserActiveLogService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

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

import com.yeshi.fanli.service.inter.user.notify.UserActivedRecordService;

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;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.vo.user.UserDialogBtnVO;

import com.yeshi.fanli.vo.user.UserDialogVO;

import com.yeshi.fanli.vo.user.VIPUpgradedNotifyVO;



import net.sf.json.JSONObject;



@@ -89,6 +103,21 @@


   @Resource

   private UserInfoService userInfoService;



   @Resource

   private UserVIPInfoService userVIPInfoService;



   @Resource

   private UserVIPPreInfoService userVIPPreInfoService;



   @Resource

   private UserLevelUpgradedNotifyService userLevelUpgradedNotifyService;



   @Resource

   private ThreeSaleSerivce threeSaleSerivce;



   @Resource

   private UserVipConfigService userVipConfigService;



   /**

    * s 首页配置信息

@@ -260,7 +289,8 @@
    * @param out

    */

   @RequestMapping(value = "closeDialogNotify", method = RequestMethod.POST)

   public void closeDialogNotify(AcceptData acceptData, Long uid, String id, int type, PrintWriter out) {

   public void closeDialogNotify(AcceptData acceptData, Long uid, String id, String sourceId, int type,

         PrintWriter out) {



      if (uid == null) {

         out.print(JsonUtil.loadFalseResult("用户未登录"));

@@ -272,6 +302,9 @@
      }

      if (id.equalsIgnoreCase("tearcherNotify")) {

         userActivedRecordService.setTearcherNotified(uid);

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

      } else if (id.equalsIgnoreCase("vipUpgradedNotify")) {

         userLevelUpgradedNotifyService.setNotified(sourceId);

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

      } else {

         out.print(JsonUtil.loadFalseResult("id不存在"));

@@ -295,12 +328,18 @@
         data.put("taoBaoCart", source);



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

            // 我的界面banner

            List<SwiperPicture> banner = swiperPictureService.getByBannerCardAndVersion("my_interface_banner",

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

            if (banner == null)

               banner = new ArrayList<SwiperPicture>();

            data.put("banner", JsonUtil.getApiCommonGson().toJson(banner));

            // IOS正在上线版本

            if ("ios".equalsIgnoreCase(acceptData.getPlatform())

                  && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {

               data.put("banner", new JSONArray());

            } else {

               // 我的界面banner

               List<SwiperPicture> banner = swiperPictureService.getByBannerCardAndVersion("my_interface_banner",

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

               if (banner == null)

                  banner = new ArrayList<SwiperPicture>();

               data.put("banner", JsonUtil.getApiCommonGson().toJson(banner));

            }

         }



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

@@ -336,14 +375,96 @@


               data.put("tearcherLink", tearcherLink);

            }

         }



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

            UserVIPPreInfo info = userVIPPreInfoService.getLatestProcessInfo(uid);

            JSONObject inner = new JSONObject();

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

               if (info != null && info.getProcess() >= UserVIPPreInfo.PROCESS_3) {

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

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

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

                  if (info.getProcess() == UserVIPPreInfo.PROCESS_4)

                     inner.put("btnName", "板栗快省");

                  else

                     inner.put("btnName", "升级导师");

               } else {

                  UserVIPPreInfo userVIPPreInfo = userVIPPreInfoService.getLatestProcessInfo(uid);

                  if (userVIPPreInfo != null) {

                     if (userVIPPreInfo.getProcess() == UserVIPPreInfo.PROCESS_1) {

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

                     } else if (userVIPPreInfo.getProcess() == UserVIPPreInfo.PROCESS_2) {

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

                     }

                  }

               }

            }

            // IOS正在上线

            if ("ios".equalsIgnoreCase(acceptData.getPlatform())

                  && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {

            } else

               data.put("vip", inner);

            // 平台规则

            String platformRuleLink = configService.get(ConfigKeyEnum.platformRule.getKey());

            data.put("platformRule", platformRuleLink);

         }



         if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()) && uid != null) {

            UserLevelUpgradedNotify notify = userLevelUpgradedNotifyService.getNeedNotifyByUid(uid);

            if (notify != null) {

               Date endTime = getUpgradedTime(uid, notify.getToLevel());

               Date startTime = getUpgradedTime(uid, notify.getFromLevel());

               if (endTime != null && startTime != null) {

                  VIPUpgradedNotifyVO notifyVO = new VIPUpgradedNotifyVO();

                  notifyVO.setDay(TimeUtil.getDayDifferenceCount(startTime, endTime));

                  notifyVO.setDetailLink(notify.getToLevel().getDetailLink());

                  notifyVO.setFromLevelName(notify.getFromLevel().getName());

                  notifyVO.setId("vipUpgradedNotify");

                  notifyVO.setSourceId(notify.getId());

                  notifyVO.setToLevel(notify.getToLevel().getTag());

                  notifyVO.setToLevelName(notify.getToLevel().getName());

                  data.put("vipUpgradedNotify", notifyVO);

               }

            }

         }

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

      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("获取失败"));

         e.printStackTrace();

      }

   }



   // 获取升级时间

   private Date getUpgradedTime(Long uid, UserLevelEnum level) {

      Date time = null;

      if (level == UserLevelEnum.superVIP) {

         UserVIPInfo vipInfo = userVIPInfoService.selectByUid(uid);

         if (vipInfo != null && vipInfo.getState() == UserVIPInfo.STATE_SUCCESS)

            time = vipInfo.getSuccessTime();



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

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

         if (info != null)

            time = info.getCreateTime();

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



         // 成为达人的时间,用户激活时间

         ThreeSale threeSale = threeSaleSerivce.getByWorkerId(uid);

         if (threeSale != null && threeSale.getState() == true && threeSale.getSucceedTime() != null) {

            time = new Date(threeSale.getSucceedTime());

         } else {// 取用户注册时间

            UserInfo user = userInfoService.selectAvailableByPrimaryKey(uid);

            time = new Date(user.getCreatetime());

         }

      }



      return time;

   }



   /**