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/controller/admin/BrandShopAdminController.java | 104 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 92 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/BrandShopAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/BrandShopAdminController.java
index 5748f06..a57f8cc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/BrandShopAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/BrandShopAdminController.java
@@ -103,7 +103,6 @@
@RequestMapping(value = "query")
public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
PrintWriter out) {
-
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
}
@@ -114,7 +113,6 @@
try {
List<BrandClass> list = brandClassService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state);
-
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
@@ -132,11 +130,28 @@
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();
+ }
+ }
+
+ /**
+ * 淇敼鐘舵��
+ * @param callback
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "switchStateClass")
+ public void switchStateClass(String callback, Long id, PrintWriter out) {
+ try {
+ brandClassService.switchState(id);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (BrandClassException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
e.printStackTrace();
}
}
@@ -150,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("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -445,9 +459,15 @@
* @param out
*/
@RequestMapping(value = "saveBrand")
- public void saveBrand(String callback, BrandInfo brandInfo, PrintWriter out) {
+ public void saveBrand(String callback, BrandInfo brandInfo, HttpServletRequest request, PrintWriter out) {
try {
- brandInfoService.saveObject(brandInfo);
+ // 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
+ if (request instanceof MultipartHttpServletRequest) {
+ MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
+ brandInfoService.saveObject(fileRequest.getFile("file"), brandInfo);
+ }else{
+ brandInfoService.saveObject(null, brandInfo);
+ }
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} catch (BrandInfoException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -457,6 +477,25 @@
}
}
+
+ /**
+ * 淇敼鐘舵��
+ * @param callback
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "switchStateBrand")
+ public void switchStateBrand(String callback, Long id, PrintWriter out) {
+ try {
+ brandInfoService.switchState(id);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (BrandInfoException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
/**
* 鍒犻櫎
@@ -489,6 +528,26 @@
}
/**
+ * 淇敼鎺掑簭
+ *
+ * @param callback
+ * @param goodsClass
+ * @param out
+ */
+ @RequestMapping(value = "updateOrderBrand")
+ public void updateOrderBrand(String callback, Long id, Integer moveType, PrintWriter out) {
+ try {
+ brandInfoService.updateOrder(id, moveType);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (BrandInfoException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+ /**
* 鍝佺墝淇℃伅鏌ヨ
* @param callback
* @param pageIndex
@@ -499,8 +558,8 @@
* @param out
*/
@RequestMapping(value = "queryBrand")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, Long cid, Integer state,
- PrintWriter out) {
+ public void queryBrand(String callback, Integer pageIndex, Integer pageSize, String key, Long cid, Integer state,
+ Integer showState, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -509,16 +568,37 @@
if (pageSize == null || pageSize < 1) {
pageSize = Constant.PAGE_SIZE;
}
-
+
+ List<String> keys = null;
+ if (!StringUtil.isNullOrEmpty(key)) {
+ String[] array = key.split("\\s+");
+ if (array != null && array.length > 0) {
+ keys = new ArrayList<String>();
+ for (int i= 0; i < array.length; i++) {
+ keys.add(array[i].toString());
+ }
+ }
+ }
+
try {
- List<BrandInfo> list = brandInfoService.listQuery((pageIndex - 1) * pageSize, pageSize, key, cid, state);
+ List<BrandInfo> list = brandInfoService.listQuery((pageIndex - 1) * pageSize, pageSize, keys, cid, state, showState);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
+
+ for (BrandInfo brandInfo: list) {
+ BrandClass brandClass = brandInfo.getBrandClass();
+ if (brandClass != null && StringUtil.isNullOrEmpty(brandClass.getName())) {
+ BrandClass bclass = brandClassService.selectByPrimaryKey(brandClass.getId());
+ if (bclass != null) {
+ brandInfo.setBrandClass(bclass);
+ }
+ }
+ }
- long count = brandInfoService.countQuery(key, cid, state);
+ long count = brandInfoService.countQuery(keys, cid, state, showState);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
--
Gitblit v1.8.0