From 5ff8fb8bd9d298def47437b24e77c8879cdc37d2 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 14 十一月 2024 09:36:39 +0800
Subject: [PATCH] 1.定时任务-待付款-15分钟 2.领券中心：根据领取次数判断是否已领取 3.付款：优惠券自动领取最大优惠券
---
src/main/java/com/mzl/flower/web/supplier/DeliverySupplierController.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 8aca450..7a0926b 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));
}
@@ -111,6 +118,12 @@
return returnData(R.SUCCESS.getCode(), deliveryOrderService.getSupplierDeliveryOrderItems(dto));
}
+ @PostMapping("/list/items/views/new")
+ @ApiOperation(value = "获取商品详情列表-使用订单商品id")
+ public ResponseEntity<ReturnDataDTO<List<DeliveryOrderItemDTO>>> getSupplierDeliveryOrderItemsByItemId(@RequestBody PostQueryDTO dto){
+ return returnData(R.SUCCESS.getCode(), deliveryOrderService.getSupplierDeliveryOrderItemsByItemId(dto));
+ }
+
@PostMapping("/list/arrive")
@ApiOperation(value = "确认入位")
public ResponseEntity<ReturnDataDTO> arrived(@RequestBody DeliveryOrderArriveDTO dto) {
--
Gitblit v1.9.3