修复

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/VisitAppointmentController.java → yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/JiashuVisitAppointmentController.java

@@ -2,12 +2,11 @@ package cn.iocoder.yudao.module.system.controller.admin.biz;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.system.controller.admin.biz.vo.VisitAppointmentCountRespVO;
-import cn.iocoder.yudao.module.system.service.miniapp.VisitAppointmentService;
+import cn.iocoder.yudao.module.system.service.miniapp.JiashuVisitAppointmentService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -21,16 +20,16 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  */
 @Tag(name = "管理后台 - 探访预约统计")
 @RestController
-@RequestMapping("/visitAppointment")
-public class VisitAppointmentController {
+@RequestMapping("/jiashu/visitAppointment")
+public class JiashuVisitAppointmentController {
 
     @Resource
-    private VisitAppointmentService visitAppointmentService;
+    private JiashuVisitAppointmentService jiashuVisitAppointmentService;
 
     @GetMapping("/count")
     @Operation(summary = "获取当日、当周、当月的预约参观数量")
-    public CommonResult<VisitAppointmentCountRespVO> count(@RequestParam(name = "tenantId") Long tenantId) {
-        return success(visitAppointmentService.getVisitCount(tenantId));
+    public CommonResult<VisitAppointmentCountRespVO> count() {
+        return success(jiashuVisitAppointmentService.getVisitCount());
     }
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/miniapp/VisitAppointmentDO.java → yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/miniapp/JiashuVisitAppointmentDO.java

@@ -11,11 +11,14 @@ import java.time.LocalDateTime;
 /**
  * 探访预约记录 DO（yanglao-jiashu 数据源）
  *
+ * 注意：与 reservation 模块的 visit_appointment（master 数据源）为不同数据库、不同表结构，
+ * 此处对应 yanglao-jiashu 库中的 visit_appointment 表。
+ *
  * @author system
  */
 @TableName("visit_appointment")
 @Data
-public class VisitAppointmentDO {
+public class JiashuVisitAppointmentDO {
 
     /**
      * 预约ID

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/miniapp/VisitAppointmentMapper.java → yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/miniapp/JiashuVisitAppointmentMapper.java

@@ -2,13 +2,13 @@ package cn.iocoder.yudao.module.system.dal.mysql.miniapp;
 
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.system.dal.dataobject.miniapp.VisitAppointmentDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.miniapp.JiashuVisitAppointmentDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.time.LocalDate;
 
 @Mapper
-public interface VisitAppointmentMapper extends BaseMapperX<VisitAppointmentDO> {
+public interface JiashuVisitAppointmentMapper extends BaseMapperX<JiashuVisitAppointmentDO> {
 
     /**
      * 统计指定预约日期范围内的预约参观数量（排除已删除 status=4）
@@ -17,11 +17,10 @@ public interface VisitAppointmentMapper extends BaseMapperX<VisitAppointmentDO>
      * @param endDate   结束日期（含）
      * @return 预约数量
      */
-    default Long countByVisitDateRange(Long tenantId,LocalDate startDate, LocalDate endDate) {
-        return selectCount(new LambdaQueryWrapperX<VisitAppointmentDO>()
-                .eq(VisitAppointmentDO::getOrderId,tenantId)
-                .between(VisitAppointmentDO::getVisitDate, startDate, endDate)
-                .ne(VisitAppointmentDO::getStatus, 4));
+    default Long countByVisitDateRange(LocalDate startDate, LocalDate endDate) {
+        return selectCount(new LambdaQueryWrapperX<JiashuVisitAppointmentDO>()
+                .between(JiashuVisitAppointmentDO::getVisitDate, startDate, endDate)
+                .ne(JiashuVisitAppointmentDO::getStatus, 4));
     }
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/miniapp/VisitAppointmentService.java → yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/miniapp/JiashuVisitAppointmentService.java

@@ -7,13 +7,13 @@ import cn.iocoder.yudao.module.system.controller.admin.biz.vo.VisitAppointmentCo
  *
  * @author system
  */
-public interface VisitAppointmentService {
+public interface JiashuVisitAppointmentService {
 
     /**
      * 获取当日、当周、当月的预约参观数量
      *
      * @return 当日 / 当周 / 当月的预约数量
      */
-    VisitAppointmentCountRespVO getVisitCount(Long tenantId);
+    VisitAppointmentCountRespVO getVisitCount();
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/miniapp/VisitAppointmentServiceImpl.java → yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/miniapp/JiashuVisitAppointmentServiceImpl.java

@@ -1,7 +1,8 @@
 package cn.iocoder.yudao.module.system.service.miniapp;
 
 import cn.iocoder.yudao.module.system.controller.admin.biz.vo.VisitAppointmentCountRespVO;
-import cn.iocoder.yudao.module.system.dal.mysql.miniapp.VisitAppointmentMapper;
+import cn.iocoder.yudao.module.system.dal.dataobject.miniapp.JiashuVisitAppointmentDO;
+import cn.iocoder.yudao.module.system.dal.mysql.miniapp.JiashuVisitAppointmentMapper;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import org.springframework.stereotype.Service;
 
@@ -16,46 +17,46 @@ import java.time.LocalDate;
  */
 @Service
 @DS("miniapp")
-public class VisitAppointmentServiceImpl implements VisitAppointmentService {
+public class JiashuVisitAppointmentServiceImpl implements JiashuVisitAppointmentService {
 
     @Resource
-    private VisitAppointmentMapper visitAppointmentMapper;
+    private JiashuVisitAppointmentMapper jiashuVisitAppointmentMapper;
 
     @Override
-    public VisitAppointmentCountRespVO getVisitCount(Long tenantId) {
+    public VisitAppointmentCountRespVO getVisitCount() {
         VisitAppointmentCountRespVO respVO = new VisitAppointmentCountRespVO();
-        respVO.setTodayCount(getTodayCount(tenantId));
-        respVO.setWeekCount(getWeekCount(tenantId));
-        respVO.setMonthCount(getMonthCount(tenantId));
+        respVO.setTodayCount(getTodayCount());
+        respVO.setWeekCount(getWeekCount());
+        respVO.setMonthCount(getMonthCount());
         return respVO;
     }
 
     /**
      * 当日预约参观数量
      */
-    private Long getTodayCount(Long tenantId) {
+    private Long getTodayCount() {
         LocalDate today = LocalDate.now();
-        return visitAppointmentMapper.countByVisitDateRange(tenantId,today, today);
+        return jiashuVisitAppointmentMapper.countByVisitDateRange(today, today);
     }
 
     /**
      * 当周（周一至周日）预约参观数量
      */
-    private Long getWeekCount(Long tenantId) {
+    private Long getWeekCount() {
         LocalDate now = LocalDate.now();
         LocalDate monday = now.with(DayOfWeek.MONDAY);
         LocalDate sunday = now.with(DayOfWeek.SUNDAY);
-        return visitAppointmentMapper.countByVisitDateRange(tenantId,monday, sunday);
+        return jiashuVisitAppointmentMapper.countByVisitDateRange(monday, sunday);
     }
 
     /**
      * 当月（1号至月末）预约参观数量
      */
-    private Long getMonthCount(Long tenantId) {
+    private Long getMonthCount() {
         LocalDate now = LocalDate.now();
         LocalDate firstDay = now.withDayOfMonth(1);
         LocalDate lastDay = now.withDayOfMonth(now.lengthOfMonth());
-        return visitAppointmentMapper.countByVisitDateRange(tenantId,firstDay, lastDay);
+        return jiashuVisitAppointmentMapper.countByVisitDateRange(firstDay, lastDay);
     }
 
 }