From 804c06cd4bde54ae550c451f85e482a15a4d997f Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 1 Dec 2025 16:51:22 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/KitchenDetailMapper.xml | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml b/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml
index b77269d76..08b446688 100644
--- a/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml
+++ b/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml
@@ -100,7 +100,16 @@
AND `table`.`table_code` is null
- GROUP BY `order`.id, detail.product_id, detail.sku_id, detail.place_num
+ GROUP BY `order`.id, detail.product_id, detail.sku_id, detail.id
+ ORDER BY
+ CASE detail.sub_status
+ WHEN 'READY_TO_SERVE' THEN 1
+ WHEN 'PENDING_PREP' THEN 2
+ WHEN 'SENT_OUT' THEN 3
+ WHEN 'DELIVERED' THEN 4
+ ELSE 5
+ END ASC,
+ CASE WHEN detail.sub_status = 'READY_TO_SERVE' THEN detail.start_order_time END ASC
From 70f18403e4dc2301c0316b2ffe1a8e195183a7e2 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 1 Dec 2025 17:01:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=B2=E5=88=B0=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/admin/BkContactListController.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/BkContactListController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/BkContactListController.java
index 6beaaaca6..ff9c80bd6 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/BkContactListController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/BkContactListController.java
@@ -21,7 +21,7 @@ import java.util.Set;
/**
- * 预约端-联系人列表
+ * 预约端
*
* @author ww
* @description
@@ -96,6 +96,18 @@ public class BkContactListController {
bkOrderService.upStatus(StpKit.USER.getShopId(), "已取消", bkOrder.getId(), bkOrder.getCancelReason());
return CzgResult.success();
}
+
+
+ /**
+ * 预约端-预约单：已到店
+ */
+// @SaAdminCheckPermission(value = "bk:bkOrder:storeArrival", name = "预约端-预约单：已到店")
+ @PostMapping("/bkOrder/storeArrival")
+ public CzgResult storeArrival(@RequestBody BkOrderDTO bkOrder) {
+ AssertUtil.isNull(bkOrder.getId(), "已到店的预约单id不能为空");
+ bkOrderService.upStatus(StpKit.USER.getShopId(), "已到店", bkOrder.getId(), "");
+ return CzgResult.success();
+ }
}
From f98241efd1018a34f146bec41e9312851bf15227 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 1 Dec 2025 17:12:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../account-service/src/main/resources/mapper/BkOrderMapper.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/cash-service/account-service/src/main/resources/mapper/BkOrderMapper.xml b/cash-service/account-service/src/main/resources/mapper/BkOrderMapper.xml
index cfb6ac62e..b637be4aa 100644
--- a/cash-service/account-service/src/main/resources/mapper/BkOrderMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/BkOrderMapper.xml
@@ -30,5 +30,6 @@
group by o.id
+ order by o.booking_time desc