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

admin

2019-11-12 6c930b8374bf5b991bc423f02ed22420e78b85ff

 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;

@@ -156,16 +157,21 @@
         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>();

		
      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 && !redPackWinNewUserService.verifyHasReward(uid)) {

            listAD.remove(i);

            i--;

      }



      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());

@@ -185,7 +191,6 @@
            else

               floatImgVO.setPlaySound(false);

            listVO.add(floatImgVO);

         }

      }



      JSONObject data = new JSONObject();