From f417d6b965a16fb197ac8c49b383fbeedd28e23d Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 11 九月 2023 15:44:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/company/src/main/java/com/doumee/api/business/GoodsController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 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 50df5e6..ec599bc 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
@@ -6,6 +6,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Goods;
+import com.doumee.dao.business.model.dto.BatchDisableDTO;
import com.doumee.dao.business.model.dto.GoodCreatePlatRequest;
import com.doumee.dao.business.model.dto.GoodsRequest;
import com.doumee.service.business.GoodsService;
@@ -41,6 +42,17 @@
public ApiResponse create(@RequestBody Goods goods) {
return ApiResponse.success(goodsService.create(goods));
}
+
+
+
+ @PreventRepeat
+ @ApiOperation("浼佷笟鏂板缓鍟嗗搧")
+ @PostMapping("/companyCreate")
+ @RequiresPermissions("business:goods:create")
+ public ApiResponse companyCreate(@RequestBody Goods goods) {
+ return ApiResponse.success(goodsService.companyCreate(goods));
+ }
+
@PreventRepeat
@ApiOperation("浠庡钩鍙伴�夋嫨鍟嗗搧")
@PostMapping("/createPlat")
@@ -75,6 +87,14 @@
@RequiresPermissions("business:goods:update")
public ApiResponse updateById(@RequestBody Goods goods) {
goodsService.updateById(goods);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("浼佷笟鏍规嵁ID淇敼")
+ @PostMapping("/companyUpdateById")
+ @RequiresPermissions("business:goods:update")
+ public ApiResponse companyUpdateById(@RequestBody Goods goods) {
+ goodsService.companyUpdateById(goods);
return ApiResponse.success(null);
}
@@ -118,6 +138,13 @@
return ApiResponse.success(null);
}
+ @ApiOperation("鎵归噺淇敼鐘舵��")
+ @PostMapping("/batchUpdateDisableById")
+ @RequiresPermissions("business:category:update")
+ public ApiResponse<String> batchUpdateDisableById(@RequestBody BatchDisableDTO batchDisableDTO) {
+ return ApiResponse.success(goodsService.batchUpdateDisableById(batchDisableDTO));
+ }
+
@ApiOperation("鍒楄〃 - H5")
@PostMapping("/list")
--
Gitblit v1.9.3