Merge remote-tracking branch 'origin/master'

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

@@ -2058,6 +2058,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(Objects.isNull(sysUserCashAccount)){
 			throw new BizException("当前用户没有现金账户");
 		}
+		CourseSchedule
 		vipGroupPayInfo.setBalance(sysUserCashAccount.getBalance());
 		return  vipGroupPayInfo;
 	}

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

@@ -704,7 +704,7 @@
         <where>
             (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
             AND sa.user_id_=#{userId}
-            AND cs.status_='OVER'
+            AND cs.status_ != 'NOT_START'
             <if test="teachMode!=null and teachMode!=''">
                 AND cs.teach_mode_=#{teachMode}
             </if>