From c6908e1d2efd4f3a1fcfdb1af7f1b78156d07d91 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期三, 23 十月 2024 09:15:58 +0800
Subject: [PATCH] 统计 待发货 在售商品 待审核商品 待售后处理
---
src/main/java/com/mzl/flower/web/payment/OrderController.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/payment/OrderController.java b/src/main/java/com/mzl/flower/web/payment/OrderController.java
index a523e87..5b60475 100644
--- a/src/main/java/com/mzl/flower/web/payment/OrderController.java
+++ b/src/main/java/com/mzl/flower/web/payment/OrderController.java
@@ -5,13 +5,13 @@
import com.mzl.flower.base.R;
import com.mzl.flower.base.ReturnDataDTO;
import com.mzl.flower.constant.Constants;
+import com.mzl.flower.dto.request.payment.OrderAddressUpdateDTO;
import com.mzl.flower.dto.request.payment.OrderDeliveryNoDTO;
import com.mzl.flower.dto.request.payment.OrderQueryDTO;
-import com.mzl.flower.dto.request.payment.OrderReduceDTO;
import com.mzl.flower.dto.response.payment.*;
import com.mzl.flower.service.payment.DeliveryOrderService;
import com.mzl.flower.service.payment.OrderService;
-import com.mzl.flower.service.payment.UserPaymentV3Service;
+import com.mzl.flower.service.payment.UserPaymentSybService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -22,6 +22,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@@ -35,7 +36,7 @@
private OrderService orderService;
@Autowired
- private UserPaymentV3Service paymentV3Service;
+ private UserPaymentSybService paymentSybService;
@Autowired
private DeliveryOrderService deliveryOrderService;
@@ -51,7 +52,6 @@
public ResponseEntity<ReturnDataDTO<Page<OrderPlatformListDTO>>> selectOrderList(Page page, OrderQueryDTO dto){
return returnData(R.SUCCESS.getCode(), orderService.selectOrderPlatformList(page, dto));
}
-
@GetMapping("/list/view")
@ApiOperation(value = "订单详情")
@ApiImplicitParams({
@@ -88,7 +88,7 @@
@GetMapping("/list/abnormal/process")
@ApiOperation(value = "异常订单处理（不管有没有退款金额，建议都要处理）")
- public ResponseEntity<ReturnDataDTO> processLevelDown(String id) {
+ public ResponseEntity<ReturnDataDTO> processLevelDown(String id) throws Exception {
orderService.processAbnormalOrder(id);
return returnData(R.SUCCESS.getCode(), null);
}
@@ -109,7 +109,7 @@
})
public ResponseEntity<ReturnDataDTO<OrderItemCheckNumDTO>> getReplaceCheck(String orderItemId){
return returnData(R.SUCCESS.getCode(), deliveryOrderService.getOtherCheck(orderItemId
- , Constants.CHECK_TYPE.replace.name()));
+ , Constants.CHECK_TYPE.replace.name(), false));
}
@GetMapping("/list/check/info/lack")
@@ -119,7 +119,7 @@
})
public ResponseEntity<ReturnDataDTO<OrderItemCheckNumDTO>> getLackCheck(String orderItemId){
return returnData(R.SUCCESS.getCode(), deliveryOrderService.getOtherCheck(orderItemId
- , Constants.CHECK_TYPE.lack.name()));
+ , Constants.CHECK_TYPE.lack.name(), false));
}
@GetMapping("/list/check/info/agree")
@@ -163,15 +163,34 @@
return returnData(R.SUCCESS.getCode(), orderService.selectOrderCheckList(dto));
}
+ @PostMapping("/check/location/list")
+ @ApiOperation(value = "查询订单清单列表-按库位分商品")
+ public ResponseEntity<ReturnDataDTO<List<OrderCheckLocationListDTO>>> selectOrderCheckLocationList(
+ @RequestBody OrderQueryDTO dto){
+ return returnData(R.SUCCESS.getCode(), orderService.selectOrderCheckLocationList(dto));
+ }
+
@GetMapping(value = "/refund")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "订单id", required = true, dataType = "String", paramType = "query"),
})
@ApiOperation(value = "退款")
- public ResponseEntity<ReturnDataDTO> refundOrder(String id) {
+ public ResponseEntity<ReturnDataDTO> refundOrder(String id) throws Exception {
orderService.refundCheckAdmin(id);
- paymentV3Service.refundOrder(id);
+ paymentSybService.refundOrder(id);
return returnData(R.SUCCESS.getCode(), null);
}
+ @PostMapping("/page/update")
+ @ApiOperation(value = "订单修改", notes = "订单修改")
+ public ResponseEntity<ReturnDataDTO> operationUpdate(@Validated @RequestBody OrderAddressUpdateDTO dto) {
+ orderService.operationUpdate(dto);
+ return returnData(R.SUCCESS.getCode(),null);
+ }
+
+ @GetMapping("/list/export")
+ @ApiOperation(value = "订单导出")
+ public void exportOrderDetail(HttpServletResponse response, OrderQueryDTO queryOrderDTO) {
+ orderService.exportOrderDetail(response, queryOrderDTO);
+ }
}
--
Gitblit v1.9.3