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] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8D=95=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=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 + +