From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandClassShopService.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandClassShopService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandClassShopService.java
index 0bd8287..11ec69d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandClassShopService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandClassShopService.java
@@ -5,7 +5,9 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import com.yeshi.fanli.entity.brand.BrandClassShop;
+import com.yeshi.fanli.entity.taobao.TaoBaoShop;
 import com.yeshi.fanli.exception.brand.BrandClassShopException;
+import com.yeshi.fanli.vo.brand.TaoBaoShopVO;
 
 import net.sf.json.JSONObject;
 
@@ -96,5 +98,35 @@
 	 * 鏇存柊鍝佺墝鍟嗗搧
 	 */
 	public void updateShopGoods();
+
+	/**
+	 * 搴楅摵鍒楄〃
+	 * @param page
+	 * @param cid
+	 * @return
+	 */
+	public JSONObject listEffectiveCacheV2(int page, Long cid,String platform,String version);
+
+	
+	/**
+	 *  鍏煎2.0
+	 * @param start
+	 * @param count
+	 * @param cid
+	 * @return
+	 */
+	public List<TaoBaoShopVO> listEffectiveShop(long start, int count, Long cid,String platform,String version);
+
+	
+	
+	public long countBrandShopinfo(Long cid);
+
+	
+	/**
+	 * 鍒嗙被涓嬪簵閾�
+	 * @param cid
+	 * @return
+	 */
+	public List<TaoBaoShop> listEffectiveClassShop(Long cid);
 	
 }

--
Gitblit v1.8.0