From d6c8cce305427ba64005d4e349e169446e0d1801 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 01 八月 2019 09:12:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 5a795f6..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;
@@ -898,8 +899,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) {
@@ -930,6 +931,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);
--
Gitblit v1.8.0