Merge branch 'master-new' into div

yujian

2019-06-24 4c68642aad8889ff599af52d33453c483f13092a

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

@@ -82,6 +82,7 @@
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;

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

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

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;

@@ -257,6 +258,9 @@
   private DeviceSexService deviceSexService;

   

   



   @Resource

   private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;



   @RequestMapping(value = "getHonestList")

   public void getHonestList(AcceptData acceptData, PrintWriter out) {

@@ -1339,11 +1343,15 @@
               // 筛选

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



               List<TaoBaoGoodsBrief> gList = recommendGoodsDeleteHistoryService

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

               // 设备推荐

               for (TaoBaoGoodsBrief goods : 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())) {

                           && goods.getBiz30day() > 1000

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



                     TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods,

                           proportion.toString(), "");

@@ -2051,6 +2059,8 @@
               redisManager.saveCommonTaoToken(tb.getAuctionId(), token);

            }

         }

         // 测试

         if (!Constant.IS_TEST)

         tb.setCouponLinkTaoToken(token);



         // 服务端转链

@@ -2067,6 +2077,9 @@
         couponInfo.put("couponTime", "使用期限：" + tb.getCouponEffectiveStartTime().replace("-", ".") + "-"

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

         // 券的口令



         // 测试

         if (!Constant.IS_TEST)

         couponInfo.put("couponToken", token);

         goodsJson.put("couponInfo", couponInfo);



@@ -2354,7 +2367,7 @@
         e1.printStackTrace();

      }



      if (goodsList != null)

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

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



            // 获取详情