zjk/SchoolFood
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

学校,供货商,教育局,结算单接口权限优化

Browse Source
This commit is contained in:
林华觞
2025-07-25 18:02:50 +08:00
parent 5456559859
commit 3fe43484c8
4 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/EduController.java
View File

@@ -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("删除失败");
}
}

9
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/edu/SupplierController.java
View File

@@ -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<WxImg> 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("删除失败");
}

9
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolController.java
View File

@@ -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);
}

30
fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolSettleController.java
View File

@@ -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);
}