From a44b81cbe91a7246c715378740fab41ebf72a4f0 Mon Sep 17 00:00:00 2001
From: LGH <1242479791@qq.com>
Date: Mon, 18 Nov 2019 09:47:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E9=9C=80=E8=A6=81=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yami/shop/api/controller/MyOrderController.java    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java
index 3e647ce..ca1f9b8 100644
--- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java
+++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java
@@ -16,6 +16,7 @@ import java.util.Map;
 import java.util.Objects;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yami.shop.bean.enums.OrderStatus;
 import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.bean.app.dto.*;
@@ -141,6 +142,9 @@ public class MyOrderController {
         if (!Objects.equals(order.getUserId(), userId)) {
             throw new YamiShopBindException("你没有权限获取该订单信息");
         }
+        if (!Objects.equals(order.getStatus(), OrderStatus.UNPAY.value())) {
+            throw new YamiShopBindException("订单已支付，无法取消订单");
+        }
         List<OrderItem> orderItems = orderItemService.getOrderItemsByOrderNumber(orderNumber);
         order.setOrderItems(orderItems);
         // 取消订单
@@ -166,6 +170,9 @@ public class MyOrderController {
         if (!Objects.equals(order.getUserId(), userId)) {
             throw new YamiShopBindException("你没有权限获取该订单信息");
         }
+        if (!Objects.equals(order.getStatus(), OrderStatus.CONSIGNMENT.value())) {
+            throw new YamiShopBindException("订单未发货，无法确认收货");
+        }
         List<OrderItem> orderItems = orderItemService.getOrderItemsByOrderNumber(orderNumber);
         order.setOrderItems(orderItems);
         // 确认收货
@@ -194,6 +201,9 @@ public class MyOrderController {
         if (!Objects.equals(order.getUserId(), userId)) {
             throw new YamiShopBindException("你没有权限获取该订单信息");
         }
+        if (!Objects.equals(order.getStatus(), OrderStatus.SUCCESS.value()) || !Objects.equals(order.getStatus(), OrderStatus.CLOSE.value()) ) {
+            throw new YamiShopBindException("订单未完成或未关闭，无法删除订单");
+        }
 
         // 删除订单
         orderService.deleteOrders(Arrays.asList(order));