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/BrandInfoService.java | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 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..e6ed3ec 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,14 @@ * @param key * @return */ - public BrandInfoVO listByAlikeName(String key); + public BrandInfoVO listByAlikeName(String key,String platform,String version); + + + /** + * 鐘舵�佸垏鎹� + * @param id + * @throws BrandInfoException + */ + public void switchState(Long id) throws BrandInfoException; } -- Gitblit v1.8.0