From d9c96d153bb5ed761da76f29d715c755f7b5dd32 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期二, 19 九月 2023 10:24:05 +0800
Subject: [PATCH] 平台端bug
---
server/company/src/main/java/com/doumee/api/business/GoodsController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 ec599bc..0b62d52 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,14 +3,17 @@
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.CateParamSelectService;
import com.doumee.service.business.GoodsService;
import io.swagger.annotations.*;
+import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -34,6 +37,8 @@
@Autowired
private GoodsService goodsService;
+ @Autowired
+ private CateParamSelectService cateParamSelectService;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -48,9 +53,11 @@
@PreventRepeat
@ApiOperation("浼佷笟鏂板缓鍟嗗搧")
@PostMapping("/companyCreate")
- @RequiresPermissions("business:goods:create")
+// @RequiresPermissions("business:goods:create")
public ApiResponse companyCreate(@RequestBody Goods goods) {
- return ApiResponse.success(goodsService.companyCreate(goods));
+ goodsService.companyCreate(goods);
+ cateParamSelectService.dealGroupVals(goods.getCompanyId());
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@PreventRepeat
@@ -102,6 +109,8 @@
@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));
}
@@ -132,7 +141,7 @@
@ApiOperation("淇敼鐘舵��")
@PostMapping("/updateDisableById")
- @RequiresPermissions("business:category:update")
+ @RequiresPermissions("business:goods:update")
public ApiResponse updateDisableById(@RequestBody Goods goods) {
goodsService.updateDisableById(goods);
return ApiResponse.success(null);
@@ -140,7 +149,7 @@
@ApiOperation("鎵归噺淇敼鐘舵��")
@PostMapping("/batchUpdateDisableById")
- @RequiresPermissions("business:category:update")
+ @RequiresPermissions("business:goods:update")
public ApiResponse<String> batchUpdateDisableById(@RequestBody BatchDisableDTO batchDisableDTO) {
return ApiResponse.success(goodsService.batchUpdateDisableById(batchDisableDTO));
}
@@ -149,6 +158,8 @@
@ApiOperation("鍒楄〃 - H5")
@PostMapping("/list")
public ApiResponse<List<Goods>> findList (@RequestBody Goods goods) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ goods.setCompanyId(user.getCompanyId());
return ApiResponse.success(goodsService.findList(goods));
}
--
Gitblit v1.9.3