czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source 
# Conflicts:
#	src/main/resources/mapper/course/CourseDao.xml
This commit is contained in:
张松
2024-12-30 20:06:15 +08:00
parent e2ae91bcd6 808a5f9ce6
commit 6828c78114
12 changed files with 69 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/resources/mapper/app/UserDao.xml
View File

@@ -52,13 +52,13 @@
</if>
<if test="startTime!=null and startTime!='' and endTime!=null and endTime!=''">
and date_format(u.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}
and u.create_time BETWEEN #{startTime} and #{endTime}
</if>
<if test="startTime!=null and startTime!='' and (endTime==null or endTime=='')">
and date_format(u.create_time,'%Y-%m-%d') &gt;= #{startTime}
and u.create_time &gt;= #{startTime}
</if>
<if test="endTime!=null and endTime!='' and (startTime==null or startTime=='')">
and date_format(u.create_time,'%Y-%m-%d') &lt;= #{endTime}
and u.create_time &lt;= #{endTime}
</if>
order by create_time desc
</select>
@@ -143,15 +143,7 @@
<if test="sysUserId!=null">
and sys_user_id=#{sysUserId}
</if>
<if test="type==1">
and date_format(o.create_time,'%Y-%m-%d')=date_format(#{date},'%Y-%m-%d')
</if>
<if test="type==2">
and date_format(o.create_time,'%Y-%m')=date_format(#{date},'%Y-%m')
</if>
<if test="type==3">
and date_format(o.create_time,'%Y')=date_format(#{date},'%Y')
</if>
and o.create_time between #{start} and #{end}
group by c.course_id
order by coursenum desc
</select>

107
src/main/resources/mapper/course/CourseDao.xml
View File

@@ -7,103 +7,6 @@
where course_id = #{id}
</update>
<select id="selectCourse" resultType="Map">
SELECT
c.classify_id AS classifyId,
c.course_id AS courseId,
c.course_label AS courseLabel,
c.create_time AS createTime,
c.details,
c.img,
c.banner_img AS bannerImg,
c.status,
c.is_delete AS isDelete,
c.msg_type AS msgType,
c.msg_url AS msgUrl,
c.pay_num AS payNum,
c.price,
c.wholesale_price AS wholesalePrice,
c.is_over AS isOver,
c.title,
c.is_price AS isPrice,
c.title_img AS titleImg,
c.update_time AS updateTime,
cc.classification_name AS classificationName,
c.course_type AS courseType,
c.banner_id AS bannerId,
b.name AS bannerName,
0 AS viewCounts,
c.dy_img_id AS dyImgId,
c.dy_course_id AS dyCourseId,
c.wx_course_id AS wxCourseId,
c.wx_show AS wxShow,
c.dy_show AS dyShow,
c.sort,
0 AS goodNum,
d.courseDetailsCount,
NULL AS courseDetailsName,
NULL AS courseDetailsId,
0 AS weekGoodNum,
0 AS isRecommend
FROM
course AS c
LEFT JOIN
course_classification AS cc ON c.classify_id = cc.classification_id
LEFT JOIN
banner AS b ON b.id = c.banner_id
LEFT JOIN
(SELECT course_id, COUNT(*) AS courseDetailsCount FROM course_details GROUP BY course_id) AS d
ON c.course_id = d.course_id
WHERE
c.is_delete = 0
<if test='null != wxShow and wxShow == 1'>
AND c.wx_show = #{wxShow}
</if>
<if test='null != wxShow and wxShow == 2'>
AND (c.wx_show = #{wxShow} OR c.wx_show IS NULL)
</if>
<if test='null != dyShow and dyShow == 1'>
AND c.dy_show = #{dyShow}
</if>
<if test='null != dyShow and dyShow == 2'>
AND (c.dy_show = #{dyShow} OR c.dy_show IS NULL)
</if>
<if test='null != title'>
AND c.title LIKE CONCAT('%', #{title}, '%')
</if>
<if test='null != classifyId and classifyId != 0'>
AND c.classify_id = #{classifyId}
</if>
<if test='null != bannerId and bannerId != 0'>
AND c.banner_id = #{bannerId}
</if>
<if test="classifyId == 0">
AND c.is_recommend = 1
</if>
<if test="over != null">
AND c.is_over = #{over}
</if>
<if test="isRecommend != null and isRecommend != -1">
AND c.course_id IN (SELECT course_id FROM course_details WHERE good = 1)
</if>
<if test="status != null and status != 0">
AND c.status = #{status}
</if>
<if test="isPrice != null">
AND c.is_price = #{isPrice}
</if>
<if test="wxCourse != null">
AND c.wx_course_id IS NOT NULL
</if>
<if test="dyCourse != null">
AND c.dy_status = 4
</if>
ORDER BY
c.sort ASC, c.create_time DESC;
<!--
SELECT
c.classify_id as classifyId,
c.course_id as courseId,
@@ -135,11 +38,11 @@
c.wx_show as wxShow,
c.dy_show as dyShow,
c.sort,
0 as goodNum,
round(10000*rand(),0) as goodNum,
(select count(*) from course_details d where d.course_id=c.course_id ) as courseDetailsCount,
null AS courseDetailsName,
null AS courseDetailsId,
0 as weekGoodNum,
round(10000*rand(),0) as weekGoodNum,
0 as isRecommend
FROM
course AS c
@@ -190,11 +93,8 @@
<if test="dyCourse!=null">
and c.dy_status=4
</if>
order by c.sort asc,c.create_time desc
分割线
<if test="sort==null">
order by c.sort asc
order by c.sort asc,c.create_time desc
</if>
<if test="sort!=null and sort==1">
order by goodNum desc
@@ -202,7 +102,6 @@
<if test="sort!=null and sort==2">
order by weekGoodNum desc
</if>
-->
</select>
<select id="selectCourseAdmin" resultType="Map">

8
src/main/resources/mapper/course/CourseDetailsDao.xml
View File

@@ -23,10 +23,12 @@
<select id="findByCourseIdNotUrl" resultType="com.sqx.modules.course.entity.CourseDetails">
select c.course_details_id as courseDetailsId,c.course_id as courseId,c.wx_course_details_id as wxCourseDetailsId,
c.course_details_name as courseDetailsName,c.create_time as createTime,
c.title_img as titleImg,c.content,c.good_num as goodNum,c.price,
if(c.is_price!=1,c.video_url,'') as videoUrl,
c.dy_episode_id as dyEpisodeId,c.advertising, c.view_count as viewCount, c.play_complete_count as playCompleteCount,
(select count(*) from course_collect cc where cc.user_id=#{userId} and cc.course_details_id=c.course_details_id and cc.classify=2) as isGood,
c.title_img as titleImg,c.content,c.good_num as goodNum,c.price
c.dy_episode_id as dyEpisodeId,c.advertising,
c.view_count as viewCount,
c.play_complete_count as playCompleteCount,
(select count(*) from course_collect cc where cc.user_id=#{userId} and cc.course_details_id=c.course_details_id and cc.classify=2) as isGood
from course_details c
where c.course_id=#{id} order by c.sort asc
</select>

34
src/main/resources/mapper/pay/CashDao.xml
View File

@@ -30,43 +30,15 @@
</select>
<select id="sumMoney" resultType="Double">
select sum(money) from cash_out where state =1
<if test="flag!=null and flag==1">
and date_format(create_at,'%Y-%m-%d')=date_format(#{time},'%Y-%m-%d')
</if>
<if test="flag!=null and flag==2">
and date_format(create_at,'%Y-%m')=date_format(#{time},'%Y-%m')
</if>
<if test="flag!=null and flag==3">
and date_format(create_at,'%Y')=date_format(#{time},'%Y')
</if>
select sum(money) from cash_out where state = 1 and create_at between #{start} and #{end}
</select>
<select id="countMoney" resultType="Integer">
select count(*) from cash_out where
<if test="flag!=null and flag==1">
date_format(create_at,'%Y-%m-%d')=date_format(#{time},'%Y-%m-%d')
</if>
<if test="flag!=null and flag==2">
date_format(create_at,'%Y-%m')=date_format(#{time},'%Y-%m')
</if>
<if test="flag!=null and flag==3">
date_format(create_at,'%Y')=date_format(#{time},'%Y')
</if>
select count(*) from cash_out where create_at between #{start} and #{end}
</select>
<select id="stayMoney" resultType="Integer">
select count(*) from cash_out where
<if test="flag!=null and flag==1">
date_format(create_at,'%Y-%m-%d')=date_format(#{time},'%Y-%m-%d')
</if>
<if test="flag!=null and flag==2">
date_format(create_at,'%Y-%m')=date_format(#{time},'%Y-%m')
</if>
<if test="flag!=null and flag==3">
date_format(create_at,'%Y')=date_format(#{time},'%Y')
</if>
and state=0
select count(*) from cash_out where create_at between #{start} and #{end} and state=0
</select>
<select id="selectMayMoney" resultType="Double">