From ac70afa4e394626dc03d82def3df1db886bb7c2e Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 12 九月 2024 14:43:59 +0800
Subject: [PATCH] 1.活动优惠券-管理端-类型是首页领取的活动优惠券，发布的时候将已经发布的设置为下架，只能留有一个已发布的优惠券 3.活动优惠券-小程序-新增首页弹窗优惠券-如果领取数量没有超过当前优惠券还可以再次领取，超过领取优惠券的话则不返回数据

---
 src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 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 9b635a2..b176677 100644
--- a/src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java
+++ b/src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java
@@ -136,6 +136,14 @@
     @ApiOperation(value = "查询集货站供应商配送列表")
     public ResponseEntity<ReturnDataDTO<Page<DeliveryOrderList4CheckDTO>>> selectSupplierDoList4Check(Page page
             , DeliveryOrderStationQueryDTO dto){
+        LocalDate localDate = deliveryOrderService.parseLocalDate(dto.getDate());
+        if(localDate != null){
+            LocalDateTime end = localDate.atTime(17, 0, 0);
+            LocalDateTime begin = end.plusDays(-1);
+            dto.setStartDate(begin);
+            dto.setEndDate(end);
+        }
+
         return returnData(R.SUCCESS.getCode(), deliveryOrderService.selectSupplierDoList4Check(page, dto));
     }
 
@@ -179,6 +187,14 @@
     @ApiOperation(value = "查询供应商配送单列表")
     public ResponseEntity<ReturnDataDTO<Page<DeliveryOrder4CheckDTO>>> selectSupplierDoInfo4Check(Page page
             , DeliveryOrderInfoSpQueryDTO dto){
+        LocalDate localDate = deliveryOrderService.parseLocalDate(dto.getDate());
+        if(localDate != null){
+            LocalDateTime end = localDate.atTime(17, 0, 0);
+            LocalDateTime begin = end.plusDays(-1);
+            dto.setStartDate(begin);
+            dto.setEndDate(end);
+        }
+
         return returnData(R.SUCCESS.getCode(), deliveryOrderService.selectSupplierDoInfo4Check(page, dto));
     }
 
@@ -242,7 +258,8 @@
     @ApiOperation(value = "降级操作")
     public ResponseEntity<ReturnDataDTO> doReduceCheck(@RequestBody OrderItemCheckCommitReduceDTO dto) {
         deliveryOrderService.doReduceCheck(dto);
-        deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
+        String orderId = deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
+        deliveryOrderService.checkOrderStatus(orderId);
         return returnData(R.SUCCESS.getCode(), null);
     }
 
@@ -251,7 +268,8 @@
     public ResponseEntity<ReturnDataDTO> doReplaceCheck(@RequestBody OrderItemCheckCommitDTO dto) {
         dto.setType(Constants.CHECK_TYPE.replace.name());
         deliveryOrderService.doCheck(dto, null, null, null);
-        deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
+        String orderId = deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
+        deliveryOrderService.checkOrderStatus(orderId);
         return returnData(R.SUCCESS.getCode(), null);
     }
 
@@ -260,7 +278,8 @@
     public ResponseEntity<ReturnDataDTO> doLackCheck(@RequestBody OrderItemCheckCommitDTO dto) {
         dto.setType(Constants.CHECK_TYPE.lack.name());
         deliveryOrderService.doCheck(dto, null, null, null);
-        deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
+        String orderId = deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
+        deliveryOrderService.checkOrderStatus(orderId);
         return returnData(R.SUCCESS.getCode(), null);
     }
 
@@ -268,7 +287,8 @@
     @ApiOperation(value = "删除降级信息")
     public ResponseEntity<ReturnDataDTO> deleteReduce(String orderItemId){
         deliveryOrderService.deleteCheckInfo(orderItemId, Constants.CHECK_TYPE.reduce.name());
-        deliveryOrderService.checkOrderItemStatus(orderItemId);
+        String orderId = deliveryOrderService.checkOrderItemStatus(orderItemId);
+        deliveryOrderService.checkOrderStatus(orderId);
         return returnData(R.SUCCESS.getCode(), null);
     }
 
@@ -276,7 +296,8 @@
     @ApiOperation(value = "删除补货信息")
     public ResponseEntity<ReturnDataDTO> deleteReplace(String orderItemId){
         deliveryOrderService.deleteCheckInfo(orderItemId, Constants.CHECK_TYPE.replace.name());
-        deliveryOrderService.checkOrderItemStatus(orderItemId);
+        String orderId = deliveryOrderService.checkOrderItemStatus(orderItemId);
+        deliveryOrderService.checkOrderStatus(orderId);
         return returnData(R.SUCCESS.getCode(), null);
     }
 
@@ -284,7 +305,8 @@
     @ApiOperation(value = "删除缺货信息")
     public ResponseEntity<ReturnDataDTO> deleteLack(String orderItemId){
         deliveryOrderService.deleteCheckInfo(orderItemId, Constants.CHECK_TYPE.lack.name());
-        deliveryOrderService.checkOrderItemStatus(orderItemId);
+        String orderId = deliveryOrderService.checkOrderItemStatus(orderItemId);
+        deliveryOrderService.checkOrderStatus(orderId);
         return returnData(R.SUCCESS.getCode(), null);
     }
 
@@ -292,6 +314,8 @@
     @ApiOperation(value = "完成商品质检")
     public ResponseEntity<ReturnDataDTO> setCheckOk(String orderItemId){
         deliveryOrderService.setCheckOk(orderItemId);
+        String orderId = deliveryOrderService.checkOrderItemStatus(orderItemId);
+        deliveryOrderService.checkOrderStatus(orderId);
         return returnData(R.SUCCESS.getCode(), null);
     }
 

--
Gitblit v1.9.3