From 6d2ec1b3b6979bce9c8f9244c8a17f5ccfa67063 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 26 十二月 2024 17:21:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/web/payment/SalesController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/payment/SalesController.java b/src/main/java/com/mzl/flower/web/payment/SalesController.java
index 32cac36..597b9ad 100644
--- a/src/main/java/com/mzl/flower/web/payment/SalesController.java
+++ b/src/main/java/com/mzl/flower/web/payment/SalesController.java
@@ -70,7 +70,7 @@
@PostMapping("/audit/agree")
@ApiOperation(value = "审核售后单-通过")
- public ResponseEntity<ReturnDataDTO> agree(@RequestBody OrderItemSalesAuditDTO dto) {
+ public ResponseEntity<ReturnDataDTO> agree(@RequestBody OrderItemSalesAuditDTO dto) throws Exception {
OrderItem oi = salesService.doAudit(dto, Constants.ORDER_SALES_STATUS.AGREED.name());
orderItemSettlementService.saveItemSettlementInfo(oi, SecurityUtils.getUserId(), Constants.S_TYPE.SALES);
return returnData(R.SUCCESS.getCode(), null);
@@ -78,7 +78,7 @@
@PostMapping("/audit/reject")
@ApiOperation(value = "审核售后单-拒绝")
- public ResponseEntity<ReturnDataDTO> reject(@RequestBody OrderItemSalesAuditDTO dto) {
+ public ResponseEntity<ReturnDataDTO> reject(@RequestBody OrderItemSalesAuditDTO dto) throws Exception {
salesService.doAudit(dto, Constants.ORDER_SALES_STATUS.REJECTED.name());
return returnData(R.SUCCESS.getCode(), null);
}
--
Gitblit v1.9.3