From ea025bd023a6755f2988b1f0654568bf83e4940c Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Mon, 28 Oct 2024 09:48:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20memberIn=E5=A2=9E=E5=8A=A0=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E7=B1=BB=E5=9E=8Btype?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/TableConstant.java               | 19 +++++++++++++++++++
 .../cashierservice/entity/TbMemberIn.java     |  2 ++
 .../cashierservice/service/PayService.java    |  6 ++++--
 3 files changed, 25 insertions(+), 2 deletions(-)

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 9b2221a..e364625 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/constant/TableConstant.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/constant/TableConstant.java
@@ -3,6 +3,8 @@ package com.chaozhanggui.system.cashierservice.constant;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
+import java.util.Objects;
+
 public interface TableConstant {
     String CART_SEAT_ID = "-999";
 
@@ -64,5 +66,22 @@ public interface TableConstant {
         }
     }
 
+    class MemberIn {
+        @Getter
+        public enum Type {
+            NORMAL(0),
+            FREE_DINE(1);
+            private final Integer value;
+
+            Type(Integer value) {
+                this.value = value;
+            }
+
+            public boolean equalsVals(Integer value) {
+                return Objects.equals(this.value, value);
+            }
+        }
+    }
+
 
 }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbMemberIn.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbMemberIn.java
index 59bfa55..9ca7508 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbMemberIn.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbMemberIn.java
@@ -32,6 +32,8 @@ public class TbMemberIn implements Serializable {
 
     private Integer orderId;
 
+    private Integer type;
+
     private static final long serialVersionUID = 1L;
 
 
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 8370242..0da8b10 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -1027,16 +1027,18 @@ public class PayService {
 
         // 霸王餐活动充值
         BigDecimal payAmount;
+        TbMemberIn memberIn = new TbMemberIn();
         if (memberInDTO.getOrderId() != null) {
             payAmount = getFreeDineOrderInfo(memberInDTO);
-
+            memberIn.setType(TableConstant.MemberIn.Type.FREE_DINE.getValue());
             // 会员充值
         }else {
             payAmount = memberInDTO.getAmount().setScale(2, RoundingMode.DOWN);
+            memberIn.setType(TableConstant.MemberIn.Type.NORMAL.getValue());
+
         }
 
 
-        TbMemberIn memberIn = new TbMemberIn();
         memberIn.setAmount(payAmount);
         memberIn.setUserId(Integer.valueOf(tbShopUser.getUserId()));
         memberIn.setCode(tbShopUser.getCode());