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 |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 50 insertions(+), 5 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 069d925..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
@@ -1,6 +1,9 @@
 package com.yeshi.fanli.service.inter.brand;
 
+import java.util.Date;
 import java.util.List;
+
+import org.springframework.web.multipart.MultipartFile;
 
 import com.yeshi.fanli.entity.brand.BrandInfo;
 import com.yeshi.fanli.exception.brand.BrandClassException;
@@ -22,7 +25,7 @@
 	 * @throws BrandClassException
 	 * @throws Exception
 	 */
-	public void saveObject(BrandInfo record) throws BrandInfoException;
+	public void saveObject(MultipartFile file, BrandInfo record) throws BrandInfoException;
 
 	
 	/**
@@ -41,9 +44,9 @@
 	 * @param state
 	 * @return
 	 */
-	public List<BrandInfo> listQuery(long start, int count, String key, Long cid, Integer state);
+	public List<BrandInfo> listQuery(long start, int count, List<String> keys, Long cid, Integer state, Integer showState);
 
-	public long countQuery(String key, Long cid, Integer state);
+	public long countQuery(List<String> keys, Long cid, Integer state, Integer showState);
 
 	/**
 	 * 鏌ヨ鍝佺墝杩斿洖鍓嶇
@@ -53,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);
 
 
 	/**
@@ -86,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);
 
 	
 	/**
@@ -95,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);
@@ -102,4 +122,29 @@
 
 	public long countValidByCid(Long cid);
 
+
+	/**
+	 * 鍒犻櫎涔嬪墠鐨�
+	 * @param date
+	 */
+	public void removeAgoByDate(Date date);
+
+
+	public void updateOrder(Long id, Integer moveType) throws BrandInfoException;
+
+	/**
+	 * 鎼滅储鍏抽敭璇嶅尮閰嶅搧鐗�
+	 * @param key
+	 * @return
+	 */
+	public BrandInfoVO listByAlikeName(String key,String platform,String version);
+
+
+	/**
+	 * 鐘舵�佸垏鎹�
+	 * @param id
+	 * @throws BrandInfoException
+	 */
+	public void switchState(Long id) throws BrandInfoException;
+
 }

--
Gitblit v1.8.0