diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DriveSchoolCourseSmallController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DriveSchoolCourseSmallController.java index 02e9a63c..3bc5dc92 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DriveSchoolCourseSmallController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DriveSchoolCourseSmallController.java @@ -4,11 +4,14 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.base.service.DlDriveSchoolCourseService; import cn.iocoder.yudao.module.base.vo.DlDriveSchoolCourseVO; +import cn.iocoder.yudao.module.jx.domain.DriveSchoolPhone; +import cn.iocoder.yudao.module.jx.service.IDriveSchoolPhoneService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -28,6 +31,9 @@ public class DriveSchoolCourseSmallController { @Resource private DlDriveSchoolCourseService courseService; + @Autowired + private IDriveSchoolPhoneService driveSchoolPhoneService; + /** * 分页获取课程信息 * @@ -79,4 +85,15 @@ public class DriveSchoolCourseSmallController { public CommonResult getDlDriveSchoolCoach(@RequestParam("id") String id) { return success(courseService.queryDetailById(id)); } + + /** + * 获取驾校客服电话 + */ + @GetMapping("/getServicePhone") + @TenantIgnore + public CommonResult getServicePhone(@RequestParam("tenantId") String tenantId) { + return success(driveSchoolPhoneService.getServicePhoneByTenantId(tenantId)); + } + + } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/SchoolCourseOrderSmallProgramController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/SchoolCourseOrderSmallProgramController.java index 7a49cf21..86f6b198 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/SchoolCourseOrderSmallProgramController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/SchoolCourseOrderSmallProgramController.java @@ -73,7 +73,7 @@ public class SchoolCourseOrderSmallProgramController { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNo, pageSize); - return success(schoolCourseOrderService.queryPage(page, pageReqVO)); + return success(schoolCourseOrderService.queryPageNew(page, pageReqVO)); } /** diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolCourse.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolCourse.java index 48d60b74..a9c45261 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolCourse.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolCourse.java @@ -81,4 +81,9 @@ public class DlDriveSchoolCourse extends TenantBaseDO { * 交付定金的优惠 */ private double favour; + + /** + * 课程详情 + */ + private String details; } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/mapper/SchoolCourseOrderMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/mapper/SchoolCourseOrderMapper.java index 3349d9ad..29af7920 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/mapper/SchoolCourseOrderMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/mapper/SchoolCourseOrderMapper.java @@ -27,6 +27,7 @@ public interface SchoolCourseOrderMapper extends BaseMapper { * @date 10:11 2025/2/25 **/ IPage queryPage(@Param("entity")SchoolCourseOrderVO entity, Page page); + IPage queryPageNew(@Param("entity")SchoolCourseOrderVO entity, Page page); /** * @@ -38,4 +39,4 @@ public interface SchoolCourseOrderMapper extends BaseMapper { * @return java.util.List **/ Double selectByCoachUserId(@Param("coachId")Long coachId,@Param("startTime")String startTime,@Param("endTime")String endTime); -} \ No newline at end of file +} diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/SchoolCourseOrderService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/SchoolCourseOrderService.java index a3243b29..f019d730 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/SchoolCourseOrderService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/SchoolCourseOrderService.java @@ -61,6 +61,7 @@ public interface SchoolCourseOrderService extends IService { * @date 10:10 2025/2/25 **/ IPage queryPage(Page page, SchoolCourseOrderVO pageReqVO); + IPage queryPageNew(Page page, SchoolCourseOrderVO pageReqVO); /** * 终止订单 @@ -86,4 +87,4 @@ public interface SchoolCourseOrderService extends IService { * @return List */ List getCourseByLoginUser(Long loginUserId); -} \ No newline at end of file +} diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/SchoolCourseOrderServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/SchoolCourseOrderServiceImpl.java index 6f138c60..185ef80c 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/SchoolCourseOrderServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/SchoolCourseOrderServiceImpl.java @@ -81,6 +81,10 @@ public class SchoolCourseOrderServiceImpl extends ServiceImpl queryPage(Page page, SchoolCourseOrderVO pageReqVO) { return schoolCourseOrderMapper.queryPage(pageReqVO,page); } + @Override + public IPage queryPageNew(Page page, SchoolCourseOrderVO pageReqVO) { + return schoolCourseOrderMapper.queryPageNew(pageReqVO,page); + } /** * 终止订单 @@ -177,4 +181,4 @@ public class SchoolCourseOrderServiceImpl extends ServiceImpl order by main.create_time desc + + + +