Merge branch '20221101' into master_saas

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderDetailMapper.xml

@@ -427,6 +427,6 @@
         LEFT JOIN  student_payment_order spo ON spo.id_ = spod.payment_order_id_
         left join subject_change sc on sc.order_id_ = spo.id_
         WHERE sc.music_group_id_ = #{musicGroupId}
-        AND spo.type_ = 'SUBJECT_CHANGE' and spo.status_ = 'SUCCESS'
+        AND spo.type_ = 'SUBJECT_CHANGE' and spo.status_ = 'SUCCESS' and spod.delivery_batch_no_ is NULL
     </select>
 </mapper>