Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zouxuan_saas_2022_04_07

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/StudentAttendanceStatusEnum.java

@@ -9,7 +9,8 @@ public enum StudentAttendanceStatusEnum implements BaseEnum<String,StudentAttend
     NORMAL("NORMAL","正常"),
     TRUANT("TRUANT","旷课"),
     LEAVE("LEAVE","请假"),
-    DROP_OUT("DROP_OUT","退学");
+    DROP_OUT("DROP_OUT","退学"),
+    LATE("LATE","迟到");
 
     private String code;
 

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

@@ -2037,7 +2037,8 @@ public class ExportServiceImpl implements ExportService {
             	
             	currentFee = row.getServiceFee();
                 
-				if (currentFee == null || currentFee.floatValue() == 0) {
+            	//兼容2022年之前的数据
+				if (currentFee == null || (currentFee.floatValue() == 0 && row.getCreateTime().before(DateUtil.stringToDate("2022-01-01 00:00:00")))) {
 					transferFee = serviceChargeMap.get(row.getOrderNo());
 					if (transferFee == null) {
 						transferFee = BigDecimal.ZERO;

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

@@ -327,7 +327,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         if (byStudentAndCourseHomewok.getIsReplied() == YesOrNoEnum.YES && Integer.valueOf(1).equals(byStudentAndCourseHomewok.getIsRepliedTimely())) {
             return true;
         }
-        if (hours >= 0 && hours <= 12) {
+        if (hours >= 0 && hours <= 24) {
             byStudentAndCourseHomewok.setIsRepliedTimely(1);
         }
         CourseHomework byTeacherAndCourseHomewok = courseHomeworkDao.findByTeacherAndCourseHomewok(courseHomeworkId, teacherId);

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

@@ -4523,6 +4523,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             for (StudentPaymentOrder studentPaymentOrder : studentPaymentOrders) {
                 //生成账户资金明细
                 if (studentPaymentOrder.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
+                    if(Objects.equals("关闭订单,实际支付成功,退到用户余额",studentPaymentOrder.getMemo())){
+                        continue;
+                    }
                     sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getExpectAmount());
                     SysUserCashAccount sysUserCashAccount = sysUserCashAccountService.get(studentPaymentOrder.getUserId());
                     SysUserCashAccountDetail sysUserIncomeCashAccountDetail = new SysUserCashAccountDetail();