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/payment/DeliveryOrderController.java | 8 ++++----
1 files changed, 4 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 50c0a55..cfea66c 100644
--- a/src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java
+++ b/src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java
@@ -271,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")
@@ -294,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);
@@ -304,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