From 02be5222b503d96162c02e7c85e174cfb633467a Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Mon, 26 Aug 2024 13:33:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?=
 =?UTF-8?q?=E5=8F=B0=E6=A1=8C=E6=9C=80=E6=96=B0=E8=AE=A2=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/dao/TbShopTableMapper.java      | 2 +-
 .../system/cashierservice/service/OrderService.java       | 6 ++++++
 .../system/cashierservice/service/ShopInfoService.java    | 2 +-
 src/main/resources/mapper/TbShopTableMapper.xml           | 8 ++++----
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopTableMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopTableMapper.java
index 7236d11..4e3beae 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopTableMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopTableMapper.java
@@ -24,5 +24,5 @@ public interface TbShopTableMapper {
     int updateByPrimaryKey(TbShopTable record);
 
     List<TbShopTable> selectByShopIdAndStatus(@Param("shopId") String shopId,@Param("areaId") String areaId,@Param("status") String status);
-    List<TbShopTableVO> selectTableInfo(@Param("shopId") String shopId, @Param("areaId") String areaId, @Param("status") String status);
+    List<TbShopTableVO> selectTableInfo(@Param("shopId") String shopId, @Param("areaId") String areaId, @Param("status") String status, @Param("day") String day);
 }
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 d45ce1b..e911861 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -682,6 +682,12 @@ public class OrderService {
             }
         }
 
+        if (!StrUtil.isBlank(orderVo.getTableId())) {
+            mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>()
+                    .eq(TbShopTable::getQrcode, orderInfo.getTableId())
+                    .set(TbShopTable::getStatus, TableStateEnum.USING.getState()));
+        }
+
         JSONObject object=new JSONObject();
         String outNumber= redisUtil.getMessage(RedisCst.OUT_NUMBER.concat(orderInfo.getShopId().toString()));
         Integer number=1;
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java
index 87ba556..f733984 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java
@@ -55,7 +55,7 @@ public class ShopInfoService {
 
         PageHelperUtil.startPage(page, pageSize);
 //        List<TbShopTable>  shopTables=tbShopTableMapper.selectByShopIdAndStatus(shopId,areaId,status);
-        List<TbShopTableVO> tbShopTableVOList = tbShopTableMapper.selectTableInfo(shopId, areaId, status);
+        List<TbShopTableVO> tbShopTableVOList = tbShopTableMapper.selectTableInfo(shopId, areaId, status, DateUtils.getDay());
         PageInfo pageInfo=new PageInfo(tbShopTableVOList);
 
         return Result.success(CodeEnum.SUCCESS,pageInfo);
diff --git a/src/main/resources/mapper/TbShopTableMapper.xml b/src/main/resources/mapper/TbShopTableMapper.xml
index 5b5b16c..4134f17 100644
--- a/src/main/resources/mapper/TbShopTableMapper.xml
+++ b/src/main/resources/mapper/TbShopTableMapper.xml
@@ -230,9 +230,9 @@
     </select>
   <select id="selectTableInfo" resultType="com.chaozhanggui.system.cashierservice.entity.vo.TbShopTableVO">
     select a.*, b.user_id, c.master_id, c.id as orderId, c.order_no as orderNo, c.amount as orderAmount from tb_shop_table a
-    left join tb_order_info b on a.qrcode=b.table_id and (b.`status`='unpaid' or b.`status`='paying') and b.user_id is not null and b.shop_id=#{shopId}
-    left join tb_order_info c on a.qrcode=c.table_id and (c.`status`='unpaid' or c.`status`='paying') and c.master_id is not null and c.shop_id=#{shopId}
-    where a.shop_id=#{shopId}
+    left join tb_order_info b on a.qrcode=b.table_id and (b.`status`='unpaid') and b.user_id is not null and b.shop_id=#{shopId}
+    left join tb_order_info c on a.qrcode=c.table_id and (c.`status`='unpaid') and c.master_id is not null and c.shop_id=#{shopId}
+    where a.shop_id=#{shopId} and b.trade_day=#{day}
     <if test="areaId != null and areaId !=''">
       and a.area_id = #{areaId}
     </if>
@@ -241,7 +241,7 @@
     <if test="status != null and status !=''">
       and a.status = #{status}
     </if>
-    GROUP BY a.id
+    GROUP BY a.qrcode
     order by a.`sort` asc
   </select>
 </mapper>