红包领取

yujian

2019-11-07 3f76ec837b343e5a8538f2ce50010714d16cdeef

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

@@ -1,6 +1,8 @@
package com.yeshi.fanli.controller.client.v1;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.List;



import javax.annotation.Resource;



@@ -12,19 +14,17 @@


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

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

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

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

import com.yeshi.fanli.entity.bus.tlj.DeviceTaoLiJinRecord;

import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin;

import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin.TaoLiJinOriginEnum;

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

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

import com.yeshi.fanli.entity.taobao.ClientTBPid;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.homemodule.FloatADService;

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.tlj.DeviceTaoLiJinRecordService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;

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

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

@@ -71,10 +71,11 @@
   private UserTaoLiJinOriginService uerTaoLiJinOriginService;



   @Resource

   private DeviceTaoLiJinRecordService deviceTaoLiJinRecordService;



   @Resource

   private UserActiveLogService userActiveLogService;

	
   @Resource

   private SwiperPictureService swiperPictureService;





   /**

    * s 首页配置信息

@@ -102,27 +103,9 @@
         data.put("floatNotifyImg", notifyImg);

      }



      FloatAD floatAD = null;



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

         if (uid == null) {

            DeviceTaoLiJinRecord deviceRecord = deviceTaoLiJinRecordService.getByDevice(acceptData.getDevice());

            if (deviceRecord == null) {

               floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 1);

            }

         } else {

            UserTaoLiJinOrigin userTaoLiJin = uerTaoLiJinOriginService.getByUidAndOrigin(uid,

                  TaoLiJinOriginEnum.newbiesWin.name());

            if (userTaoLiJin == null) {

               floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 1);

            }

         }

      }



      // 无新人弹框 则查询默认

      if (floatAD == null) {

         floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 0);

      }

      FloatAD floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 0);



      if (floatAD != null) {

         JSONObject detail = new JSONObject();

@@ -168,25 +151,7 @@
    */

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

   public void getMSGConfig(AcceptData acceptData, Long uid, PrintWriter out) {

      JSONObject data = new JSONObject();

      boolean show = false;

      if (uid != null) {

         show = uerTaoLiJinOriginService.hasRankHongBao(uid);

      }



      if (show) {

         FloatAD floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_MSGCENTER, null);

         if (floatAD != null) {

            JSONObject detail = new JSONObject();

            detail.put("img", floatAD.getPicture());

            detail.put("jumpDetail", floatAD.getJumpDetail());

            detail.put("params", floatAD.getParams());

            detail.put("showTime", floatAD.getShowMode());

            detail.put("accountLogin", floatAD.isJumpNeedLogin());

            data.put("floatImgDetail", detail);

         }

      }

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

      out.print(JsonUtil.loadFalseResult("推广红包相关功能已下线！"));

   }



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

@@ -286,6 +251,14 @@
         JSONObject source = JSONObject.fromObject(configService.getByVersion("taobao_cart_jump_detail",

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

         data.put("taoBaoCart", source);

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

            // 我的界面banner

            List<SwiperPicture> banner = swiperPictureService.getByBannerCard("my_interface_banner");

            if (banner == null)

               banner = new ArrayList<SwiperPicture>();

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

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

      } catch (Exception e) {

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