Merge branch 'zx_saas_vip_activity' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -635,6 +635,8 @@
         (CASE WHEN e.e IS NULL THEN 0 ELSE e.e END) -
         (CASE WHEN b.b IS NULL THEN 0 ELSE b.b END) amount_
         FROM
+        (SELECT SUM(CASE WHEN expect_amount_ IS NULL THEN 0 ELSE expect_amount_ END) a FROM student_payment_order
+             WHERE group_type_ = 'VIP' AND type_ = 'SMALL_CLASS_TO_BUY' AND music_group_id_ = 41 AND status_ = 'SUCCESS') a,
         (SELECT SUM(CASE WHEN amount_ IS NULL THEN 0 ELSE amount_ END) b FROM sys_user_cash_account_log WHERE group_id_ = #{vipGroupId} AND group_type_ = 'VIP') b,
         (SELECT SUM(CASE WHEN actual_price_ IS NULL THEN 0 ELSE actual_price_ END) c FROM activity_user_mapper WHERE vip_group_id_ = #{vipGroupId}) c,
         (SELECT SUM(CASE WHEN amount_ IS NULL THEN 0 ELSE amount_ END) d FROM sys_user_cash_account_detail WHERE group_id_ = #{vipGroupId}) d,