From 972d3bc71115ec977dccf835fbcd148da3bcc86c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 03 九月 2019 16:41:49 +0800
Subject: [PATCH] 统计可用的免单券数量-countUsableFreeCouponForBuy

---
 fanli/src/main/java/com/yeshi/fanli/controller/web/WebRecommendController.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 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 0a28fe5..3e6b45a 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
@@ -27,14 +27,12 @@
 import com.yeshi.fanli.service.inter.config.SystemConfigService;
 import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
 import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService;
-import com.yeshi.fanli.service.inter.goods.SuperRecommendSectionService;
 import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.ThreadUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 
 import net.sf.json.JSONObject;
@@ -48,9 +46,6 @@
 
 	@Resource
 	private SuperRecommendBannerService superRecommendBannerService;
-
-	@Resource
-	private SuperRecommendSectionService superRecommendSectionService;
 
 	@Resource
 	private HongBaoManageService hongBaoManageService;
@@ -141,8 +136,8 @@
 	 */
 
 	@RequestMapping(value = "getGoodsDetail", method = RequestMethod.GET)
-	public void getGoodsDetail(final AcceptData acceptData, final String id, final String uid, String callback,
-			PrintWriter out) {
+	public void getGoodsDetail(final AcceptData acceptData, final String id, final String uid, Integer goodsType, 
+			String callback, PrintWriter out) {
 		long begin = java.lang.System.currentTimeMillis();
 		if (StringUtil.isNullOrEmpty(id)) {
 			out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
@@ -186,7 +181,7 @@
 
 			if (uid != null && !"".equals(uid.trim())) {
 				CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
-						Long.parseLong(id));
+						Long.parseLong(id), goodsType);
 				data.put("collection", collectionGoods != null ? true : false);
 			}
 			taoBaoGoodsBriefExtra.setAuctionUrl(null);

--
Gitblit v1.8.0