From efb2457e0f7b6e5a76999c239d8b079b21c88eb0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 19 二月 2025 14:03:43 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java |   28 +++++++++++++++++++++++++---
 1 files changed, 25 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 5816bc3..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,9 +4,7 @@
 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;
@@ -62,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