From 5ebdb1610c835afe1fcc2fc5e97b6cb6c0f92fa6 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Tue, 5 Nov 2024 17:15:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BA=97=E9=93=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=9C=B8=E7=8E=8B=E9=A4=90=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/entity/TbFreeDineConfig.java |  6 +++---
 .../system/cashierservice/service/ProductService.java  | 10 +++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbFreeDineConfig.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbFreeDineConfig.java
index 38d8bc3..9ca87e6 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbFreeDineConfig.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbFreeDineConfig.java
@@ -17,7 +17,7 @@ import lombok.Data;
 @Data
 public class TbFreeDineConfig implements Serializable {
     /**
-     * 
+     *
      */
     @TableId(type = IdType.AUTO)
     private Integer id;
@@ -25,7 +25,7 @@ public class TbFreeDineConfig implements Serializable {
     /**
      * 是否启用
      */
-    private Integer enable;
+    private Integer enable = 0;
 
     /**
      * 充值多少倍免单
@@ -147,4 +147,4 @@ public class TbFreeDineConfig implements Serializable {
         sb.append("]");
         return sb.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
index 71be3ca..0fe39c3 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -107,9 +107,11 @@ public class ProductService {
     private RedisUtil redisUtil;
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
+    private final TbFreeDineConfigService freeDineConfigService;
 
-    public ProductService(ShopUtils shopUtils) {
+    public ProductService(ShopUtils shopUtils, TbFreeDineConfigService freeDineConfigService) {
         this.shopUtils = shopUtils;
+        this.freeDineConfigService = freeDineConfigService;
     }
 
     private TbOrderInfo getCurrentOrder(ShopEatTypeInfoDTO eatTypeInfoDTO, String tableId, Object shopId) {
@@ -167,6 +169,12 @@ public class ProductService {
         concurrentMap.put("storeInfo", shopInfo);
         concurrentMap.put("distance", distance);
         TbShopUser shopUser = tbShopUserMapper.selectByUserIdAndShopId(userId, shopId != null ? shopId.toString() : tbShopTable.getShopId().toString());
+        TbFreeDineConfig freeDineConfig = freeDineConfigService.getOne(new LambdaQueryWrapper<TbFreeDineConfig>()
+                .eq(TbFreeDineConfig::getShopId, shopId));
+        if (freeDineConfig == null) {
+            freeDineConfig = new TbFreeDineConfig();
+        }
+        concurrentMap.put("freeDingConfig", freeDineConfig);
         try {
             if (ObjectUtil.isEmpty(shopUser)) {
                 TbUserInfo tbUserInfo = tbUserInfoMapper.selectByPrimaryKey(Integer.valueOf(userId));