动态v2兼容

yujian

2019-07-31 f4548a3ee46afe45da4ee2a42dc169c575deee9f

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

@@ -18,12 +18,14 @@


import com.yeshi.fanli.dao.dynamic.DynamicInfoDao;

import com.yeshi.fanli.dto.taobao.TaoBaoShopDTO;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.activity.ActivityRuleUser;

import com.yeshi.fanli.entity.bus.activity.ActivityUser;

import com.yeshi.fanli.entity.bus.activity.RecommendActivity;

import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;

import com.yeshi.fanli.entity.bus.activity.RecommendActivityTaoBaoGoods;

import com.yeshi.fanli.entity.bus.clazz.GoodsClass;

import com.yeshi.fanli.entity.common.JumpDetailV2;

import com.yeshi.fanli.entity.dynamic.DynamicInfo;

import com.yeshi.fanli.entity.dynamic.GoodsPicture;

import com.yeshi.fanli.entity.dynamic.InviteMaterial;

@@ -892,8 +894,8 @@
   

   

   @Override

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

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

   @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> list = dynamicInfoDao.query(start, count, cid, subId);



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

@@ -901,6 +903,19 @@
         BigDecimal shareRate = hongBaoManageService.getShareRate();

         

         for (DynamicInfo dynamicInfo: list) {

				
            TaoBaoShop shop = dynamicInfo.getShop();

            if (shop != null) {

               Integer userType = shop.getUserType();

               if (userType == null || userType == 0) {

                  shop.setUserType(10);

               } else {

                  shop.setUserType(11);

               }

               dynamicInfo.setShop(shop);

            }

				
				
            List<GoodsPicture> imgs = dynamicInfo.getImgs();

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

               for (GoodsPicture goodsPicture: imgs) {

@@ -911,6 +926,14 @@
                  GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBaoGoodsBriefExtra(goods, fanLiRate, shareRate);

                  goodsPicture.setGoodsVO(detailVO);

                  goodsPicture.setGoods(null);

						
                  JumpDetailV2 jumpDetail = goodsPicture.getJumpDetail();

                  if (jumpDetail != null) {

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

                     if (jumpDetailV2 != null) {

                        goodsPicture.setJumpDetail(jumpDetailV2);

                     }

                  }

               }

            }

            dynamicInfo.setImgs(imgs);