From dc885d07f9f62c60ac90dbd0c44c5fdbb0b00486 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 31 十二月 2024 10:30:36 +0800
Subject: [PATCH] 1.微信登录-用户不存在新注册用户，昵称没有解决
---
src/main/java/com/mzl/flower/web/payment/SalesController.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 ad5bf04..597b9ad 100644
--- a/src/main/java/com/mzl/flower/web/payment/SalesController.java
+++ b/src/main/java/com/mzl/flower/web/payment/SalesController.java
@@ -8,7 +8,8 @@
import com.mzl.flower.constant.Constants;
import com.mzl.flower.dto.request.payment.*;
import com.mzl.flower.dto.response.payment.OrderItemSalesNewDTO;
-import com.mzl.flower.dto.response.payment.OrderSalesListDTO;
+import com.mzl.flower.dto.response.payment.OrderItemSalesNewListDTO;
+import com.mzl.flower.dto.response.payment.OrderStatusCountDTO;
import com.mzl.flower.entity.payment.OrderItem;
import com.mzl.flower.service.payment.OrderItemSalesService;
import com.mzl.flower.service.payment.OrderItemSettlementService;
@@ -21,6 +22,10 @@
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
@RequestMapping("/api/sales")
@@ -35,11 +40,23 @@
@Autowired
private OrderItemSettlementService orderItemSettlementService;
+ @GetMapping("/status/count")
+ @ApiOperation(value = "获取状态数量")
+ public ResponseEntity<ReturnDataDTO<List<OrderStatusCountDTO>>> getSalesStatusCount(OrderItemSalesQueryDTO dto){
+ return returnData(R.SUCCESS.getCode(), salesService.getSalesStatusCount(dto));
+ }
+
@GetMapping("/list")
@ApiOperation(value = "查询售后列表")
- public ResponseEntity<ReturnDataDTO<Page<OrderSalesListDTO>>> selectSalesList(Page page
+ public ResponseEntity<ReturnDataDTO<Page<OrderItemSalesNewListDTO>>> selectSalesList(Page page
, OrderItemSalesQueryDTO dto){
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")
@@ -53,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);
@@ -61,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