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

yujian

2019-08-12 e068c9acf06cff7673fadfca686128f6d6d66e20

 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java

@@ -482,8 +482,8 @@
      

      TaoBaoGoodsBrief taoBaoGoodsBrief = TaoBaoUtil.convert(daTaoKe);

      BigDecimal proportion = hongBaoManageService.getFanLiRate();

      TaoBaoGoodsBriefExtra goodsExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,

            proportion.toString(), null);

      TaoBaoGoodsBriefExtra goodsExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(),

            null);

      

      if (!goodsExtra.isCoupon() || (goodsExtra.getState() != null && goodsExtra.getState() == 1)) {

         return addSuccess;  // 已下架 、无券 不加入

@@ -916,12 +916,13 @@
      return list;

   }

   

	
   @Override

   @Cacheable(value = "dynamicCache", key = "'queryV2-'+#platform+'-'+#version+'-'+#start+'-'+#count+'-'+#cid+'-'+#subId")

   public List<DynamicInfo> queryV2(int platform, int version, int start, int count, Long cid, Long subId) {

      List<DynamicInfo> listNew = new ArrayList<DynamicInfo>();

      List<DynamicInfo> list = dynamicInfoDao.query(start, count, cid, subId);

      // 需要更新的商品

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

      if (list != null && list.size() > 0) {

         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();

@@ -963,6 +964,8 @@
                     continue;

                  }

                  

                  taoBaoGoodsUpdateList.add(goods);



                  GoodsPicture goodsNew = new GoodsPicture();

                  try {

                     PropertyUtils.copyProperties(goodsNew, goodsPicture);

@@ -971,13 +974,15 @@
                     continue;

                  }

                  

                  GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBaoGoodsBriefExtra(goods, fanLiRate, shareRate);

                  GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBaoGoodsBriefExtra(goods, fanLiRate,

                        shareRate);

                  goodsNew.setGoodsVO(detailVO);

                  goodsNew.setGoods(null);

                  

                  JumpDetailV2 jumpDetail = goodsNew.getJumpDetail();

                  if (jumpDetail != null) {

                     JumpDetailV2 jumpDetailV2 = jumpDetailV2Service.getByTypeCache(jumpDetail.getType(), platform, version);

                     JumpDetailV2 jumpDetailV2 = jumpDetailV2Service.getByTypeCache(jumpDetail.getType(),

                           platform, version);

                     if (jumpDetailV2 != null) {

                        goodsNew.setJumpDetail(jumpDetailV2);

                     }

@@ -998,9 +1003,10 @@
            updateGoodInfo(list);

         }

      });



      taoBaoGoodsUpdateService.addUpdateQueueAsync(taoBaoGoodsUpdateList);

      return listNew;

   }

	


   /**

    * 更新商品信息