1、试听课

2、收费网管课活动

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

@@ -276,9 +276,9 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
             throw new BizException("所在城市暂不参与此活动");
         }
         BigDecimal oneMonthPrice;
-        if(practiceBuyActivityExpireDate.after(now)){
+        if(practiceBuyActivityExpireDate.after(now)&&studentExitChargePractices>0){
             oneMonthPrice=practiceGroupBuyParams.getDrillTimesOnWeek()==1?practiceGroupSellPrice.getOnceActivityPrice():practiceGroupSellPrice.getTwiceActivityPrice();
-            if(practiceGroupBuyParams.getBuyMonths()>=3&&studentExitChargePractices>0){
+            if(practiceGroupBuyParams.getBuyMonths()>=3){
                 oneMonthPrice=practiceGroupBuyParams.getDrillTimesOnWeek()==1?practiceGroupSellPrice.getOnceQuartActivityPrice():practiceGroupSellPrice.getTwiceQuartActivityPrice();
             }
         }else{

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

@@ -2812,9 +2812,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             throw new BizException("所在城市暂不参与此活动");
         }
         BigDecimal oneMonthPrice;
-        if(practiceBuyActivityExpireDate.after(now)){
+        if(practiceBuyActivityExpireDate.after(now)&&studentExitChargePractices>0){
             oneMonthPrice=practiceGroupBuyParams.getDrillTimesOnWeek()==1?practiceGroupSellPrice.getOnceActivityPrice():practiceGroupSellPrice.getTwiceActivityPrice();
-            if(practiceGroupBuyParams.getBuyMonths()>=3&&studentExitChargePractices>0){
+            if(practiceGroupBuyParams.getBuyMonths()>=3){
                 oneMonthPrice=practiceGroupBuyParams.getDrillTimesOnWeek()==1?practiceGroupSellPrice.getOnceQuartActivityPrice():practiceGroupSellPrice.getTwiceQuartActivityPrice();
             }
         }else{

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

@@ -102,7 +102,7 @@ public class TeacherCourseRewardServiceImpl extends BaseServiceImpl<Long, Teache
                 t.setCourseName(teacherCourseReward.getCourseGroupName());
                 t.setCourseTimes(teacherCourseReward.getCourseScheduleIdList().split(",").length);
                 t.setMemo(teacherCourseReward.getMemo());
-                t.setActualSalary(teacherCourseReward.getActualRewardAmount());
+                t.setActualSalary(teacherCourseReward.getExpectRewardAmount());
                 t.setReduceSalary(teacherCourseReward.getExpectRewardAmount().subtract(teacherCourseReward.getActualRewardAmount()));
                 t.setFinalSalary(teacherCourseReward.getActualRewardAmount().subtract(teacherCourseReward.getActualRewardAmount()));
                 dataList.add(t);