From 4ede780dd7885f31bcaadfe48224f1da73b763ef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 21 五月 2019 15:34:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java | 44 ++++++++++++++++++++------------------------
1 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java
index 0a61ea3..d1662e3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java
@@ -38,22 +38,20 @@
@Resource
private SuperGoodsClassService superGoodsClassService;
-
@Resource
private GoodsSecondClassService goodsSecondClassService;
@Resource
private GoodsSubClassService goodsSubClassService;
-
+
@Resource
private LabelClassService labelClassService;
@Resource
private BusinessSystemService businessSystemService;
-
@RequestMapping(value = "queryAll")
- public void listquery(String callback, PrintWriter out) {
+ public void listquery(String callback, PrintWriter out) {
try {
List<GoodsClass> goodsClassList = goodsClassService.listquery();
@@ -74,7 +72,6 @@
}
-
@RequestMapping(value = "getGoodsClasAll")
public void getGoodsClassAll(String callback, PrintWriter out) {
List<GoodsClass> goodsClassList = goodsClassService.getGoodsClassAll();
@@ -89,7 +86,6 @@
}
}
-
/**
* 淇濆瓨淇℃伅
*
@@ -98,16 +94,19 @@
* @param out
*/
@RequestMapping(value = "save")
- public void save(String callback, GoodsClass goodsClass, String jumpType, HttpServletRequest request,PrintWriter out) {
+ public void save(String callback, GoodsClass goodsClass, String jumpType, HttpServletRequest request,
+ PrintWriter out) {
+ if (goodsClass.getTaobaoCids() != null)
+ goodsClass.setTaobaoCids(goodsClass.getTaobaoCids().replace("锛�", ","));
try {
- // 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
+ // 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
if (request instanceof MultipartHttpServletRequest) {
- MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
- goodsClassService.saveObject(fileRequest.getFile("file"), goodsClass);
- }else{
- goodsClassService.saveObject(null, goodsClass);
- }
-
+ MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
+ goodsClassService.saveObject(fileRequest.getFile("file"), goodsClass);
+ } else {
+ goodsClassService.saveObject(null, goodsClass);
+ }
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} catch (FloatADException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -116,7 +115,6 @@
e.printStackTrace();
}
}
-
/**
* 淇敼鎺掑簭
@@ -137,7 +135,7 @@
e.printStackTrace();
}
}
-
+
/**
* 鎵归噺鍒犻櫎
*
@@ -162,12 +160,12 @@
Long recordId = Long.parseLong(id);
superGoodsClassService.deleteSuperGoodsClass(recordId);
-
+
// 鍒犻櫎瀛愮被鍒嗙被
goodsSubClassService.deleteByRootId(recordId);
// 鍒犻櫎绫诲埆鍏宠仈鏍囩
labelClassService.deleteByClassId(recordId);
-
+
goodsClassService.deleteGoodsClass(recordId);
}
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
@@ -179,8 +177,6 @@
}
}
-
-
/**
* 鍒犻櫎鍥剧墖
@@ -210,9 +206,10 @@
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
}
}
-
+
@RequestMapping(value = "setSuperSystem")
- public void setSuperSystem(String callback,String type, Long gcid, String platform, String packageName, PrintWriter out) {
+ public void setSuperSystem(String callback, String type, Long gcid, String platform, String packageName,
+ PrintWriter out) {
platform = Utils.getMap().get(platform);
if (Constant.DEL.equals(type)) {
Integer integer = superGoodsClassService.deleteSuperGoodsClass(gcid, platform, packageName);
@@ -226,8 +223,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
}
}
-
-
+
@RequestMapping(value = "getClassOption")
public void getClassOption(String callback, PrintWriter out) {
--
Gitblit v1.8.0