From 05a7470c6fa0b2e55df71649fab8d5a8df884460 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Mon, 28 Oct 2024 09:17:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=9C=B8=E7=8E=8B=E9=A4=90=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/TableConstant.java               | 34 +++++++++++++++++++
 .../cashierservice/entity/TbOrderInfo.java    |  5 +++
 .../cashierservice/service/PayService.java    |  2 +-
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/constant/TableConstant.java b/src/main/java/com/chaozhanggui/system/cashierservice/constant/TableConstant.java
index a9a70a7..9b2221a 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/constant/TableConstant.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/constant/TableConstant.java
@@ -1,5 +1,6 @@
 package com.chaozhanggui.system.cashierservice.constant;
 
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
 public interface TableConstant {
@@ -28,6 +29,39 @@ public interface TableConstant {
                 this.value = value;
             }
         }
+
+        @Getter
+        public enum UseType {
+            TAKEOUT("takeout"),
+            DINE_IN_AFTER("dine-in-after"),
+            DINE_IN_BEFORE("dine-in-before");
+            private final String value;
+
+            UseType(String value) {
+                this.value = value;
+            }
+
+            public boolean equalsVals(String value) {
+                return this.value.equals(value);
+            }
+        }
+    }
+
+    class ShopInfo {
+        @Getter
+        public enum EatModel {
+            TAKEOUT("takeout"),
+            DINE_IN("dine-in");
+            private final String value;
+
+            EatModel(String value) {
+                this.value = value;
+            }
+
+            public boolean equalsVals(String value) {
+                return this.value.equals(value);
+            }
+        }
     }
 
 
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java
index a695431..80f5add 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java
@@ -3,6 +3,7 @@ package com.chaozhanggui.system.cashierservice.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.chaozhanggui.system.cashierservice.constant.TableConstant;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -214,4 +215,8 @@ public class TbOrderInfo implements Serializable {
         this.createdAt = System.currentTimeMillis();
         this.isAccepted = 1;
     }
+
+    public String getEatModel() {
+        return TableConstant.OrderInfo.UseType.TAKEOUT.equalsVals(this.getUseType()) ? TableConstant.ShopInfo.EatModel.TAKEOUT.getValue() : TableConstant.ShopInfo.EatModel.DINE_IN.getValue();
+    }
 }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index 0b4083d..2815df7 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -405,7 +405,7 @@ public class PayService {
         }
 
         // 校验就餐模式是否满足
-        if (!freeDineConfig.getUseType().contains(orderInfo.getUseType())) {
+        if (!freeDineConfig.getUseType().contains(orderInfo.getEatModel())) {
             throw new MsgException("当前店铺未开启此就餐模式霸王餐");
         }
         BigDecimal shouldPayAmount = orderInfo.getOriginAmount().multiply(BigDecimal.valueOf(freeDineConfig.getRechargeTimes()));