|
@@ -984,12 +984,16 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="getMoneyInMusicApply" resultMap="Mapper">
|
|
|
- SELECT sum(spo.expect_amount_) value_,spo.music_group_id_ key_
|
|
|
- FROM student_payment_order spo WHERE spo.music_group_id_ IN
|
|
|
+ SELECT spo.music_group_id_ key_, sum(case when a.id_ is null then spo.expect_amount_ else (spo.expect_amount_ + a.goods_margin_) end) value_ from student_payment_order spo LEFT JOIN
|
|
|
+ (
|
|
|
+ SELECT * FROM subject_change WHERE id_ in
|
|
|
+ (SELECT max(sc.id_) id_ from subject_change sc WHERE sc.status_ = 2 GROUP BY music_group_id_,student_id_ ORDER BY id_ desc)
|
|
|
+ ) a on spo.music_group_id_ = a.music_group_id_ and spo.user_id_ = a.student_id_
|
|
|
+ WHERE spo.music_group_id_ IN
|
|
|
<foreach collection="musicGroupIds" item="musicGroupId" open="(" close=")" separator=",">
|
|
|
#{musicGroupId}
|
|
|
</foreach>
|
|
|
AND spo.type_ = 'APPLY' and spo.status_ = 'SUCCESS'
|
|
|
- GROUP BY spo.music_group_id_
|
|
|
+ GROUP BY spo.music_group_id_
|
|
|
</select>
|
|
|
</mapper>
|