From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java | 87 ++++++++++++++++++++++++++++++-------------
1 files changed, 61 insertions(+), 26 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 89b88ae..5c6c2c5 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
@@ -19,9 +19,10 @@
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.FloatADException;
+import com.yeshi.fanli.exception.homemodule.SpecialCardException;
import com.yeshi.fanli.exception.homemodule.SpecialException;
import com.yeshi.fanli.service.inter.config.AppVersionService;
import com.yeshi.fanli.service.inter.homemodule.AdActivityVersionControlService;
@@ -30,6 +31,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;
@@ -67,9 +69,8 @@
} else {
specialCardService.saveObject(null, specialCard);
}
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
- } catch (FloatADException e) {
+ } catch (SpecialCardException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
@@ -77,6 +78,31 @@
}
}
+
+
+ /**
+ * 鏌ヨ
+ *
+ * @param callback
+ * @param pageIndex
+ * @param pageSize
+ * @param key
+ * 妯＄硦鏌ヨ锛氳鏄庛�佹爣璇�
+ * @param out
+ */
+ @RequestMapping(value = "queryActivity")
+ public void queryActivity(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(callback, pageIndex, pageSize, key, sort, listPid, out);
+ }
+
+
+
/**
* 鏌ヨ
*
@@ -89,6 +115,11 @@
*/
@RequestMapping(value = "query")
public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer sort, PrintWriter out) {
+ queryList(callback, pageIndex, pageSize, key, sort, null, out);
+ }
+
+ public void queryList(String callback, Integer pageIndex, Integer pageSize, String key, Integer sort,
+ List<Long> listPid, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -99,14 +130,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);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
- long count = specialCardService.countlistQuery(key);
+ long count = specialCardService.countlistQuery(key, listPid);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -118,16 +149,13 @@
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();
}
}
-
/**
* 鍒犻櫎
*
@@ -137,7 +165,6 @@
*/
@RequestMapping(value = "delete")
public void delete(String callback, String idArray, PrintWriter out) {
-
try {
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -152,16 +179,12 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈娴嬪埌鍒犻櫎鐨勬暟鎹�"));
return;
}
-
int count = specialCardService.deleteBatchByPrimaryKey(list);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
-
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
e.printStackTrace();
}
-
}
/**
@@ -172,16 +195,16 @@
* @param out
*/
@RequestMapping(value = "saveSpecial")
- public void saveSpecial(String callback, Special record, String jumpType, HttpServletRequest request,
+ public void saveSpecial(String callback, Special record, String jumpType, CommonShareInfo extra, HttpServletRequest request,
PrintWriter out) {
try {
// 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
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("淇濆瓨鎴愬姛"));
@@ -219,14 +242,11 @@
}
int count = specialService.deleteBatchByPrimaryKey(list);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
-
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
e.printStackTrace();
}
-
}
/**
@@ -292,20 +312,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<>();
@@ -335,9 +353,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();
@@ -387,6 +403,25 @@
* @param id
* @param out
*/
+ @RequestMapping(value = "switchStateCard")
+ public void switchStateCard(String callback, Long id, PrintWriter out) {
+ try {
+ specialCardService.switchState(id);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (SpecialCardException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 淇敼鐘舵��
+ * @param callback
+ * @param id
+ * @param out
+ */
@RequestMapping(value = "switchState")
public void switchState(String callback, Long id, PrintWriter out) {
try {
--
Gitblit v1.8.0