|
|
@@ -780,12 +780,13 @@
|
|
|
mg.status_ = 'PROGRESS'
|
|
|
AND ((mgpc.member_rank_setting_id_ IS NOT NULL AND (DATEDIFF(s.music_membership_end_time_,NOW()) < 0 OR s.music_membership_end_time_ IS NULL)) OR mgpc.member_rank_setting_id_ IS NULL)
|
|
|
<if test="noPaymentType==null or noPaymentType==0">
|
|
|
- AND DATE_FORMAT(NOW(),'%Y-%m-%d') > mgpc.deadline_payment_date_
|
|
|
+ AND DATE_FORMAT(NOW(),'%Y-%m-%d') > DATE_FORMAT(mgpc.deadline_payment_date_,'%Y-%m-%d')
|
|
|
</if>
|
|
|
<if test="noPaymentType!=null and noPaymentType==1">
|
|
|
- AND DATE_FORMAT(NOW(),'%Y-%m-%d') BETWEEN mgpc.start_payment_date_ AND mgpc.deadline_payment_date_
|
|
|
+ AND DATE_FORMAT(NOW(),'%Y-%m-%d') BETWEEN DATE_FORMAT(mgpc.start_payment_date_,'%Y-%m-%d') AND DATE_FORMAT(mgpc.deadline_payment_date_,'%Y-%m-%d')
|
|
|
</if>
|
|
|
- AND mgpcd.payment_status_ = 'NON_PAYMENT' AND mgpcd.expect_amount_ > 0 AND mgpc.batch_no_ IS NOT NULL AND mgpc.pay_user_type_ = 'STUDENT'
|
|
|
+ AND mgpcd.payment_status_ = 'NON_PAYMENT' AND mgpc.batch_no_ IS NOT NULL AND mgpc.pay_user_type_ = 'STUDENT'
|
|
|
+ AND (mgpcd.expect_amount_ + mgpcd.expect_member_amount_) > 0
|
|
|
<if test="educationUserId != null">
|
|
|
AND mg.educational_teacher_id_ = #{educationUserId}
|
|
|
</if>
|
zouxuan