From 5dc40fcd64b0513150f1d8335ab849e6d8cdc28e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 04 七月 2025 19:42:49 +0800
Subject: [PATCH] 支付版本更新 根据资金流向使用V2或V3服务商版本支付
---
cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml b/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
index 19b5e85..d8e0496 100644
--- a/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
@@ -4,22 +4,21 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.dsh.course.entity.CoursePackageScheduling">
- <id column="id" property="id" />
- <result column="coursePackageId" property="coursePackageId" />
- <result column="classDate" property="classDate" />
- <result column="courseId" property="courseId" />
- <result column="integral" property="integral" />
- <result column="cancelClasses" property="cancelClasses" />
- <result column="deductClassHour" property="deductClassHour" />
- <result column="status" property="status" />
+ <id column="id" property="id"/>
+ <result column="coursePackageId" property="coursePackageId"/>
+ <result column="classDate" property="classDate"/>
+ <result column="courseId" property="courseId"/>
+ <result column="integral" property="integral"/>
+ <result column="cancelClasses" property="cancelClasses"/>
+ <result column="deductClassHour" property="deductClassHour"/>
+ <result column="status" property="status"/>
</resultMap>
-
<select id="queryCoursePackageSchedulingList" resultType="map">
SELECT
CAST(id AS CHAR(20)) AS id,
- CONCAT(DATE_FORMAT(classDate, '%Y-%m-%d %H:%i'), '-20:00') AS classDate,
+ CONCAT(DATE_FORMAT(classDate, '%Y-%m-%d %H:%i'),'-',DATE_FORMAT(endDate, '%H:%i')) AS classDate,
courseId,
`status`,
cancelClasses,
@@ -31,13 +30,19 @@
</select>
<select id="queryAll" resultType="com.dsh.course.model.vo.response.AppUserVideoResponse">
- SELECT cs.courseId as videoId,cs.coursePackageId as coursePackageId,tc.coverDrawing,tc.name as videoName,tc.introduce as synopsis,cs.integral,cs.courseVideo as courseVideo
+ SELECT cs.courseId as videoId,cs.coursePackageId as coursePackageId,tc.coverDrawing as coverImage,tc.name as
+ videoName,tc.introduce as synopsis,cs.integral,tc.courseVideo as courseVideo,cp.name as packageName,cs.id as
+ scId
FROM t_course_package_scheduling cs
- LEFT JOIN t_course tc ON cs.courseId = tc.id
- WHERE cs.courseId IS NOT NULL and cs.id in
- <foreach collection="longs" item="item" open="(" close=")" separator=",">
- #{item}
- </foreach>
+ LEFT JOIN t_course tc ON cs.courseId = tc.id
+ left join t_course_package cp on cs.coursePackageId = cp.id
+ WHERE cs.courseId IS NOT NULL
+ <if test="longs != null">
+ AND cs.id IN
+ <foreach collection="longs" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
</select>
<select id="isHave" resultType="int">
--
Gitblit v1.7.1