|
|
@@ -562,8 +562,12 @@
|
|
|
AND pay_user_type_='STUDENT'
|
|
|
</select>
|
|
|
<select id="queryUserPaymentStatus" resultType="java.util.Map">
|
|
|
- SELECT mg.id_ 'key',CASE WHEN MIN(mgpcd.payment_status_) IS NULL THEN 'PAID_COMPLETED' ELSE MIN(mgpcd.payment_status_) END 'value'
|
|
|
+ SELECT mg.id_ 'key',
|
|
|
+ CASE WHEN sr.music_group_status_ = 'APPLY' THEN 'NON_PAYMENT'
|
|
|
+ WHEN MIN(mgpcd.payment_status_) IS NULL THEN 'PAID_COMPLETED'
|
|
|
+ ELSE MIN(mgpcd.payment_status_) END 'value'
|
|
|
FROM music_group mg
|
|
|
+ LEFT JOIN student_registration sr ON sr.music_group_id_ = mg.id_ AND sr.user_id_ = #{userId}
|
|
|
LEFT JOIN music_group_payment_calender mgpc ON mgpc.music_group_id_ = mg.id_
|
|
|
AND mgpc.status_ IN ('NO','OPEN','OVER')
|
|
|
AND DATE_FORMAT(NOW(),'%Y-%m-%d') >= DATE_FORMAT(mgpc.payment_valid_start_date_,'%Y-%m-%d')
|
zouxuan