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/BrandInfoService.java |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandInfoService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandInfoService.java
index f1b7178..6eacb43 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandInfoService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandInfoService.java
@@ -56,7 +56,7 @@
 	 * @return
 	 * @throws BrandInfoException
 	 */
-	public List<BrandInfoVO> listBrandInfoCache(long start, int count, Long cid);
+	public List<BrandInfoVO> listBrandInfoCache(long start, int count, Long cid,String platform,String version);
 
 
 	/**
@@ -89,7 +89,7 @@
 	 * @param cid
 	 * @return
 	 */
-	public List<BrandInfoVO> listValidToApp(long start, int count, Long cid);
+	public List<BrandInfoVO> listValidToApp(long start, int count, Long cid,String platform,String version);
 
 	
 	/**
@@ -98,6 +98,23 @@
 	 * @param count
 	 */
 	public void addShopAndGoods(long start, int count);
+	
+	
+	
+	/**
+	 * 妫�绱㈡湁鏁堢殑鍝佺墝淇℃伅锛屾寜鏇存柊鏃堕棿鎺掑簭
+	 * @param page
+	 * @param pageSize
+	 * @return
+	 */
+	public List<BrandInfo>  listValidOrderByUpdateTime(int page,int pageSize);
+	
+	
+	/**
+	 * 娣诲姞鍝佺墝鍟嗗搧
+	 * @param brandList
+	 */
+	public void addShopAndGoods(List<BrandInfo> brandList);
 
 
 	public long countValidByCidToApp(Long cid);
@@ -120,6 +137,6 @@
 	 * @param key
 	 * @return
 	 */
-	public BrandInfoVO listByAlikeName(String key);
+	public BrandInfoVO listByAlikeName(String key,String platform,String version);
 
 }

--
Gitblit v1.8.0