From b9c4585f61f50860b80c1a4dc42f9cbd5e01c063 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 26 九月 2024 14:02:49 +0800
Subject: [PATCH] 1.财务报表框架
---
src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java b/src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java
index d1e7b97..cfea66c 100644
--- a/src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java
+++ b/src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java
@@ -144,6 +144,12 @@
return returnData(R.SUCCESS.getCode(), deliveryOrderService.getDeliveryOrderItem(id));
}
+ @PostMapping("/list/items/views")
+ @ApiOperation(value = "获取商品详情列表")
+ public ResponseEntity<ReturnDataDTO<List<DeliveryOrderItemDTO>>> getDeliveryOrderItem(@RequestBody PostQueryDTO dto){
+ return returnData(R.SUCCESS.getCode(), deliveryOrderService.getDeliveryOrderItems(dto));
+ }
+
//////////////////////////////////////////////////////////新接口
@GetMapping("/check/list")
@ApiOperation(value = "查询集货站供应商配送列表")
@@ -265,14 +271,14 @@
@ApiOperation(value = "补货操作详情")
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("/check/info/lack")
@ApiOperation(value = "缺货操作详情")
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));
}
@PostMapping("/check/info/do/reduce")
@@ -288,7 +294,7 @@
@ApiOperation(value = "补货操作")
public ResponseEntity<ReturnDataDTO> doReplaceCheck(@RequestBody OrderItemCheckCommitDTO dto) {
dto.setType(Constants.CHECK_TYPE.replace.name());
- deliveryOrderService.doCheck(dto, null, null, null);
+ deliveryOrderService.doCheck(dto, null, null);
String orderId = deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
deliveryOrderService.checkOrderStatus(orderId);
return returnData(R.SUCCESS.getCode(), null);
@@ -298,7 +304,7 @@
@ApiOperation(value = "缺货操作")
public ResponseEntity<ReturnDataDTO> doLackCheck(@RequestBody OrderItemCheckCommitDTO dto) {
dto.setType(Constants.CHECK_TYPE.lack.name());
- deliveryOrderService.doCheck(dto, null, null, null);
+ deliveryOrderService.doCheck(dto, null, null);
String orderId = deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
deliveryOrderService.checkOrderStatus(orderId);
return returnData(R.SUCCESS.getCode(), null);
--
Gitblit v1.9.3