From b89ec31332c225120a22006731256f5a77d93ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E5=8D=8E=E8=A7=9E?= <2840315406@qq.com> Date: Fri, 25 Jul 2025 11:12:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86,=E4=BE=9B?= =?UTF-8?q?=E8=B4=A7=E5=95=86=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=9D=83=E9=99=90=E5=88=92=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fdsafe/web/edu/SupplierController.java | 28 +++++++++++++++++ .../web/supplier/FoodProductController.java | 30 +++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/SupplierController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/SupplierController.java index b06b943..820c83c 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/SupplierController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/SupplierController.java @@ -1,7 +1,9 @@ package com.zf.foodpurchase.fdsafe.web.edu; +import com.zf.foodpurchase.common.constant.WxAPPAccountConstants; import com.zf.foodpurchase.common.core.controller.BaseController; import com.zf.foodpurchase.common.core.domain.AjaxResult; +import com.zf.foodpurchase.common.core.domain.entity.SysUser; import com.zf.foodpurchase.common.core.page.TableDataInfo; import com.zf.foodpurchase.common.valigroud.AddGroup; import com.zf.foodpurchase.common.valigroud.UpdateGroup; @@ -39,8 +41,20 @@ public class SupplierController extends BaseController { return getDataTable(list); } + /** + * 教育局可增 + * @param supplierVO + * @return + */ @PostMapping("/add") public AjaxResult add(@RequestBody @Validated(AddGroup.class) SupplierVO supplierVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.EDU.equals(accountType)){ + return error("非教育局账号无法添加供货"); + } + } // wxImage形式 List images = supplierVO.getWxLicenseImg(); if(!CollectionUtils.isEmpty( images)){ @@ -56,6 +70,13 @@ public class SupplierController extends BaseController { // 接口需要划分:上架,信息编辑. @PostMapping("/update") public AjaxResult update(@RequestBody @Validated(UpdateGroup.class) SupplierVO supplierVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.EDU.equals(accountType)){ + return error("非供货商账号无法修改供货商信息"); + } + } // wxImage形式 List images = supplierVO.getWxLicenseImg(); if(!CollectionUtils.isEmpty( images)){ @@ -78,6 +99,13 @@ public class SupplierController extends BaseController { if(supplierVO.getSupplierId() == null){ return error("未指定要修改的供货商"); } + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.EDU.equals(accountType)){ + return error("非教育局账号无法上下架供货商"); + } + } SupplierVO updateStatus = new SupplierVO(); updateStatus.setSupplierId(supplierVO.getSupplierId()); updateStatus.setStatus(supplierVO.getStatus()); diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/FoodProductController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/FoodProductController.java index 739ed82..ba905b6 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/FoodProductController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/FoodProductController.java @@ -1,8 +1,10 @@ package com.zf.foodpurchase.fdsafe.web.supplier; +import com.zf.foodpurchase.common.constant.WxAPPAccountConstants; import com.zf.foodpurchase.common.core.controller.BaseController; import com.zf.foodpurchase.common.core.domain.AjaxResult; +import com.zf.foodpurchase.common.core.domain.entity.SysUser; import com.zf.foodpurchase.common.core.page.TableDataInfo; import com.zf.foodpurchase.common.valigroud.AddGroup; import com.zf.foodpurchase.common.valigroud.CheckGroup; @@ -47,6 +49,13 @@ public class FoodProductController extends BaseController { */ @PostMapping("/supplierAdd") public AjaxResult supplierAdd(@RequestBody @Validated(AddGroup.class) FoodProductVO foodProductVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SUPPLIER.equals(accountType)){ + return error("非供货商账号无法添加商品"); + } + } return foodProductService.supplierAdd(foodProductVO); } @@ -55,6 +64,13 @@ public class FoodProductController extends BaseController { */ @PostMapping("/supplierUpdate") public AjaxResult supplierUpdate(@RequestBody @Validated(UpdateGroup.class) FoodProductVO foodProductVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SUPPLIER.equals(accountType)){ + return error("非供货商账号无法修改商品"); + } + } return foodProductService.supplierUpdate(foodProductVO); } @@ -63,6 +79,13 @@ public class FoodProductController extends BaseController { */ @PostMapping("/eduCheck") public AjaxResult eduCheck(@RequestBody @Validated(CheckGroup.class) FoodProductVO foodProductVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.EDU.equals(accountType)){ + return error("非教育局账号无法审核商品"); + } + } return foodProductService.eduCheck(foodProductVO); } @@ -74,6 +97,13 @@ public class FoodProductController extends BaseController { if(foodProductId == null){ return error("商品id不能为空"); } + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SUPPLIER.equals(accountType)){ + return error("非供货商账号无法删除商品"); + } + } return foodProductService.removeById(foodProductId) ? success("删除成功") : error("删除失败"); }