Merge remote-tracking branch 'origin/master'

yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java

@@ -413,8 +413,11 @@ public class MyOrderController {
 
         Order order = orderService.getOrderByOrderNumberAndUserId(orderNumber, userId, true);
 
-        if (!Objects.equals(order.getHbOrderStatus(), OrderStatus.SUCCESS.value()) && !Objects.equals(order.getHbOrderStatus(), OrderStatus.CLOSE.value())) {
-            throw new GlobalException("订单未完成或未关闭，无法删除订单");
+//        if (!Objects.equals(order.getHbOrderStatus(), OrderStatus.SUCCESS.value()) && !Objects.equals(order.getHbOrderStatus(), OrderStatus.CLOSE.value())) {
+//            throw new GlobalException("订单未完成或未关闭，无法删除订单");
+//        }
+        if (!Objects.equals(order.getHbOrderStatus(), OrderStatus.CLOSE.value())) {
+            throw new GlobalException("订单未取消，无法删除订单");
         }
 
         // 删除订单