From c389b1ca090df256bad7fd0d183914146c1f93b8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 12:15:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsClassService.java |   64 ++++++++++++++-----------------
 1 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsClassService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsClassService.java
index c9c013c..62cf4f6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsClassService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/GoodsClassService.java
@@ -5,8 +5,8 @@
 
 import org.springframework.web.multipart.MultipartFile;
 
-import com.yeshi.fanli.entity.admin.GoodsClassAdmin;
 import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
+import com.yeshi.fanli.exception.GoodsClassException;
 
 public interface GoodsClassService {
 	
@@ -15,16 +15,7 @@
 	
 	public GoodsClass getGoodsClassCache(long gcid);
 
-	public List<GoodsClassAdmin> getGoodsClassAdmins(int i, String platform,
-			String packages, String key);
 
-	public int getCount(String platform, String packages, String key);
-
-	public Integer addGoodsClass(GoodsClass goodsClass);
-
-	public void deleteGoodsClasss(long[] gcids);
-
-	public Integer updateGoodsClass(GoodsClass goodsClass);
 	/**
 	 * 鑾峰彇鎵�鏈夊垎绫�
 	 * @return
@@ -39,7 +30,7 @@
 	 * @param id
 	 * @return
 	 */
-	public String getKwById(Long id);
+	public String getKeysById(Long id);
 
 	/**
 	 * 涓婁紶鍥剧墖
@@ -50,35 +41,15 @@
 	 */
 	public void uploadPicture(GoodsClass record, MultipartFile file) throws Exception;
 	
-	/**
-	 * 鏂板绫诲埆
-	 * @param record
-	 * @param file
-	 * @return
-	 * @throws Exception
-	 */
-	public long saveAdd(GoodsClass record, MultipartFile file) throws Exception;
 
 	public void deleteGoodsClass(long id);
 
 	public void removePicture(GoodsClass record) throws Exception;
 	
 	
-	public List<GoodsClass> queryAll(String platform, String packages) throws Exception;
+	public List<GoodsClass> listquery() throws Exception;
 	
-	/**
-	 * 鏍规嵁鎺掑簭id鏌ヨ
-	 * @param orderby
-	 * @return
-	 */
-	public List<GoodsClass> getByorderby(int orderby);
 
-	
-	/**
-	 * 鏌ヨ鎵�鏈�
-	 * @return
-	 */
-	public List<GoodsClass> queryAll();
 
 	/**
 	 * 閫夋嫨鎬ф洿鏂�
@@ -87,16 +58,20 @@
 	 */
 	public int updateByPrimaryKeySelective(GoodsClass record);
 
+	
+	int updateByPrimaryKey(GoodsClass record);
+	
+	
 	public GoodsClass selectByPrimaryKey(Long gcid);
 
 
 	/**
-	 *    鏍规嵁绯荤粺ID鏌ヨ鎵�鏈夊垎绫�-鍔犲叆缂撳瓨
+	 *  鏌ヨ鎵�鏈夋湁鏁堝垎绫�-鍔犲叆缂撳瓨
 	 * @param systemId 绯荤粺ID
 	 * @return
 	 * @throws Exception
 	 */
-	public List<GoodsClass> getListClassCache(Long systemId) throws Exception;
+	public List<GoodsClass> getEffectiveClassCache() throws Exception;
 
 	/**
 	 * 鏌ヨ鎵�鏈夊垎绫汇�佷富瀛愮被鐩�
@@ -104,7 +79,26 @@
 	 * @return
 	 * @throws Exception
 	 */
-	public List<Map<String, Object>> getClassListAllCache(Long systemId) throws Exception;
+	public List<Map<String, Object>> getClassListAllCache() throws Exception;
+
+
+	/**
+	 * 淇濆瓨鍒嗙被淇℃伅
+	 * @param file
+	 * @param record
+	 * @throws GoodsClassException
+	 * @throws Exception
+	 */
+	public void saveObject(MultipartFile file, GoodsClass record) throws GoodsClassException, Exception;
+
+
+	/**
+	 * 鍚庡彴椤哄簭璋冩暣
+	 * @param id
+	 * @param moveType
+	 * @throws GoodsClassException
+	 */
+	public void updateOrder(Long id, Integer moveType) throws GoodsClassException;
 
 
 }

--
Gitblit v1.8.0