From 57b80e02ce56e3cacff75ba789fc633ab46b911a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 04 十二月 2018 15:22:25 +0800
Subject: [PATCH] 去除老版本收藏

---
 fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java
index eef0f2a..39c1bcd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java
@@ -11,6 +11,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -20,17 +21,17 @@
 import com.yeshi.fanli.entity.bus.recommend.RecommendSectionGoods;
 import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;
 import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSection;
-import com.yeshi.fanli.entity.bus.user.CollectionGoods;
 import com.yeshi.fanli.entity.system.System;
 import com.yeshi.fanli.entity.taobao.ScanHistory;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
 import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
+import com.yeshi.fanli.goods.CollectionGoodsV2;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.config.SystemConfigService;
 import com.yeshi.fanli.service.inter.config.SystemService;
-import com.yeshi.fanli.service.inter.goods.CollectionGoodsService;
+import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
 import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;
 import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService;
 import com.yeshi.fanli.service.inter.goods.SuperRecommendSectionService;
@@ -44,7 +45,6 @@
 import com.yeshi.fanli.util.ThreadUtil;
 import com.yeshi.fanli.util.Utils;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import org.yeshi.utils.JsonUtil;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -75,7 +75,7 @@
 	private SystemService systemService;
 
 	@Resource
-	private CollectionGoodsService collectionGoodsService;
+	private CollectionGoodsV2Service collectionGoodsV2Service;
 
 	@Resource
 	private ConfigService configService;
@@ -290,7 +290,7 @@
 				taoBaoGoodsBriefExtra.getTaoBaoQuanInfo().setCouponLink(tb.getCouponLink());
 
 			if (uid != null && !"".equals(uid.trim())) {
-				CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid),
+				CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
 						Long.parseLong(id));
 				data.put("collection", collectionGoods != null ? true : false);
 			}

--
Gitblit v1.8.0