|
|
@@ -1006,16 +1006,17 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="getMoneyInMusicApply" resultMap="Mapper">
|
|
|
- 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 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 student_registration sr ON sr.user_id_ = spo.user_id_
|
|
|
+ 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.id_ = a.original_order_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'
|
|
|
+ AND spo.type_ = 'APPLY' and spo.status_ = 'SUCCESS' AND sr.music_group_id_ = spo.music_group_id_ AND sr.music_group_status_ = 'NORMAL'
|
|
|
GROUP BY spo.music_group_id_
|
|
|
</select>
|
|
|
<select id="findByUserAndActive" resultMap="StudentPaymentOrder">
|
zouxuan