修改判断状态

6cc4cbc2 · 刘继明 · bccef8be · 6cc4cbc2
Commit 6cc4cbc2 authored Aug 23, 2021 by 刘继明
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
+9 -2

No files found.
--- a/order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
+++ b/order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
@@ -483,8 +483,15 @@ public class OrderVerifyHandle {
            return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
        }
        //校验订单配送状态
-        if (DeliveryStatus.DELIVERYCANCEL.getCode()!=orderBean.getDeliverStatus()){
+        DeliveryStatus deliveryStatus= DeliveryStatus.getDeliveryStatusByCode(orderBean.getDeliverStatus());
-            return ResponseUtil.error(ResponseResult.ORDER_STATUS_FAILED);
+        switch (deliveryStatus) {
+            case ALLOTRIDER:
+            case RIDERARRIVESTORE:
+            case RIDERGETMEAL:
+            case DELIVERYARRIVED:
+                return ResponseUtil.error(ResponseResult.ORDER_STATUS_FAILED);
+            default:
+                break;
        }
        return ResponseUtil.success();