From c9cbad5f5d18c6b2ac5a063e41007933d7028329 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 07 七月 2020 15:24:17 +0800
Subject: [PATCH] 返利配置文件加入系统区分
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java | 98 ++++++++++++++++++++++++++++++++----------------
1 files changed, 65 insertions(+), 33 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
index a995f49..d854cae 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
@@ -8,6 +8,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -19,6 +20,7 @@
import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl;
import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl.AdActivityType;
+import com.yeshi.fanli.entity.bus.homemodule.CommonShareInfo;
import com.yeshi.fanli.entity.bus.homemodule.Special;
import com.yeshi.fanli.entity.bus.homemodule.SpecialCard;
import com.yeshi.fanli.exception.homemodule.SpecialCardException;
@@ -30,6 +32,7 @@
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.vo.homemodule.SpecialVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -52,14 +55,17 @@
/**
* 淇濆瓨淇℃伅
- *
+ * @param acceptData
* @param callback
- * @param special
+ * @param specialCard
+ * @param request
* @param out
*/
+
@RequestMapping(value = "save")
- public void save(String callback, SpecialCard specialCard, HttpServletRequest request, PrintWriter out) {
+ public void save(AdminAcceptData acceptData, String callback, SpecialCard specialCard, HttpServletRequest request, PrintWriter out) {
try {
+ specialCard.setSystem(acceptData.getSystem());
// 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
if (request instanceof MultipartHttpServletRequest) {
MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
@@ -76,6 +82,31 @@
}
}
+
+
+ /**
+ * 鏌ヨ
+ *
+ * @param callback
+ * @param pageIndex
+ * @param pageSize
+ * @param key
+ * 妯＄硦鏌ヨ锛氳鏄庛�佹爣璇�
+ * @param out
+ */
+ @RequestMapping(value = "queryActivity")
+ public void queryActivity(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, Integer sort,
+ PrintWriter out) {
+
+ List<Long> listPid = new ArrayList<Long>();
+ listPid.add(15L);
+ listPid.add(16L);
+ listPid.add(17L);
+ queryList(acceptData, callback, pageIndex, pageSize, key, sort, listPid, out);
+ }
+
+
+
/**
* 鏌ヨ
*
@@ -87,7 +118,12 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer sort, PrintWriter out) {
+ public void query(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, Integer sort, PrintWriter out) {
+ queryList(acceptData,callback, pageIndex, pageSize, key, sort, null, out);
+ }
+
+ public void queryList(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, Integer sort,
+ List<Long> listPid, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -98,14 +134,14 @@
}
try {
- List<SpecialCard> list = specialCardService.listQuery((pageIndex - 1) * pageSize, pageSize, key, sort);
+ List<SpecialCard> list = specialCardService.listQuery((pageIndex - 1) * pageSize, pageSize, key, sort, listPid,acceptData.getSystem());
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
- long count = specialCardService.countlistQuery(key);
+ long count = specialCardService.countlistQuery(key, listPid,acceptData.getSystem());
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -124,7 +160,6 @@
}
}
-
/**
* 鍒犻櫎
*
@@ -133,7 +168,7 @@
* @param out
*/
@RequestMapping(value = "delete")
- public void delete(String callback, String idArray, PrintWriter out) {
+ public void delete(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) {
try {
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -158,22 +193,26 @@
/**
* 淇濆瓨淇℃伅
- *
+ * @param acceptData
* @param callback
- * @param special
+ * @param record
+ * @param jumpType
+ * @param extra
+ * @param request
* @param out
*/
@RequestMapping(value = "saveSpecial")
- public void saveSpecial(String callback, Special record, String jumpType, HttpServletRequest request,
+ public void saveSpecial(AdminAcceptData acceptData,String callback, Special record, String jumpType, CommonShareInfo extra, HttpServletRequest request,
PrintWriter out) {
try {
// 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
+ record.setSystem(acceptData.getSystem());
if (request instanceof MultipartHttpServletRequest) {
MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
specialService.saveObject(fileRequest.getFile("file"), fileRequest.getFile("file2"),
- fileRequest.getFile("file3"), record, jumpType);
+ fileRequest.getFile("file3"), record, jumpType, extra);
} else {
- specialService.saveObject(null, null, null, record, jumpType);
+ specialService.saveObject(null, null, null, record, jumpType, extra);
}
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
@@ -193,7 +232,7 @@
* @param out
*/
@RequestMapping(value = "deleteSpecial")
- public void deleteSpecial(String callback, String idArray, PrintWriter out) {
+ public void deleteSpecial(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) {
try {
if (StringUtil.isNullOrEmpty(idArray)) {
@@ -222,11 +261,10 @@
* 淇敼鎺掑簭
*
* @param callback
- * @param goodsClass
* @param out
*/
@RequestMapping(value = "saveSpecialOrder")
- public void saveSpecialOrder(String callback, Long id, Integer moveType, Integer sex, PrintWriter out) {
+ public void saveSpecialOrder(AdminAcceptData acceptData,String callback, Long id, Integer moveType, Integer sex, PrintWriter out) {
try {
specialService.updateOrder(id, moveType, sex);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
@@ -244,11 +282,10 @@
* @param callback
* @param pageIndex
* @param pageSize
- * @param bannerId
* @param out
*/
@RequestMapping(value = "querySpecial")
- public void querySpecial(String callback, Integer pageIndex, Integer pageSize, String key, Long cardId, Integer sex,
+ public void querySpecial(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, Long cardId, Integer sex,
String version, String platform, PrintWriter out) {
pageSize = 100;
if (pageIndex == null || pageIndex < 1) {
@@ -272,7 +309,7 @@
if (appVersion != null)
versionList.add(appVersion);
} else {
- List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform);
+ List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform,acceptData.getSystem());
if (appVersionList != null) {
versionList.addAll(appVersionList);
}
@@ -281,20 +318,18 @@
try {
- List<Special> list = specialService.listQueryByCard((pageIndex - 1) * pageSize, pageSize, cardId, key, sex);
- long count = specialService.countlistQueryByCard(cardId, key, sex);
- // 鑾峰彇鏈夋晥鐨勪笓棰�
-
+ List<SpecialVO> list = specialService.listQueryByCard((pageIndex - 1) * pageSize, pageSize, cardId, key, sex);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
+ long count = specialService.countlistQueryByCard(cardId, key, sex);
// 杩囨护
if (versionList != null) {
if (versionList.size() > 0) {
List<Long> sourceIdList = new ArrayList<>();
- for (Special special : list) {
+ for (SpecialVO special : list) {
sourceIdList.add(special.getId());
}
List<Long> versionIdList = new ArrayList<>();
@@ -324,9 +359,7 @@
JSONObject data = new JSONObject();
data.put("pe", pe);
data.put("result_list", gson.toJson(list));
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
@@ -335,15 +368,14 @@
/**
* 璁剧疆鐗堟湰
- *
+ * @param acceptData
* @param callback
* @param id
- * @param moveType
- * @param sex
+ * @param versions
* @param out
*/
@RequestMapping(value = "setVersions")
- public void setVersions(String callback, Long id, String versions, PrintWriter out) {
+ public void setVersions(AdminAcceptData acceptData,String callback, Long id, String versions, PrintWriter out) {
JSONArray versionArray = JSONArray.fromObject(versions);
List<Long> versionIds = new ArrayList<>();
for (int i = 0; i < versionArray.size(); i++) {
@@ -359,7 +391,7 @@
}
@RequestMapping(value = "getVersions")
- public void getVersions(String callback, Long id, PrintWriter out) {
+ public void getVersions(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
List<AdActivityVersionControl> list = adActivityVersionControlService
.listByTypeAndSourceId(AdActivityType.special, id);
@@ -377,7 +409,7 @@
* @param out
*/
@RequestMapping(value = "switchStateCard")
- public void switchStateCard(String callback, Long id, PrintWriter out) {
+ public void switchStateCard(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
try {
specialCardService.switchState(id);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
@@ -396,7 +428,7 @@
* @param out
*/
@RequestMapping(value = "switchState")
- public void switchState(String callback, Long id, PrintWriter out) {
+ public void switchState(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
try {
specialService.switchState(id);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
--
Gitblit v1.8.0