From a09e3c8653efe083e356dfbdcec8515b9f9dcd06 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 02 八月 2019 17:55:14 +0800
Subject: [PATCH] 兼容拼多多商品图文详情请求不到的情况

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java |   64 ++++++++++++++++++++++++++++++++
 1 files changed, 64 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
index be50150..0626c8b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
@@ -24,6 +24,7 @@
 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;
@@ -48,9 +49,11 @@
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;
+import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
 import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+import com.yeshi.fanli.vo.goods.GoodsDetailVO;
 import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
 
 import net.sf.json.JSONObject;
@@ -893,6 +896,67 @@
 
 		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> list = dynamicInfoDao.query(start, count, cid, subId);
+
+		if (list != null && list.size() > 0) {
+			BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+			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) {
+						TaoBaoGoodsBriefExtra goods = goodsPicture.getGoods();
+						if (goods == null) {
+							continue;
+						}
+						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);
+			}
+		}
+		
+		
+		// 鏇存柊鍟嗗搧淇℃伅
+		executor.execute(new Runnable() {
+			@Override
+			public void run() {
+				updateGoodInfo(list);
+			}
+		});
+
+		return list;
+	}
+	
 
 	/**
 	 * 鏇存柊鍟嗗搧淇℃伅

--
Gitblit v1.8.0