From 8ff6842edf6229bb40344eafc4fe084fb09c7d24 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 26 二月 2025 14:02:34 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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 4ce9a6b..7ecc704 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
@@ -4,12 +4,11 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.system.dto.OfflinePayCheckDto;
-import com.ruoyi.system.dto.TBillDto;
-import com.ruoyi.system.dto.TbillSaveDto;
+import com.ruoyi.system.dto.*;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.query.TBillQuery;
import com.ruoyi.system.service.TBillService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -27,12 +26,16 @@
* @author xiaochen
* @since 2025-01-17
*/
+@Api(tags = "账单管理")
@RestController
@RequestMapping("/t-bill")
public class TBillController {
@Autowired
TBillService tBillService;
+
+
+
@PreAuthorize("@ss.hasPermi('system:bill:list')")
@PostMapping("list")
@@ -57,6 +60,30 @@
return R.ok();
}
+ @PreAuthorize("@ss.hasPermi('system:bill:sendSmsByBillIds')")
+ @ApiOperation("账单批量发送短信通知")
+ @PostMapping("sendSmsByBillIds")
+ public R sendSmsByBillIds(@Validated @RequestBody SmsByBillDto dto){
+ Integer failNum = tBillService.sendSmsByBillIds(dto);
+ return R.ok(failNum);
+ }
+
+
+ @PreAuthorize("@ss.hasPermi('system:bill:sendMailBatchByBillIds')")
+ @ApiOperation("账单批量发送短信通知")
+ @PostMapping("sendMailBatchByBillIds")
+ public R sendMailBatchByBillIds(@Validated @RequestBody SmsByBillDto dto){
+ Integer failNum = tBillService.sendMailBatchByBillIds(dto);
+ return R.ok(failNum);
+ }
+
+ @PreAuthorize("@ss.hasPermi('system:bill:cashPay')")
+ @ApiOperation("收款")
+ @PostMapping("cashPay")
+ public R cashPay(@RequestBody OfflinePayDto offlinePayDto){
+ return null;
+ }
+
}
--
Gitblit v1.7.1