From 4dadac0d032c1b2543ff9bd7251d73a90f8e3b11 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 14 九月 2023 18:24:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/company/src/main/java/com/doumee/api/business/GoodsController.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 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 b6fdd44..bb93b7a 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
@@ -3,9 +3,12 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.model.LoginUserInfo;
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;
import io.swagger.annotations.*;
@@ -41,6 +44,24 @@
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")
+ @RequiresPermissions("business:goods:create")
+ public ApiResponse createPlat(@RequestBody GoodCreatePlatRequest param) {
+ return ApiResponse.success(goodsService.createPlat(param));
+ }
+
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@RequiresPermissions("business:goods:delete")
@@ -70,10 +91,20 @@
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);
+ }
+
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:goods:query")
public ApiResponse<PageData<Goods>> findPage (@RequestBody PageWrap<Goods> pageWrap) {
+ LoginUserInfo loginUserInfo = this.getLoginUser();
+ pageWrap.getModel().setCompanyId(loginUserInfo.getCompanyId());
return ApiResponse.success(goodsService.findPage(pageWrap));
}
@@ -110,6 +141,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