From b2be113822cad796a1489b7fc52de2cb4042b57c Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期二, 18 二月 2025 12:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xizang-changyun' into xizang-changyun
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 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 5b6b535..9a91166 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
@@ -3,10 +3,15 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.exception.ServiceException;
+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.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,12 +32,56 @@
@Autowired
TBillService tBillService;
+
+
+
+ @PreAuthorize("@ss.hasPermi('system:bill:list')")
@PostMapping("list")
- public R<PageInfo<TBill>> list(@RequestBody TBillQuery query){
- PageInfo<TBill> pageInfo = tBillService.queryPage(query);
+ @ApiOperation("分页查询账单列表")
+ public R<PageInfo<TBillDto>> list(@RequestBody TBillQuery query){
+ PageInfo<TBillDto> pageInfo = tBillService.queryPage(query);
return R.ok(pageInfo);
}
+ @PreAuthorize("@ss.hasPermi('system:bill:add')")
+ @PostMapping("add")
+ @ApiOperation("新增账单")
+ public R<PageInfo<TBillDto>> add(@Validated @RequestBody TbillSaveDto bill){
+ tBillService.saveBill(bill);
+ return R.ok();
+ }
+ @PreAuthorize("@ss.hasPermi('system:bill:checkOfflinePay')")
+ @ApiOperation("确认线下缴费")
+ @PostMapping("checkOfflinePay")
+ public R checkOfflinePay(@Validated @RequestBody OfflinePayCheckDto dto){
+ tBillService.checkOfflinePay(dto);
+ 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