From a065b98bea77552f4b7037dc8f74f8c25b0bbb3d Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期日, 29 九月 2024 16:06:41 +0800
Subject: [PATCH] add:返回操作时间
---
src/main/java/com/mzl/flower/web/payment/OrderController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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..16ed168 100644
--- a/src/main/java/com/mzl/flower/web/payment/OrderController.java
+++ b/src/main/java/com/mzl/flower/web/payment/OrderController.java
@@ -5,9 +5,9 @@
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;
@@ -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,6 +163,13 @@
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"),
@@ -174,4 +181,11 @@
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);
+ }
+
}
--
Gitblit v1.9.3