Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-07 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java

@@ -14,6 +14,7 @@


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

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

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

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

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

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

@@ -23,7 +24,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

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

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

import com.yeshi.fanli.service.inter.redpack.RedPackWinNewUserService;

import com.yeshi.fanli.service.inter.redpack.UserTaoLiJinNewbiesService;

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

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

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

@@ -78,7 +79,7 @@
   private UserActiveLogService userActiveLogService;



   @Resource

   private RedPackWinNewUserService redPackWinNewUserService;

   private UserTaoLiJinNewbiesService userTaoLiJinNewbiesService;



   /**

    * s 首页配置信息

@@ -109,7 +110,7 @@
      // 无新人弹框 则查询默认

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



      if (floatAD != null) {

      if (floatAD != null && floatAD.getTypeEnum() != FloatADTypeEnum.newUserRedPack) {

         JSONObject detail = new JSONObject();

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

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

@@ -156,40 +157,46 @@
         uid = null;



      // 活动弹框

      List<FloatAD> listAD = null;

      if (redPackWinNewUserService.verifyHasReward(uid)) {

         listAD = floatADService.getValidByPosition(FloatAD.POSITION_INDEX);

      } else {

         listAD = floatADService.getValidCommonByPosition(FloatAD.POSITION_INDEX);

      }



      List<FloatAD> listAD = new ArrayList<FloatAD>();

      List<FloatImgDetailVO> listVO = new ArrayList<FloatImgDetailVO>();

      if (listAD != null && !listAD.isEmpty()) {

         for (FloatAD floatAD : listAD) {

            JumpDetailV2 jumpDetail = floatAD.getJumpDetail();

            if (jumpDetail != null) {

               jumpDetail = jumpDetailV2Service.selectByPrimaryKey(jumpDetail.getId());

               if (jumpDetail != null) {

                  jumpDetail.setNeedLogin(floatAD.isJumpNeedLogin());

               }

            }

            FloatImgDetailVO floatImgVO = new FloatImgDetailVO();

            floatImgVO.setId(floatAD.getId().toString());

            floatImgVO.setImg(floatAD.getPicture());

            floatImgVO.setParams(floatAD.getParams());

            floatImgVO.setJumpDetail(jumpDetail);

            floatImgVO.setShowTime(floatAD.getShowMode());

            floatImgVO.setAccountLogin(floatAD.isJumpNeedLogin());

            if (floatAD.getPlaySound() != null)

               floatImgVO.setPlaySound(floatAD.getPlaySound());// 默认都播放音效

            else

               floatImgVO.setPlaySound(false);

            listVO.add(floatImgVO);

		
      List<FloatAD> list = floatADService.getValidByPosition(FloatAD.POSITION_INDEX);

      if (list != null && !list.isEmpty())

         listAD.addAll(list);

	
      for (int i = 0; i < listAD.size(); i++) {

         FloatAD floatAD = listAD.get(i);

         FloatADTypeEnum typeEnum = floatAD.getTypeEnum();

         if (typeEnum == FloatADTypeEnum.newUserRedPack && !userTaoLiJinNewbiesService.verifyHasReward(uid, acceptData.getDevice())) {

            listAD.remove(i);

            i--;

            continue;

         }

			
         JumpDetailV2 jumpDetail = floatAD.getJumpDetail();

         if (jumpDetail != null) {

            jumpDetail = jumpDetailV2Service.selectByPrimaryKey(jumpDetail.getId());

            if (jumpDetail != null) {

               jumpDetail.setNeedLogin(floatAD.isJumpNeedLogin());

            }

         }

         FloatImgDetailVO floatImgVO = new FloatImgDetailVO();

         floatImgVO.setId(floatAD.getId().toString());

         floatImgVO.setImg(floatAD.getPicture());

         floatImgVO.setParams(floatAD.getParams());

         floatImgVO.setJumpDetail(jumpDetail);

         floatImgVO.setShowTime(floatAD.getShowMode());

         floatImgVO.setAccountLogin(floatAD.isJumpNeedLogin());

         if (floatAD.getPlaySound() != null)

            floatImgVO.setPlaySound(floatAD.getPlaySound());// 默认都播放音效

         else

            floatImgVO.setPlaySound(false);

         listVO.add(floatImgVO);

      }



      JSONObject data = new JSONObject();

      data.put("listAD", JsonUtil.getApiCommonGson().toJson(listVO));

      data.put("protocol", configService.get("user_protocol_home_data"));



      // 领券帮助链接,1.5.2后生效

      String couponHelp = configService.get("taobao_coupon_help");