From e57e32fc43da31917912eebb4e47d4e50df1a9e9 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 22:56:15 +0800
Subject: [PATCH] 完善格式化功能

---
 service-goods/src/main/java/com/java110/goods/api/ProductCategoryApi.java |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/service-goods/src/main/java/com/java110/goods/api/ProductCategoryApi.java b/service-goods/src/main/java/com/java110/goods/api/ProductCategoryApi.java
old mode 100644
new mode 100755
index 12de16f..9b32a9f
--- a/service-goods/src/main/java/com/java110/goods/api/ProductCategoryApi.java
+++ b/service-goods/src/main/java/com/java110/goods/api/ProductCategoryApi.java
@@ -1,17 +1,22 @@
 package com.java110.goods.api;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.productCategory.ProductCategoryDto;
+import com.java110.dto.product.ProductCategoryDto;
 import com.java110.goods.bmo.productCategory.IDeleteProductCategoryBMO;
 import com.java110.goods.bmo.productCategory.IGetProductCategoryBMO;
 import com.java110.goods.bmo.productCategory.ISaveProductCategoryBMO;
 import com.java110.goods.bmo.productCategory.IUpdateProductCategoryBMO;
-import com.java110.po.productCategory.ProductCategoryPo;
+import com.java110.po.product.ProductCategoryPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 
 @RestController
@@ -37,7 +42,8 @@
      * @path /app/productCategory/saveProductCategory
      */
     @RequestMapping(value = "/saveProductCategory", method = RequestMethod.POST)
-    public ResponseEntity<String> saveProductCategory(@RequestBody JSONObject reqJson) {
+    public ResponseEntity<String> saveProductCategory(@RequestBody JSONObject reqJson,
+                                                      @RequestHeader(value = "store-id") String storeId) {
 
         Assert.hasKeyAndValue(reqJson, "categoryName", "璇锋眰鎶ユ枃涓湭鍖呭惈categoryName");
         Assert.hasKeyAndValue(reqJson, "categoryLevel", "璇锋眰鎶ユ枃涓湭鍖呭惈categoryLevel");
@@ -46,6 +52,10 @@
 
 
         ProductCategoryPo productCategoryPo = BeanConvertUtil.covertBean(reqJson, ProductCategoryPo.class);
+        productCategoryPo.setStoreId(storeId);
+        if (!reqJson.containsKey("parentCategoryId")) {
+            productCategoryPo.setParentCategoryId("-1");
+        }
         return saveProductCategoryBMOImpl.save(productCategoryPo);
     }
 
@@ -58,7 +68,8 @@
      * @path /app/productCategory/updateProductCategory
      */
     @RequestMapping(value = "/updateProductCategory", method = RequestMethod.POST)
-    public ResponseEntity<String> updateProductCategory(@RequestBody JSONObject reqJson) {
+    public ResponseEntity<String> updateProductCategory(@RequestBody JSONObject reqJson,
+                                                        @RequestHeader(value = "store-id") String storeId) {
 
         Assert.hasKeyAndValue(reqJson, "categoryName", "璇锋眰鎶ユ枃涓湭鍖呭惈categoryName");
         Assert.hasKeyAndValue(reqJson, "categoryLevel", "璇锋眰鎶ユ枃涓湭鍖呭惈categoryLevel");
@@ -68,6 +79,7 @@
 
 
         ProductCategoryPo productCategoryPo = BeanConvertUtil.covertBean(reqJson, ProductCategoryPo.class);
+        productCategoryPo.setStoreId(storeId);
         return updateProductCategoryBMOImpl.update(productCategoryPo);
     }
 
@@ -80,13 +92,15 @@
      * @path /app/productCategory/deleteProductCategory
      */
     @RequestMapping(value = "/deleteProductCategory", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteProductCategory(@RequestBody JSONObject reqJson) {
+    public ResponseEntity<String> deleteProductCategory(@RequestBody JSONObject reqJson,
+                                                        @RequestHeader(value = "store-id") String storeId) {
         Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
 
         Assert.hasKeyAndValue(reqJson, "categoryId", "categoryId涓嶈兘涓虹┖");
 
 
         ProductCategoryPo productCategoryPo = BeanConvertUtil.covertBean(reqJson, ProductCategoryPo.class);
+        productCategoryPo.setStoreId(storeId);
         return deleteProductCategoryBMOImpl.delete(productCategoryPo);
     }
 

--
Gitblit v1.8.0