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

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

@@ -188,8 +188,10 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     CHILDREN_DAY_NOTICE_PUSH("CHILDREN_DAY_NOTICE_PUSH", "技能评测考级报名推送"),
     CHILDREN_DAY_NOTICE_MSG("CHILDREN_DAY_NOTICE_MSG", "技能评测考级报名短信"),
     NO_BUY_CLOUD_TEACHER_MSG("NO_BUY_CLOUD_TEACHER_MSG", "未购买买团练宝短信"),
+
     OA_NOTICE_PUSH("OA_NOTICE_PUSH", "待审批提醒"),
     OA_CC_NOTICE_PUSH("OA_CC_NOTICE_PUSH", "审批抄送提醒"),
+    OA_END_NOTICE_PUSH("OA_PASS_NOTICE_PUSH", "审批结束提醒"),
 
     //团练宝
     TRAIN_NO_RANK_STUDENT_PUSH("TRAIN_NO_RANK_STUDENT_PUSH", "团练宝训练提醒"),

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();