From d2e1174646a32ccab58c1399ffc3563411b44365 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Tue, 29 Oct 2024 17:21:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/bean/constant/TableConstant.java  | 2 +-
 .../system/cashierservice/service/OrderService.java         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/bean/constant/TableConstant.java b/src/main/java/com/chaozhanggui/system/cashierservice/bean/constant/TableConstant.java
index b601c14..db9c488 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/bean/constant/TableConstant.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/bean/constant/TableConstant.java
@@ -10,7 +10,7 @@ public interface TableConstant {
     @Getter
     enum Status {
         REFUNDING("refunding"), REFUND("refund"), CLOSED("closed"), CREATE("create"),
-        UNPAID("unpaid"), PAYING("paying"), RETURN("return"), CANCEL("cancel");
+        UNPAID("unpaid"), PAYING("paying"), RETURN("return"), CANCELLED("cancelled");
         private final String value;
         Status(String value) {
             this.value = value;
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index 981433b..a1edea4 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -518,10 +518,10 @@ public class OrderService {
         // 检查购物车商品是否已经全部退款
         if (!returnCashierCarts.isEmpty() && returnCashierCarts.size() == list.size()) {
             List<Integer> cartIds = returnCashierCarts.stream().map(TbCashierCart::getId).collect(Collectors.toList());
-            mpCashierCartService.updateStateByIds(Integer.valueOf(shopId), cartIds, TableConstant.Status.CANCEL);
-            mpOrderDetailService.updateStateByCartIds(Integer.valueOf(shopId), cartIds, TableConstant.Status.CANCEL);
+            mpCashierCartService.updateStateByIds(Integer.valueOf(shopId), cartIds, TableConstant.Status.CLOSED);
+            mpOrderDetailService.updateStateByCartIds(Integer.valueOf(shopId), cartIds, TableConstant.Status.CLOSED);
             if (StrUtil.isNotBlank(orderId)) {
-                mpOrderInfoService.updateStateById(Integer.valueOf(shopId), Integer.valueOf(orderId), TableConstant.Status.CANCEL);
+                mpOrderInfoService.updateStateById(Integer.valueOf(shopId), Integer.valueOf(orderId), TableConstant.Status.CANCELLED);
             }
 
             String finalMasterId = masterId;