Merge remote-tracking branch 'origin/master'

xuhy

2025-03-06 c48ecad4633a6624fec92e42ecd9eeca488a636c

 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,17 +111,21 @@



    @PreAuthorize("@ss.hasPermi('system:bill:cashPay')")
    @PreAuthorize("@ss.hasPermi('bill:list:receipt')")
    @ApiOperation("收款")
    @PostMapping("cashPay")
    public R cashPay(@RequestBody CachPayDto cachPayDto){
        tBillService.cashPay(cachPayDto);
        return null;
        return R.ok();
    }




    @ApiOperation("统计")
    @GetMapping("statistics")
    public R<BillStatisticsDto> statistics(){
        BillStatisticsDto dto = tBillService.statistics();
        return R.ok(dto);
    }