增加汽车户外，增加拼多多常量

admin

2019-06-24 beee6afac3f7d1b7fa30f768df91cd55e6c6d2db

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

@@ -80,6 +80,7 @@
import com.yeshi.fanli.service.inter.goods.SuperRecommendSpecialService;

import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService;

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

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

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

@@ -229,6 +230,9 @@


   @Resource

   private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;



   @Resource

   private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;



   @RequestMapping(value = "getHonestList")

   public void getHonestList(AcceptData acceptData, PrintWriter out) {

@@ -1309,14 +1313,24 @@


            if (result != null && result.getTaoBaoGoodsBriefs() != null) {

               // 筛选

               List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();

               List<TaoBaoGoodsBriefExtra> goodsList = new ArrayList<>();



               for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {

                  if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null

                        && goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0

                        && goods.getBiz30day() > 1000 && !StringUtil.isNullOrEmpty(goods.getPictUrlWhite()))

                     goodsList.add(goods);

               }

               List<TaoBaoGoodsBrief> gList = recommendGoodsDeleteHistoryService

                     .filterGoods(acceptData.getDevice(), result.getTaoBaoGoodsBriefs());

               // 设备推荐

               if (gList != null)

                  for (TaoBaoGoodsBrief goods : gList) {

                     if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null

                           && goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0

                           && goods.getBiz30day() > 1000

                           && !StringUtil.isNullOrEmpty(goods.getPictUrlWhite())) {



                        TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods,

                              proportion.toString(), "");

                        extra.setRecommend(true);

                        goodsList.add(extra);

                     }

                  }

               try {

                  monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0,

                        (int) (java.lang.System.currentTimeMillis() - startTime), "推荐数量:" + goodsList.size()));

@@ -1326,8 +1340,8 @@


               Collections.shuffle(goodsList);

               goodsList = goodsList.size() > 20 ? goodsList.subList(0, 20) : goodsList;

               for (TaoBaoGoodsBrief goods : goodsList) {

                  array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "")));

               for (TaoBaoGoodsBriefExtra goods : goodsList) {

                  array.add(gson.toJson(goods));

               }

            } else {

               try {

@@ -2019,7 +2033,9 @@
               redisManager.saveCommonTaoToken(tb.getAuctionId(), token);

            }

         }

         tb.setCouponLinkTaoToken(token);

         // 测试

         if (!Constant.IS_TEST)

            tb.setCouponLinkTaoToken(token);



         // 服务端转链

         // if (convertInServer &&

@@ -2035,7 +2051,10 @@
         couponInfo.put("couponTime", "使用期限：" + tb.getCouponEffectiveStartTime().replace("-", ".") + "-"

               + tb.getCouponEffectiveEndTime().replace("-", "."));

         // 券的口令

         couponInfo.put("couponToken", token);



         // 测试

         if (!Constant.IS_TEST)

            couponInfo.put("couponToken", token);

         goodsJson.put("couponInfo", couponInfo);



         if (tb.getBiz30day() >= 1000) {

@@ -2260,7 +2279,7 @@
         e1.printStackTrace();

      }



      if (goodsList != null)

      if (goodsList != null && goodsList.size() > 0)

         goodsList.parallelStream().forEach(goods -> {



            // 获取详情