From 1fad0578c97abbb7fc30f59eb1de0f23f08ddde1 Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期四, 27 三月 2025 15:21:15 +0800
Subject: [PATCH] 流水、开票营业部权限
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 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 4893b54..81ad5e9 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,10 +4,15 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.dto.*;
import com.ruoyi.system.model.TBill;
+import com.ruoyi.system.model.TBillConfirm;
import com.ruoyi.system.model.TBillDetail;
import com.ruoyi.system.query.TBillQuery;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.TBillConfirmService;
import com.ruoyi.system.service.TBillDetailService;
import com.ruoyi.system.service.TBillService;
import io.swagger.annotations.Api;
@@ -39,11 +44,14 @@
@Autowired
TBillDetailService tBillDetailService;
+ @Autowired
+ TBillConfirmService tBillConfirmService;
@PreAuthorize("@ss.hasPermi('bill:list')")
@PostMapping("list")
@ApiOperation("分页查询账单列表")
public R<PageInfo<TBillDto>> list(@RequestBody TBillQuery query){
+ query.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
PageInfo<TBillDto> pageInfo = tBillService.queryPage(query);
return R.ok(pageInfo);
}
@@ -52,13 +60,17 @@
@PostMapping("add")
@ApiOperation("新增账单")
public R<PageInfo<TBillDto>> add(@Validated @RequestBody TbillSaveDto bill){
+ bill.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
tBillService.saveBill(bill);
return R.ok();
}
@ApiOperation("通过ID查找详情")
@GetMapping("getDetailById")
- public R<TBillDto> getDetailById(@Validated @NotEmpty String id){
+ public R<TBillDto> getDetailById(@RequestParam String id){
+ if (StringUtils.isEmpty(id)){
+ return R.fail();
+ }
TBillDto dto = tBillService.getDetailByBillId(id);
if (dto.getBillType().equals("3")){
List<TBillDetail> details = tBillDetailService.getByBillId(id);
@@ -66,6 +78,10 @@
if (detail.getLiveType()==1)dto.setWater(detail); //水费
else dto.setElect(detail); //电费
}
+ }
+ if (StringUtils.isNotEmpty(dto.getConfirmId())){
+ TBillConfirm confirm = tBillConfirmService.getById(dto.getConfirmId());
+ dto.setConfirm(confirm);
}
return R.ok(dto);
}
@@ -96,14 +112,24 @@
return R.ok(failNum);
}
+
+
+
@PreAuthorize("@ss.hasPermi('bill:list:receipt')")
@ApiOperation("收款")
@PostMapping("cashPay")
- public R cashPay(@RequestBody OfflinePayDto offlinePayDto){
- return null;
+ public R cashPay(@RequestBody CachPayDto cachPayDto){
+ tBillService.cashPay(cachPayDto);
+ return R.ok();
}
+ @ApiOperation("统计")
+ @GetMapping("statistics")
+ public R<BillStatisticsDto> statistics(){
+ BillStatisticsDto dto = tBillService.statistics(SecurityUtils.getBusinessDeptId());
+ return R.ok(dto);
+ }
--
Gitblit v1.7.1