Merge branch 'feature/20210629-骑手未配送前支持手动取消-liujiming' into qa

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

@@ -534,8 +534,15 @@ public class OrderVerifyHandle {
             return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
         }
         //校验订单配送状态
-        if (DeliveryStatus.DELIVERYCANCEL.getCode()!=orderBean.getDeliverStatus()){
-            return ResponseUtil.error(ResponseResult.ORDER_STATUS_FAILED);
+        DeliveryStatus deliveryStatus= DeliveryStatus.getDeliveryStatusByCode(orderBean.getDeliverStatus());
+        switch (deliveryStatus) {
+            case ALLOTRIDER:
+            case RIDERARRIVESTORE:
+            case RIDERGETMEAL:
+            case DELIVERYARRIVED:
+                return ResponseUtil.error(ResponseResult.ORDER_STATUS_FAILED);
+            default:
+                break;
         }
 
         return ResponseUtil.success();