Merge remote-tracking branch 'origin/master'

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

@@ -689,9 +689,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 					vipGroup.setTotalClassTimes(aLong==null?0:aLong.intValue());
 					Long aLong1 = currentClassTimeMap.get(vipGroup.getId() + "");
 					vipGroup.setCurrentClassTimes(aLong1==null?0:aLong1.intValue());
-					if(Objects.isNull(aLong)
-							&&!VipGroupStatusEnum.NOT_START.equals(vipGroup.getStatus())
-							&&!VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus())){
+					if((Objects.isNull(aLong)||aLong<=0)
+							&&(VipGroupStatusEnum.NOT_START.equals(vipGroup.getStatus())
+							||VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus()))){
 						vipGroup.setEnableDelete(1);
 					}