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

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

@@ -571,13 +571,10 @@ public class OrderVerifyHandle {
             return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
         }
         //校验订单状态
-        if (OrderStatus.DISTRIBUTION.getCode()!=orderBean.getStatus()){
-            return ResponseUtil.error(ResponseResult.ORDER_STATUS_FAILED);
-        }
-        //校验订单配送状态
-        if (DeliveryStatus.DELIVERYCANCEL.getCode()!=orderBean.getDeliverStatus()){
+        if (!checkOrderState(orderBean)) {
             return ResponseUtil.error(ResponseResult.ORDER_STATUS_FAILED);
         }
+
         DeliveryStatus deliveryStatus= DeliveryStatus.getDeliveryStatusByCode(orderBean.getDeliverStatus());
         switch (deliveryStatus) {
             case RIDERARRIVESTORE:
@@ -593,6 +590,17 @@ public class OrderVerifyHandle {
     }
 
     /**
+     * 教研订单状态
+     * @param orderBean
+     * @return
+     */
+    private boolean checkOrderState(QueryOrdersResponse.DataBean.OrderBean orderBean) {
+        //校验订单状态
+        return OrderStatus.DISTRIBUTION.getCode().equals(orderBean.getStatus()) || OrderStatus.RECEIPT.getCode().equals(orderBean.getStatus())||
+                OrderStatus.COMPLETE_MAKE.getCode().equals(orderBean.getStatus());
+    }
+
+    /**
      * 是否是外卖
      *
      * @param orderBean