From 331c41ca7f21b81985ba23d60ec05c350d21daa8 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期六, 21 十二月 2024 14:59:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
index 54010dd..8194b14 100644
--- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -716,7 +716,8 @@
}
if(!Constants.ORDER_STATUS_BACKEND.COLLECTION.name().equals(o.getStatusBackend())
- && !Constants.ORDER_STATUS_BACKEND.SEND.name().equals(o.getStatusBackend())){
+ && !Constants.ORDER_STATUS_BACKEND.SEND.name().equals(o.getStatusBackend())
+ ){
throw new ValidationException("订单状态异常，不可提交质检记录");
}
--
Gitblit v1.9.3