From 18ef3cfe9992b3c1663c7bccb45279a4c6732245 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 28 十一月 2019 17:46:55 +0800
Subject: [PATCH] 假用户发布邀请码
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/BrandShopAdminController.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 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..eb786f4 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
@@ -445,9 +445,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()));
@@ -489,6 +495,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,7 +525,7 @@
* @param out
*/
@RequestMapping(value = "queryBrand")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, Long cid, Integer state,
+ public void queryBrand(String callback, Integer pageIndex, Integer pageSize, String key, Long cid, Integer state,
PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
@@ -509,7 +535,7 @@
if (pageSize == null || pageSize < 1) {
pageSize = Constant.PAGE_SIZE;
}
-
+
try {
List<BrandInfo> list = brandInfoService.listQuery((pageIndex - 1) * pageSize, pageSize, key, cid, state);
@@ -517,6 +543,16 @@
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);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
--
Gitblit v1.8.0