From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandClassShopService.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 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 44f4fe7..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;
@@ -17,14 +19,6 @@
*/
public interface BrandClassShopService {
- /**
- * 鏌ヨ鏈夋晥鍒嗙被
- *
- * @return
- */
- public List<BrandClassShop> listEffective(long start, int count, Long cid);
-
- public long countEffective(Long cid);
/**
* 鏄惁瀛樺湪
@@ -63,7 +57,7 @@
* @param state
* @throws BrandClassShopException
*/
- public void changeShopInfo(MultipartFile file, Long id, Long cid, String shopName, Integer state, Integer top)
+ public void changeShopInfo(MultipartFile file, Long id, Long cid, String shopName, Integer state, Integer top,String key)
throws BrandClassShopException;
@@ -99,4 +93,40 @@
*/
public void deleteBatchByClassId(List<Long> list);
+
+ /**
+ * 鏇存柊鍝佺墝鍟嗗搧
+ */
+ 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