From 9bb9952db0b22034b4aea1f486df827d77a03031 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 17 十月 2024 14:41:35 +0800
Subject: [PATCH] add:销售合计统计运费+打包费;售后扣平台款字段，增加增加统计售后“打包运费（散户）”字段
---
src/main/java/com/mzl/flower/web/payment/SalesController.java | 12 ++++++++++--
1 files changed, 10 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 747a231..597b9ad 100644
--- a/src/main/java/com/mzl/flower/web/payment/SalesController.java
+++ b/src/main/java/com/mzl/flower/web/payment/SalesController.java
@@ -22,7 +22,9 @@
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@@ -51,6 +53,12 @@
return returnData(R.SUCCESS.getCode(), salesService.selectSalesList(page, dto));
}
+ @GetMapping({"/list/export"})
+ @ApiOperation(value = "售后列表导出")
+ public void exportSales(HttpServletResponse response, OrderItemSalesQueryDTO dto){
+ salesService.exportSalesList(response, dto);
+ }
+
@GetMapping("/list/view")
@ApiOperation(value = "售后详情")
@ApiImplicitParams({
@@ -62,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);
@@ -70,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