From f489850355bae6d690b2d3e6d0627f90bde79b1d Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 06 九月 2024 18:59:51 +0800
Subject: [PATCH] 1.优惠券记录新增category查询字段 2.小程序-商品历史记录根据更新时间排序 3.优惠券-用户优惠券控制已下架的优惠券不可重新上架，及当前优惠券的已经发放的情况下不可再次下发
---
src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java | 20 ++++++++++++++------
1 files changed, 14 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..2af2b28 100644
--- a/src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java
+++ b/src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java
@@ -242,7 +242,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 +252,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 +262,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 +271,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 +280,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 +289,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 +298,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