From 45ed134b1e2daa06b4708ade48efb7af78a029ea Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期一, 23 九月 2024 17:28:55 +0800
Subject: [PATCH] 花农配送 时间查询
---
src/main/java/com/mzl/flower/web/supplier/DeliverySupplierController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/supplier/DeliverySupplierController.java b/src/main/java/com/mzl/flower/web/supplier/DeliverySupplierController.java
index 53549bb..b305f77 100644
--- a/src/main/java/com/mzl/flower/web/supplier/DeliverySupplierController.java
+++ b/src/main/java/com/mzl/flower/web/supplier/DeliverySupplierController.java
@@ -39,6 +39,13 @@
@ApiOperation(value = "获取配送单列表")
public ResponseEntity<ReturnDataDTO<Page<DeliveryOrderListDTO>>> selectOrderList(Page page
, DeliveryOrderQueryDTO dto){
+ LocalDate localDate = deliveryOrderService.parseLocalDate(dto.getDate());
+ if(localDate != null){
+ LocalDateTime endDate = localDate.atTime(17, 0, 0);
+ LocalDateTime startDate = endDate.plusDays(-1);
+ dto.setStartDate(startDate);
+ dto.setEndDate(endDate);
+ }
return returnData(R.SUCCESS.getCode(), deliveryOrderService.selectDeliveryOrderList(page, dto));
}
@@ -160,7 +167,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(), true));
}
@GetMapping("/mine/list/check/info/lack")
@@ -170,6 +177,6 @@
})
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(), true));
}
}
--
Gitblit v1.9.3