From 4788c0abe7193191b3ca024b0f5f8fed196294bd Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 05 三月 2025 14:29:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java
index 2dbbbdd..a0340a0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java
@@ -45,7 +45,7 @@
@Autowired
TBillConfirmService tBillConfirmService;
- @PreAuthorize("@ss.hasPermi('system:bill:list')")
+ @PreAuthorize("@ss.hasPermi('bill:list')")
@PostMapping("list")
@ApiOperation("分页查询账单列表")
public R<PageInfo<TBillDto>> list(@RequestBody TBillQuery query){
@@ -53,7 +53,7 @@
return R.ok(pageInfo);
}
- @PreAuthorize("@ss.hasPermi('system:bill:add')")
+ @PreAuthorize("@ss.hasPermi('bill:list:addRent')")
@PostMapping("add")
@ApiOperation("新增账单")
public R<PageInfo<TBillDto>> add(@Validated @RequestBody TbillSaveDto bill){
@@ -83,7 +83,7 @@
}
- @PreAuthorize("@ss.hasPermi('system:bill:checkOfflinePay')")
+ @PreAuthorize("@ss.hasPermi('bill:list:paid')")
@ApiOperation("确认线下缴费")
@PostMapping("checkOfflinePay")
public R checkOfflinePay(@Validated @RequestBody OfflinePayCheckDto dto){
@@ -91,7 +91,7 @@
return R.ok();
}
- @PreAuthorize("@ss.hasPermi('system:bill:sendSmsByBillIds')")
+ @PreAuthorize("@ss.hasPermi('bill:list:sendMsg')")
@ApiOperation("账单批量发送短信通知")
@PostMapping("sendSmsByBillIds")
public R sendSmsByBillIds(@Validated @RequestBody SmsByBillDto dto){
@@ -100,8 +100,8 @@
}
- @PreAuthorize("@ss.hasPermi('system:bill:sendMailBatchByBillIds')")
- @ApiOperation("账单批量发送邮件通知")
+ @PreAuthorize("@ss.hasPermi('bill:list:sendMail')")
+ @ApiOperation("账单批量发送邮箱通知")
@PostMapping("sendMailBatchByBillIds")
public R sendMailBatchByBillIds(@Validated @RequestBody SmsByBillDto dto){
Integer failNum = tBillService.sendMailBatchByBillIds(dto);
@@ -111,7 +111,7 @@
- @PreAuthorize("@ss.hasPermi('system:bill:cashPay')")
+ @PreAuthorize("@ss.hasPermi('bill:list:receipt')")
@ApiOperation("收款")
@PostMapping("cashPay")
public R cashPay(@RequestBody CachPayDto cachPayDto){
@@ -126,8 +126,6 @@
BillStatisticsDto dto = tBillService.statistics();
return R.ok(dto);
}
-
-
--
Gitblit v1.7.1