From 5b15987762f1e062fd978a6b87cf2fe3c1e0e877 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 2 Dec 2025 10:17:00 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E7=AB=AF-=E9=A2=84?= =?UTF-8?q?=E5=AE=9A=E5=8D=95=EF=BC=9A=E6=9F=A5=E8=AF=A2=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E5=8D=95=E9=80=89=E4=B8=AD=E5=8F=B0=E6=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/controller/admin/BkContactListController.java | 11 +++++++++++ .../java/com/czg/account/service/BkOrderService.java | 9 +++++++++ .../account/service/impl/BkOrderServiceImpl.java | 5 +++++ 3 files changed, 25 insertions(+) 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 ff9c80bd6..f540911cc 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 @@ -4,6 +4,7 @@ import com.czg.account.dto.BkOrderDTO; import com.czg.account.dto.calltable.CallTablePage; import com.czg.account.entity.BkContactList; import com.czg.account.entity.BkOrder; +import com.czg.account.entity.BkOrderTable; import com.czg.account.service.BkContactListService; import com.czg.account.service.BkOrderService; import com.czg.account.vo.BkTableVO; @@ -71,6 +72,16 @@ public class BkContactListController { return CzgResult.success(tables); } + /** + * 预约端-预定单：查询预约单选中台桌 + */ +// @SaAdminCheckPermission(value = "bk:bkOrder:bookings/tables", name = "预约端-预约单：查询预约单选中的台桌") + @GetMapping("/bkOrder/bookings/tables") + public CzgResult> bookingTables(Long id) { + List tables = bkOrderService.bookingTables(StpKit.USER.getShopId(), id); + return CzgResult.success(tables); + } + /** * 预约端-预约单：预约/修改预约 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/BkOrderService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/BkOrderService.java index e0c6422ad..7fc489c88 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/BkOrderService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/BkOrderService.java @@ -1,6 +1,7 @@ package com.czg.account.service; import com.czg.account.dto.BkOrderDTO; +import com.czg.account.entity.BkOrderTable; import com.czg.account.vo.BkTableVO; import com.mybatisflex.core.service.IService; import com.czg.account.entity.BkOrder; @@ -27,6 +28,14 @@ public interface BkOrderService extends IService { */ List bookings(Long shopId, String search, LocalDate start, LocalDate end, String status); + /** + * 查询预约单的台桌列表 + * @param shopId 店铺id + * @param bkOrderId 预约单id + * @return 预约单的台桌列表 + */ + List bookingTables(Long shopId, Long bkOrderId); + /** * 预约 */ diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java index ed06cdbd5..2b22c2497 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java @@ -42,6 +42,11 @@ public class BkOrderServiceImpl extends ServiceImpl impl return mapper.bookings(shopId, search, start, end, status); } + @Override + public List bookingTables(Long shopId, Long bkOrderId) { + return tableMapper.selectListByQuery(QueryWrapper.create().eq(BkOrderTable::getBookOrderId, bkOrderId).eq(BkOrderTable::getShopId, shopId)); + } + @Override public void booking(Long shopId, BkOrderDTO bkOrder) { From 7f4776bf55d3faa4497b0cc84589cbbde107a88a Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 2 Dec 2025 10:21:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/service/order/mapper/KitchenDetailMapper.java | 2 +- .../src/main/resources/mapper/KitchenDetailMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/KitchenDetailMapper.java b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/KitchenDetailMapper.java index 73f03b1ea..825aed22d 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/KitchenDetailMapper.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/KitchenDetailMapper.java @@ -26,7 +26,7 @@ public interface KitchenDetailMapper { List getKitchenTableFoods(Long shopId, Long orderId, String tableCode, Long isNoTable); /** - * 按台桌查看商品列表 + * 按商品查看 */ List getKitchenFood(Long shopId, String productName, Long categoryId); } \ No newline at end of file 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 4a456a230..8dffe3d37 100644 --- a/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml @@ -19,7 +19,7 @@ `staff`.`name` AS staffName, sum(detail.num - detail.return_num) AS num, detail.sub_status AS subStatus, - detail.order_time AS orderTime, + detail.create_time AS orderTime, detail.start_order_time AS startOrderTime, detail.dish_out_time AS dishOutTime, detail.food_serve_time AS foodServeTime @@ -90,7 +90,7 @@ detail.sku_name AS skuName, sum(detail.num - detail.return_num) AS num, detail.sub_status AS subStatus, - detail.order_time AS orderTime, + detail.create_time AS orderTime, detail.start_order_time AS startOrderTime, detail.dish_out_time AS dishOutTime, detail.food_serve_time AS foodServeTime From 44993212aaec595fbbdb6652b7fc3448007ff06b Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 2 Dec 2025 13:34:54 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/controller/admin/ShopAdController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopAdController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopAdController.java index 20aba8fa1..64d5ad6fd 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopAdController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopAdController.java @@ -60,7 +60,7 @@ public class ShopAdController { * 小程序广告编辑 * @return 是否成功 */ - @SaAdminCheckPermission(value = "shopAd:list", name = "小程序广告编辑") + @SaAdminCheckPermission(value = "shopAd:edit", name = "小程序广告编辑") @PutMapping public CzgResult edit(@RequestBody @Validated(UpdateGroup.class) ShopAdDTO shopAdEditDTO) { ShopAd shopAd = BeanUtil.copyProperties(shopAdEditDTO, ShopAd.class); From 991df5b0288b1c06c49ff8d900c9cf6faf2943e2 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 2 Dec 2025 13:35:50 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/account/service/impl/BkOrderServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java index 2b22c2497..a234aea50 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java @@ -3,18 +3,18 @@ package com.czg.service.account.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import com.czg.account.dto.BkOrderDTO; +import com.czg.account.entity.BkOrder; import com.czg.account.entity.BkOrderTable; +import com.czg.account.service.BkOrderService; import com.czg.account.vo.BkTableVO; import com.czg.exception.CzgException; +import com.czg.service.account.mapper.BkOrderMapper; import com.czg.service.account.mapper.BkOrderTableMapper; import com.mybatisflex.core.query.QueryWrapper; -import com.mybatisflex.core.update.UpdateWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.czg.account.entity.BkOrder; -import com.czg.account.service.BkOrderService; -import com.czg.service.account.mapper.BkOrderMapper; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.math.RoundingMode; @@ -49,6 +49,7 @@ public class BkOrderServiceImpl extends ServiceImpl impl @Override + @Transactional public void booking(Long shopId, BkOrderDTO bkOrder) { BkOrder bkOrderEntity = BeanUtil.copyProperties(bkOrder, BkOrder.class); bkOrderEntity.setShopId(shopId); From fd8c66d6aa83038bfde9c139805448f7886ea0a8 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 2 Dec 2025 14:11:05 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8D=95=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/BkContactListController.java | 13 +++++++ .../czg/account/service/BkOrderService.java | 6 ++++ .../account/vo/BookingOrderStatisticsVO.java | 28 +++++++++++++++ .../service/account/mapper/BkOrderMapper.java | 6 ++++ .../service/impl/BkOrderServiceImpl.java | 6 ++++ .../main/resources/mapper/BkOrderMapper.xml | 35 +++++++++++++++++++ 6 files changed, 94 insertions(+) create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/account/vo/BookingOrderStatisticsVO.java 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 f540911cc..984abf495 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 @@ -8,6 +8,7 @@ import com.czg.account.entity.BkOrderTable; import com.czg.account.service.BkContactListService; import com.czg.account.service.BkOrderService; import com.czg.account.vo.BkTableVO; +import com.czg.account.vo.BookingOrderStatisticsVO; import com.czg.annotation.SaAdminCheckPermission; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; @@ -58,6 +59,18 @@ public class BkContactListController { return CzgResult.success(tables); } + /** + * 预约端-预定单：预约单统计 + */ +// @SaAdminCheckPermission(value = "bk:bkOrder:bookings", name = "预约端-预约单：列表") + @GetMapping("/bkOrder/booking/statistics") + public CzgResult bookingOrderStatistics(@RequestParam(required = false) String search, + @RequestParam(required = false) LocalDate start, + @RequestParam(required = false) LocalDate end, + @RequestParam(required = false) String status) { + BookingOrderStatisticsVO statistics = bkOrderService.bookingOrderStatistics(StpKit.USER.getShopId(), search, start, end, status); + return CzgResult.success(statistics); + } /** * 预约端-预定单：查询预约单列表 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/BkOrderService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/BkOrderService.java index 7fc489c88..de320185f 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/BkOrderService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/BkOrderService.java @@ -3,6 +3,7 @@ package com.czg.account.service; import com.czg.account.dto.BkOrderDTO; import com.czg.account.entity.BkOrderTable; import com.czg.account.vo.BkTableVO; +import com.czg.account.vo.BookingOrderStatisticsVO; import com.mybatisflex.core.service.IService; import com.czg.account.entity.BkOrder; @@ -17,6 +18,11 @@ import java.util.List; */ public interface BkOrderService extends IService { + /** + * 查询预约单统计信息 + */ + BookingOrderStatisticsVO bookingOrderStatistics(Long shopId, String search, LocalDate start, LocalDate end, String status); + /** * 查询预约单列表 * @param shopId 店铺id diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/BookingOrderStatisticsVO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/BookingOrderStatisticsVO.java new file mode 100644 index 000000000..57cacd950 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/BookingOrderStatisticsVO.java @@ -0,0 +1,28 @@ +package com.czg.account.vo; + +import lombok.Data; +import java.math.BigDecimal; + +/** + * @author ww + * @description + */ +@Data +public class BookingOrderStatisticsVO { + /** + * 今日预约 + */ + private Long todayBookingCount; + /** + * 本月预约 + */ + private Long thisMonthBookingCount; + /** + * 待到店数 + */ + private Long arrivedCount; + /** + * 预约到店率 + */ + private BigDecimal arrivalRate; +} diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/BkOrderMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/BkOrderMapper.java index cc321451d..99d4861be 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/BkOrderMapper.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/BkOrderMapper.java @@ -1,5 +1,6 @@ package com.czg.service.account.mapper; +import com.czg.account.vo.BookingOrderStatisticsVO; import com.mybatisflex.core.BaseMapper; import com.czg.account.entity.BkOrder; @@ -14,6 +15,11 @@ import java.util.List; */ public interface BkOrderMapper extends BaseMapper { + /** + * 查询预约单统计信息 + */ + BookingOrderStatisticsVO bookingOrderStatistics(Long shopId, String search, LocalDate start, LocalDate end, String status); + /** * 查询预约单列表 */ diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java index a234aea50..4283cfc89 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkOrderServiceImpl.java @@ -7,6 +7,7 @@ import com.czg.account.entity.BkOrder; import com.czg.account.entity.BkOrderTable; import com.czg.account.service.BkOrderService; import com.czg.account.vo.BkTableVO; +import com.czg.account.vo.BookingOrderStatisticsVO; import com.czg.exception.CzgException; import com.czg.service.account.mapper.BkOrderMapper; import com.czg.service.account.mapper.BkOrderTableMapper; @@ -34,6 +35,11 @@ public class BkOrderServiceImpl extends ServiceImpl impl @Resource private BkOrderTableMapper tableMapper; + @Override + public BookingOrderStatisticsVO bookingOrderStatistics(Long shopId, String search, LocalDate start, LocalDate end, String status) { + return mapper.bookingOrderStatistics(shopId, search, start, end, status); + } + /** * 预约端-预约单：列表 */ 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 b637be4aa..5093f3c84 100644 --- a/cash-service/account-service/src/main/resources/mapper/BkOrderMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/BkOrderMapper.xml @@ -32,4 +32,39 @@ group by o.id order by o.booking_time desc + + From b06737027a02bea4b604d8e28497c3ba8c25501a Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 2 Dec 2025 14:11:31 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8D=95=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/controller/admin/BkContactListController.java | 2 +- 1 file changed, 1 insertion(+), 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 984abf495..fbcb4a18b 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 @@ -62,7 +62,7 @@ public class BkContactListController { /** * 预约端-预定单：预约单统计 */ -// @SaAdminCheckPermission(value = "bk:bkOrder:bookings", name = "预约端-预约单：列表") +// @SaAdminCheckPermission(value = "bk:bkOrder:bookings:statistics", name = "预约端-预约单：预约单统计") @GetMapping("/bkOrder/booking/statistics") public CzgResult bookingOrderStatistics(@RequestParam(required = false) String search, @RequestParam(required = false) LocalDate start,