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/homemodule/SpecialService.java |   73 ++++++++++++++++++++++++++++++++----
 1 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java
index b046e29..54390f7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java
@@ -4,8 +4,11 @@
 
 import org.springframework.web.multipart.MultipartFile;
 
+import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.homemodule.CommonShareInfo;
 import com.yeshi.fanli.entity.bus.homemodule.Special;
 import com.yeshi.fanli.exception.homemodule.SpecialException;
+import com.yeshi.fanli.vo.homemodule.SpecialVO;
 
 import net.sf.json.JSONObject;
 
@@ -21,9 +24,9 @@
 	public Special selectByPrimaryKey(Long id);
 
 
-	public List<Special> listQueryByCard(long start, int count, Long card, String key);
+	public List<SpecialVO> listQueryByCard(long start, int count, Long card, String key, Integer sex);
 
-	public long countlistQueryByCard(Long card, String key);
+	public long countlistQueryByCard(Long card, String key, Integer sex);
 
 
 	/**
@@ -48,7 +51,7 @@
 	 * @param systemId
 	 * @return
 	 */
-	public List<Special> listBySystemAndCard(String card, Long systemId);
+	public List<SpecialVO> listBySystemAndCard(String card, Long systemId);
 
 	/**
 	 * 娲诲姩鍒楄〃-鍒嗛〉
@@ -58,7 +61,7 @@
 	 * @param systemId
 	 * @return
 	 */
-	public List<Special> listPageBySystemAndCard(long start, int count, String card, Long systemId);
+	public List<SpecialVO> listPageBySystemAndCard(long start, int count, String card, Long systemId);
 
 
 	/**
@@ -69,7 +72,8 @@
 	 * @throws SpecialException
 	 * @throws Exception
 	 */
-	public void saveObject(MultipartFile file, MultipartFile file2, MultipartFile file3, Special record, String jumpType) throws SpecialException, Exception;
+	public void saveObject(MultipartFile file, MultipartFile file2, MultipartFile file3, Special record
+			, String jumpType, CommonShareInfo shareInfo) throws SpecialException, Exception;
 
 	/**
 	 * 鏇存崲椤哄簭
@@ -77,7 +81,7 @@
 	 * @param moveType
 	 * @throws SpecialException
 	 */
-	public void updateOrder(Long id, Integer moveType) throws SpecialException;
+	public void updateOrder(Long id, Integer moveType, Integer sex) throws SpecialException;
 
 
 	/**
@@ -85,7 +89,7 @@
 	 * @return
 	 * @throws Exception
 	 */
-	public JSONObject listCacheSpecialToIndex() throws Exception;
+	public JSONObject listCacheSpecialToIndex(AcceptData acceptData, Integer sex) throws Exception;
 
 
 	/**
@@ -93,6 +97,59 @@
 	 * @param placeKey
 	 * @return
 	 */
-	public List<Special> listByPlaceKey(String placeKey);
+	public List<Special> listByPlaceKey(String placeKey, Integer platform, Integer versionCode);
+
+
+	/**
+	 * 涓撻 鐗堟湰鍖哄垎
+	 * @param start
+	 * @param count
+	 * @param card
+	 * @param systemId
+	 * @param platform
+	 * @param versionCode
+	 * @return
+	 */
+	public List<SpecialVO> listByVersion(long start, int count, String card, String platform, Integer versionCode);
+
+
+	/**
+	 * 涓撻鐗堟湰鍖哄垎 浼犻�掑涓綅缃�
+	 * @param list
+	 * @param platform
+	 * @param versionCode
+	 * @return
+	 */
+	public List<Special> listByPlaceKeyList(long start, int count, List<String> list, Integer platform, Integer versionCode);
+
+
+	public long countByPlaceKeyList(List<String> list, Integer platform, Integer versionCode);
+
+
+	/**
+	 * 鏌ヨ涓撻骞惰繑鍥炴爣绛�
+	 * @param list
+	 * @param platform
+	 * @param versionCode
+	 * @return
+	 */
+	public List<SpecialVO> listByPlaceKeyHasLabel(long start, int count, List<String> list, Integer platform, Integer versionCode);
+	
+	
+	/**
+	 * 涓轰笓棰樿缃増鏈�
+	 * @param specialId
+	 * @param versions
+	 * @throws Exception
+	 */
+	public void setVersions(Long specialId,List<Long> versions)  throws Exception;
+
+	/**
+	 * 鏇存敼鐘舵��
+	 * @param id
+	 * @throws SpecialException
+	 */
+	public void switchState(Long id) throws SpecialException;
+
 
 }

--
Gitblit v1.8.0