From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期五, 20 九月 2019 17:54:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 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..5188b0e 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,6 +4,7 @@ import org.springframework.web.multipart.MultipartFile; +import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.bus.homemodule.Special; import com.yeshi.fanli.exception.homemodule.SpecialException; @@ -21,9 +22,9 @@ public Special selectByPrimaryKey(Long id); - public List<Special> listQueryByCard(long start, int count, Long card, String key); + public List<Special> 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); /** @@ -77,7 +78,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 +86,7 @@ * @return * @throws Exception */ - public JSONObject listCacheSpecialToIndex() throws Exception; + public JSONObject listCacheSpecialToIndex(AcceptData acceptData, Integer sex) throws Exception; /** @@ -93,6 +94,19 @@ * @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<Special> listByVersion(long start, int count, String card, Integer platform, Integer versionCode); } -- Gitblit v1.8.0