yujian
2019-12-07 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
@@ -24,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;
@@ -79,7 +79,7 @@
   private UserActiveLogService userActiveLogService;
   @Resource
   private RedPackWinNewUserService redPackWinNewUserService;
   private UserTaoLiJinNewbiesService userTaoLiJinNewbiesService;
   /**
    * s 首页配置信息
@@ -167,7 +167,7 @@
      for (int i = 0; i < listAD.size(); i++) {
         FloatAD floatAD = listAD.get(i);
         FloatADTypeEnum typeEnum = floatAD.getTypeEnum();
         if (typeEnum == FloatADTypeEnum.newUserRedPack && !redPackWinNewUserService.verifyHasReward(uid)) {
         if (typeEnum == FloatADTypeEnum.newUserRedPack && !userTaoLiJinNewbiesService.verifyHasReward(uid, acceptData.getDevice())) {
            listAD.remove(i);
            i--;
            continue;
@@ -196,6 +196,7 @@
      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");