From 3fe43484c84645e5e3ebe0350db70cae82f70d2d 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 18:02:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E6=A0=A1,=E4=BE=9B=E8=B4=A7=E5=95=86,?= =?UTF-8?q?=E6=95=99=E8=82=B2=E5=B1=80,=E7=BB=93=E7=AE=97=E5=8D=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9D=83=E9=99=90=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fdsafe/web/edu/EduController.java | 9 ++++++ .../fdsafe/web/edu/SupplierController.java | 9 +++--- .../fdsafe/web/school/SchoolController.java | 9 ++++++ .../web/school/SchoolSettleController.java | 30 +++++++++++++++++++ 4 files changed, 53 insertions(+), 4 deletions(-) diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/EduController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/EduController.java index 913a3b6..599ebc8 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/EduController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/EduController.java @@ -2,6 +2,7 @@ package com.zf.foodpurchase.fdsafe.web.edu; 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.domain.model.LoginUser; import com.zf.foodpurchase.common.core.page.TableDataInfo; import com.zf.foodpurchase.common.valigroud.AddGroup; @@ -45,6 +46,10 @@ public class EduController extends BaseController { @PostMapping("/add") public AjaxResult add(@RequestBody @Validated(AddGroup.class) EduVO eduVO){ + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + return error("非管理员账号无法添加供货商"); + } return eduService.saveVO(eduVO); } @@ -58,6 +63,10 @@ public class EduController extends BaseController { if(eduId == null){ return error("未指定要删除的教育局"); } + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + return error("非管理员账号无法删除教育局"); + } return eduService.removeById(eduId) ? success("删除成功") : error("删除失败"); } } 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 820c83c..5e19c71 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 @@ -50,10 +50,7 @@ public class SupplierController extends BaseController { 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("非教育局账号无法添加供货"); - } + return error("非管理员账号无法添加货商"); } // wxImage形式 List images = supplierVO.getWxLicenseImg(); @@ -119,6 +116,10 @@ public class SupplierController extends BaseController { if (supplierId == null) { return error("未指定要删除的供货商"); } + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + return error("非管理员账号无法删除供货商"); + } boolean flag = supplierService.removeById(supplierId); return flag ? success("删除成功") : error("删除失败"); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolController.java index 8e8dfc7..fa07617 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolController.java @@ -1,7 +1,9 @@ package com.zf.foodpurchase.fdsafe.web.school; +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.utils.DateUtils; import com.zf.foodpurchase.common.valigroud.AddGroup; @@ -38,6 +40,13 @@ public class SchoolController extends BaseController { @PostMapping("/add") public AjaxResult add(@RequestBody @Validated(AddGroup.class) SchoolVO schoolVO){ + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.EDU.equals(accountType)){ + return error("非教育局账号无法添加学校"); + } + } return schoolService.saveVO(schoolVO); } diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolSettleController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolSettleController.java index 6478d3f..5c3bb6a 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolSettleController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolSettleController.java @@ -2,8 +2,10 @@ package com.zf.foodpurchase.fdsafe.web.school; import com.zf.foodpurchase.common.constant.OrderStatusConstants; +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.utils.StringUtils; import com.zf.foodpurchase.fdsafe.service.ISchoolOrderService; @@ -53,6 +55,13 @@ public class SchoolSettleController extends BaseController { */ @PostMapping("/submitSettle") public AjaxResult submitSettle(@RequestBody @Valid SchoolSettleSubmitVO submitVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法发起订单结算"); + } + } return schoolSettleService.submitSettle(submitVO); } @@ -61,6 +70,13 @@ public class SchoolSettleController extends BaseController { */ @PostMapping("/checkSettle") public AjaxResult checkSettle(@RequestBody @Valid SchoolSettleCheckVO checkVO) { + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.EDU.equals(accountType)){ + return error("非教育局账号无法发起订单结算"); + } + } return schoolSettleService.checkSettle(checkVO); } @@ -72,6 +88,13 @@ public class SchoolSettleController extends BaseController { if(StringUtils.isEmpty(settleNo)){ return AjaxResult.warn("结算单号不能为空"); } + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SCHOOL.equals(accountType)){ + return error("非学校账号无法更新结算单状态"); + } + } return schoolSettleService.updateSettlePayStatus(settleNo); } @@ -83,6 +106,13 @@ public class SchoolSettleController extends BaseController { if(StringUtils.isEmpty(settleNo)){ return AjaxResult.warn("结算单号不能为空"); } + SysUser user = getLoginUser().getUser(); + if(!user.isAdmin()){ + Integer accountType =getLoginUser().getUser().getAccountType(); + if(!WxAPPAccountConstants.SUPPLIER.equals(accountType)){ + return error("非供货商账号无法确认收款"); + } + } return schoolSettleService.updateSettleConfirmStatus(settleNo); }