From cff2c0e38aaef340639312c1827a8c3a73617088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 16 Dec 2024 16:41:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B4=AD=E7=89=A9=E8=BD=A6=E8=A7=92?=
 =?UTF-8?q?=E6=A0=87=E6=95=B0=E9=87=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/TbProductMapper.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/TbProductMapper.xml b/src/main/resources/mapper/TbProductMapper.xml
index 0b03211..44f720a 100644
--- a/src/main/resources/mapper/TbProductMapper.xml
+++ b/src/main/resources/mapper/TbProductMapper.xml
@@ -537,9 +537,11 @@
       shop_id = #{shopId}
       AND product_id = #{productId}
       AND `status` = 'create'
-      AND created_at > DATE_SUB(NOW(), INTERVAL 1 DAY)
+      AND created_at > UNIX_TIMESTAMP(NOW() - INTERVAL 1 DAY) * 1000
       AND (master_id = #{masterId} OR master_id IS NULL)
-      and table_id = #{tableId}
+      <if test="table_id != null and table_id != ''">
+        and table_id = #{tableId}
+      </if>
       AND use_type = #{useType}
 	group by shop_id,product_id
   </select>