|
@@ -278,14 +278,12 @@
|
|
|
<if test="dataType == 1">
|
|
<if test="dataType == 1">
|
|
|
rpl.course_id as course_id,
|
|
rpl.course_id as course_id,
|
|
|
</if>
|
|
</if>
|
|
|
- SUM(rpl.money) as rewardMoney
|
|
|
|
|
|
|
+ SUM(rpl.amount) as rewardMoney
|
|
|
FROM
|
|
FROM
|
|
|
- company_red_package_logs rpl
|
|
|
|
|
- left join fs_course_watch_log log
|
|
|
|
|
- on rpl.watch_log_id=log.log_id
|
|
|
|
|
|
|
+ fs_course_red_packet_log rpl
|
|
|
|
|
+ left join fs_course_watch_log log
|
|
|
|
|
+ on rpl.watch_log_id=log.log_id
|
|
|
<where>
|
|
<where>
|
|
|
- rpl.operate_type = 1
|
|
|
|
|
- AND rpl.status = 1
|
|
|
|
|
<if test="startTime != null">
|
|
<if test="startTime != null">
|
|
|
AND rpl.create_time <![CDATA[>=]]> #{startTime}
|
|
AND rpl.create_time <![CDATA[>=]]> #{startTime}
|
|
|
</if>
|
|
</if>
|
|
@@ -320,8 +318,8 @@
|
|
|
<if test="type == 2 or type == 3 or type == 4">
|
|
<if test="type == 2 or type == 3 or type == 4">
|
|
|
DATE_FORMAT(rpl.create_time, '%Y-%m-%d') AS start_date,
|
|
DATE_FORMAT(rpl.create_time, '%Y-%m-%d') AS start_date,
|
|
|
</if>
|
|
</if>
|
|
|
- SUM(rpl.money) as rewardMoney
|
|
|
|
|
- from company_red_package_logs rpl
|
|
|
|
|
|
|
+ SUM(rpl.amount) as rewardMoney
|
|
|
|
|
+ from fs_course_red_packet_log rpl
|
|
|
left join fs_course_watch_log log
|
|
left join fs_course_watch_log log
|
|
|
on rpl.watch_log_id=log.log_id
|
|
on rpl.watch_log_id=log.log_id
|
|
|
<where>
|
|
<where>
|
|
@@ -337,8 +335,6 @@
|
|
|
<if test="companyId != null">
|
|
<if test="companyId != null">
|
|
|
and log.company_id = ${companyId}
|
|
and log.company_id = ${companyId}
|
|
|
</if>
|
|
</if>
|
|
|
- AND rpl.operate_type = 1
|
|
|
|
|
- AND rpl.status = 1
|
|
|
|
|
</where>
|
|
</where>
|
|
|
group by start_date
|
|
group by start_date
|
|
|
</select>
|
|
</select>
|
