From 9c20f268e0628017d09427989724cdf2a8e9e8e2 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 19 九月 2023 12:47:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/company/src/main/java/com/doumee/api/business/GoodsController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/GoodsController.java b/server/company/src/main/java/com/doumee/api/business/GoodsController.java
index 0b62d52..835b91e 100644
--- a/server/company/src/main/java/com/doumee/api/business/GoodsController.java
+++ b/server/company/src/main/java/com/doumee/api/business/GoodsController.java
@@ -13,6 +13,7 @@
import com.doumee.service.CateParamSelectService;
import com.doumee.service.business.GoodsService;
import io.swagger.annotations.*;
+import lombok.extern.java.Log;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,7 +57,7 @@
// @RequiresPermissions("business:goods:create")
public ApiResponse companyCreate(@RequestBody Goods goods) {
goodsService.companyCreate(goods);
- cateParamSelectService.dealGroupVals(goods.getCompanyId());
+ cateParamSelectService.dealCateParamSelect();
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -65,7 +66,9 @@
@PostMapping("/createPlat")
@RequiresPermissions("business:goods:create")
public ApiResponse createPlat(@RequestBody GoodCreatePlatRequest param) {
- return ApiResponse.success(goodsService.createPlat(param));
+ goodsService.createPlat(param);
+ cateParamSelectService.dealCateParamSelect();
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@@ -73,6 +76,7 @@
@RequiresPermissions("business:goods:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
goodsService.deleteById(id);
+ cateParamSelectService.dealCateParamSelect();
return ApiResponse.success(null);
}
@@ -86,6 +90,7 @@
idList.add(Integer.valueOf(id));
}
goodsService.deleteByIdInBatch(idList);
+ cateParamSelectService.dealCateParamSelect();
return ApiResponse.success(null);
}
@@ -102,6 +107,7 @@
@RequiresPermissions("business:goods:update")
public ApiResponse companyUpdateById(@RequestBody Goods goods) {
goodsService.companyUpdateById(goods);
+ cateParamSelectService.dealCateParamSelect();
return ApiResponse.success(null);
}
@@ -135,7 +141,9 @@
})
// @RequiresPermissions("business:goods:create")
public ApiResponse<Integer> importExcel (@ApiParam(value = "file") MultipartFile file) {
- return ApiResponse.success(goodsService.importBatch(file));
+ Integer val = goodsService.importBatch(file);
+ cateParamSelectService.dealCateParamSelect();
+ return ApiResponse.success(val);
}
--
Gitblit v1.9.3