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

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -2287,13 +2287,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 throw new BizException("申请失败，存在[申请中]的记录");
             }
         }
-        if(reqMusicGroupQuit.getStatus() != APPROVED){
+/*        if(reqMusicGroupQuit.getStatus() != APPROVED){
             //是否是特定的可以一键退团的乐团主管
             Boolean hasRole = employeePositionService.getDao().hasRole("一键退团",operatorId,reqMusicGroupQuit.getTenantId());
             if(hasRole){
                 reqMusicGroupQuit.setStatus(APPROVED);
             }
-        }
+        }*/
 
         musicGroupQuit = new MusicGroupQuit();
         musicGroupQuit.setCreateTime(new Date());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -3914,7 +3914,11 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             }
             salarySettlement = vipGroupSalarySettlementDto.getPracticeSalarySettlement();
             givePracticeSalarySettlement = vipGroupSalarySettlementDto.getGivePracticeSalarySettlement();
-            totalPrice = totalPrice.multiply(vipGroupActivity.getDiscount()).divide(new BigDecimal(100), CommonConstants.DECIMAL_PLACE, ROUND_DOWN);
+            if(vipGroupActivity.getFixedCourseNumFlag()){
+                totalPrice = vipGroupActivity.getMarketPrice();
+            }else {
+                totalPrice = totalPrice.multiply(vipGroupActivity.getDiscount()).divide(new BigDecimal(100), CommonConstants.DECIMAL_PLACE, ROUND_DOWN);
+            }
         }
         //教师课酬线上单课酬计算
         teacherDefaultSalary = teacherDefaultPracticeGroupSalary.getMainTeacherSalary();

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

@@ -630,14 +630,11 @@
     </select>
     <select id="sumGroupIncomeFee" resultType="java.math.BigDecimal">
         SELECT
-        (CASE WHEN a.a IS NULL THEN 0 ELSE a.a END) +
         (CASE WHEN c.c IS NULL THEN 0 ELSE c.c END) +
         (CASE WHEN d.d IS NULL THEN 0 ELSE d.d END) +
         (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_ = #{vipGroupId} 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,