From 9d35ba657fa5e3add766405d76e3ff8c4dcd4ad4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 15:38:00 +0800
Subject: [PATCH] 多系统兼容优化

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/BrandShopAdminController.java |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 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 a57f8cc..25ca896 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
@@ -9,6 +9,8 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeshi.fanli.entity.SystemEnum;
+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;
@@ -54,13 +56,14 @@
 	 * 淇濆瓨淇℃伅
 	 * 
 	 * @param callback
-	 * @param special
 	 * @param out
 	 */
 	@RequestMapping(value = "save")
-	public void save(String callback, BrandClass brandClass, PrintWriter out) {
+	public void save(AdminAcceptData acceptData, String callback, BrandClass brandClass, PrintWriter out) {
 		try {
-			brandClassService.saveObject(brandClass);
+			List<SystemEnum> systemList=new ArrayList<>();
+			systemList.add(acceptData.getSystem());
+			brandClassService.saveObject(brandClass,systemList);
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
 		} catch (BrandClassException e) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -74,13 +77,12 @@
 	 * 淇敼鎺掑簭
 	 * 
 	 * @param callback
-	 * @param goodsClass
 	 * @param out
 	 */
 	@RequestMapping(value = "updateOrder")
-	public void updateOrder(String callback, Long id, Integer moveType, PrintWriter out) {
+	public void updateOrder(AdminAcceptData acceptData,String callback, Long id, Integer moveType, PrintWriter out) {
 		try {
-			brandClassService.updateOrder(id, moveType);
+			brandClassService.updateOrder(id, moveType,acceptData.getSystem());
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
 		} catch (BrandClassException e) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -101,7 +103,7 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "query")
-	public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
+	public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
 			PrintWriter out) {
 		if (pageIndex == null || pageIndex < 1) {
 			pageIndex = 1;
@@ -112,13 +114,13 @@
 		}
 
 		try {
-			List<BrandClass> list = brandClassService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state);
+			List<BrandClass> list = brandClassService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state,acceptData.getSystem());
 			if (list == null || list.size() == 0) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
 				return;
 			}
 
-			long count = brandClassService.countQuery(key, state);
+			long count = brandClassService.countQuery(key, state,acceptData.getSystem());
 
 			int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
 			PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -193,9 +195,9 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "getOptions")
-	public void getOptions(String callback, PrintWriter out) {
+	public void getOptions(AdminAcceptData acceptData, String callback, PrintWriter out) {
 		try {
-			List<BrandClass> list = brandClassService.listEffective();
+			List<BrandClass> list = brandClassService.listEffective(acceptData.getSystem());
 			if (list == null || list.size() == 0) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
 				return;
@@ -292,7 +294,6 @@
 	 * 娣诲姞搴楅摵鍏ュ簱
 	 * 
 	 * @param callback
-	 * @param special
 	 * @param out
 	 */
 	@RequestMapping(value = "saveShopInfo")
@@ -376,7 +377,6 @@
 	 * 淇濆瓨淇℃伅
 	 * 
 	 * @param callback
-	 * @param special
 	 * @param out
 	 */
 	@RequestMapping(value = "saveClassShop")
@@ -402,7 +402,6 @@
 	 * 淇敼鎺掑簭
 	 * 
 	 * @param callback
-	 * @param goodsClass
 	 * @param out
 	 */
 	@RequestMapping(value = "updateOrderClassShop")
@@ -531,7 +530,6 @@
 	 * 淇敼鎺掑簭
 	 * 
 	 * @param callback
-	 * @param goodsClass
 	 * @param out
 	 */
 	@RequestMapping(value = "updateOrderBrand")

--
Gitblit v1.8.0