From 2e1039b373bf2ad12f44e5fda0574cfd053b08ae Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 21 四月 2025 10:42:06 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 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 de6f98f..77d559d 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
@@ -5,21 +5,13 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.dto.BillStatisticsDto;
-import com.ruoyi.system.dto.CachPayDto;
-import com.ruoyi.system.dto.OfflinePayCheckDto;
-import com.ruoyi.system.dto.SmsByBillDto;
-import com.ruoyi.system.dto.TBillDto;
-import com.ruoyi.system.dto.TbillSaveDto;
+import com.ruoyi.system.dto.*;
import com.ruoyi.system.model.TBillConfirm;
import com.ruoyi.system.model.TBillDetail;
import com.ruoyi.system.model.TContract;
import com.ruoyi.system.query.TBillQuery;
import com.ruoyi.system.query.TContractQuery;
-import com.ruoyi.system.service.TBillConfirmService;
-import com.ruoyi.system.service.TBillDetailService;
-import com.ruoyi.system.service.TBillService;
-import com.ruoyi.system.service.TContractService;
+import com.ruoyi.system.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +24,8 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Objects;
@@ -59,6 +53,8 @@
@Autowired
TContractService contractService;
+ @Autowired
+ TPayOrderService tPayOrderService;
@PreAuthorize("@ss.hasPermi('bill:list')")
@PostMapping("list")
@@ -67,6 +63,14 @@
query.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
PageInfo<TBillDto> pageInfo = tBillService.queryPage(query);
return R.ok(pageInfo);
+ }
+
+ @ApiOperation("统计")
+ @PostMapping("statistics")
+ public R<BillStatisticsDto> statistics(@RequestBody TBillQuery query){
+ query.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
+ BillStatisticsDto dto = tBillService.statistics(query);
+ return R.ok(dto);
}
@@ -90,6 +94,22 @@
}
bill.setBusinessDeptId(businessDeptId);
tBillService.saveBill(bill);
+ return R.ok();
+ }
+
+
+ @PreAuthorize("@ss.hasPermi('bill:list:editAmount')")
+ @PostMapping("editAmount")
+ @ApiOperation("修改账单金额")
+ public R editAmount(@Validated @RequestBody TbillSaveDto bill){
+ if (StringUtils.isEmpty(bill.getId())){
+ return R.fail("参数错误");
+ }
+ if (bill.getEditAmount().compareTo(BigDecimal.ZERO)==0){
+ return R.fail("调整金额不能为0");
+ }
+
+ tBillService.editAmount(bill);
return R.ok();
}
@@ -152,11 +172,11 @@
}
- @ApiOperation("统计")
- @GetMapping("statistics")
- public R<BillStatisticsDto> statistics(){
- BillStatisticsDto dto = tBillService.statistics(SecurityUtils.getBusinessDeptId());
- return R.ok(dto);
+ @ApiOperation(value = "创建支付订单、二维码支付")
+ @PostMapping("makeOrder")
+ public R<MakeOrderResp> makeOrder(@Validated @RequestBody MakeOrderDto dto){
+ MakeOrderResp resp = tPayOrderService.makeOrder(dto);
+ return R.ok(resp);
}
--
Gitblit v1.7.1