|
@@ -1,19 +1,127 @@
|
|
package com.ym.mec.biz.service.impl;
|
|
package com.ym.mec.biz.service.impl;
|
|
|
|
|
|
|
|
+import java.io.IOException;
|
|
|
|
+import java.math.BigDecimal;
|
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
+import java.util.Arrays;
|
|
|
|
+import java.util.Collections;
|
|
|
|
+import java.util.Date;
|
|
|
|
+import java.util.HashMap;
|
|
|
|
+import java.util.HashSet;
|
|
|
|
+import java.util.List;
|
|
|
|
+import java.util.Map;
|
|
|
|
+import java.util.Set;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
+
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
|
+import org.springframework.transaction.annotation.Propagation;
|
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
|
+
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.TypeReference;
|
|
import com.alibaba.fastjson.TypeReference;
|
|
import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
import com.ym.mec.auth.api.client.SysUserFeignService;
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
import com.ym.mec.auth.api.entity.SysUserRole;
|
|
import com.ym.mec.auth.api.entity.SysUserRole;
|
|
-import com.ym.mec.biz.dal.dao.*;
|
|
|
|
-import com.ym.mec.biz.dal.dto.*;
|
|
|
|
-import com.ym.mec.biz.dal.entity.*;
|
|
|
|
|
|
+import com.ym.mec.biz.dal.dao.ChargeTypeDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.ClassGroupDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.ClassGroupStudentMapperDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.CooperationOrganDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.CourseScheduleDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.CourseScheduleStudentPaymentDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.CourseScheduleTeacherSalaryDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.EmployeeDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.MusicGroupBuildLogDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.MusicGroupDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDetailDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentEntitiesDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.MusicGroupPurchaseListDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.MusicGroupQuitDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.MusicGroupSubjectGoodsGroupDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.MusicGroupSubjectPlanDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.OrganizationDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.SchoolDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.SporadicChargeInfoDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.StudentDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.StudentPaymentOrderDetailDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.SysConfigDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.TeacherAttendanceDao;
|
|
|
|
+import com.ym.mec.biz.dal.dao.TeacherDao;
|
|
|
|
+import com.ym.mec.biz.dal.dto.BasicUserDto;
|
|
|
|
+import com.ym.mec.biz.dal.dto.CourseFormDto;
|
|
|
|
+import com.ym.mec.biz.dal.dto.CourseScheduleTeachersDto;
|
|
|
|
+import com.ym.mec.biz.dal.dto.HighClassGroupDto;
|
|
|
|
+import com.ym.mec.biz.dal.dto.MusicCardDto;
|
|
|
|
+import com.ym.mec.biz.dal.dto.RegisterPayDto;
|
|
|
|
+import com.ym.mec.biz.dal.dto.SporadicPayDto;
|
|
|
|
+import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
|
|
|
|
+import com.ym.mec.biz.dal.dto.SubjectRegisterDto;
|
|
|
|
+import com.ym.mec.biz.dal.dto.UpdateExpectedNumDto;
|
|
|
|
+import com.ym.mec.biz.dal.entity.ApprovalStatus;
|
|
|
|
+import com.ym.mec.biz.dal.entity.ChargeType;
|
|
|
|
+import com.ym.mec.biz.dal.entity.ClassGroup;
|
|
|
|
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
|
|
|
|
+import com.ym.mec.biz.dal.entity.CourseSchedule;
|
|
|
|
+import com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary;
|
|
|
|
+import com.ym.mec.biz.dal.entity.Goods;
|
|
|
|
+import com.ym.mec.biz.dal.entity.MusicGroup;
|
|
|
|
+import com.ym.mec.biz.dal.entity.MusicGroupBuildLog;
|
|
|
|
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
|
|
import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.FeeType;
|
|
import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.FeeType;
|
|
|
|
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
|
|
|
|
+import com.ym.mec.biz.dal.entity.MusicGroupPurchaseList;
|
|
|
|
+import com.ym.mec.biz.dal.entity.MusicGroupQuit;
|
|
|
|
+import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
|
|
import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
|
|
import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
|
|
-import com.ym.mec.biz.dal.enums.*;
|
|
|
|
|
|
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
|
|
|
|
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
|
|
|
|
+import com.ym.mec.biz.dal.entity.Organization;
|
|
|
|
+import com.ym.mec.biz.dal.entity.School;
|
|
|
|
+import com.ym.mec.biz.dal.entity.SporadicChargeInfo;
|
|
|
|
+import com.ym.mec.biz.dal.entity.Student;
|
|
|
|
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
|
|
|
|
+import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
|
|
|
|
+import com.ym.mec.biz.dal.entity.StudentRegistration;
|
|
|
|
+import com.ym.mec.biz.dal.entity.SysUserCashAccount;
|
|
|
|
+import com.ym.mec.biz.dal.entity.SysUserCashAccountDetail;
|
|
|
|
+import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
|
|
|
|
+import com.ym.mec.biz.dal.enums.DealStatusEnum;
|
|
|
|
+import com.ym.mec.biz.dal.enums.GoodsType;
|
|
|
|
+import com.ym.mec.biz.dal.enums.GroupType;
|
|
|
|
+import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
|
|
|
|
+import com.ym.mec.biz.dal.enums.MessageTypeEnum;
|
|
|
|
+import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
|
|
|
|
+import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
|
|
|
|
+import com.ym.mec.biz.dal.enums.OrderTypeEnum;
|
|
|
|
+import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
|
|
|
|
+import com.ym.mec.biz.dal.enums.PlatformCashAccountDetailTypeEnum;
|
|
|
|
+import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
|
|
|
|
+import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
|
|
|
|
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
|
|
import com.ym.mec.biz.dal.page.MusicGroupQueryInfo;
|
|
import com.ym.mec.biz.dal.page.MusicGroupQueryInfo;
|
|
-import com.ym.mec.biz.service.*;
|
|
|
|
|
|
+import com.ym.mec.biz.service.ClassGroupService;
|
|
|
|
+import com.ym.mec.biz.service.ClassGroupStudentMapperService;
|
|
|
|
+import com.ym.mec.biz.service.GoodsService;
|
|
|
|
+import com.ym.mec.biz.service.MusicGroupPaymentCalenderService;
|
|
|
|
+import com.ym.mec.biz.service.MusicGroupService;
|
|
|
|
+import com.ym.mec.biz.service.MusicGroupSubjectGoodsGroupService;
|
|
|
|
+import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
|
|
|
|
+import com.ym.mec.biz.service.PayService;
|
|
|
|
+import com.ym.mec.biz.service.StudentPaymentOrderDetailService;
|
|
|
|
+import com.ym.mec.biz.service.StudentPaymentOrderService;
|
|
|
|
+import com.ym.mec.biz.service.StudentPaymentRouteOrderService;
|
|
|
|
+import com.ym.mec.biz.service.StudentRegistrationService;
|
|
|
|
+import com.ym.mec.biz.service.SysConfigService;
|
|
|
|
+import com.ym.mec.biz.service.SysMessageService;
|
|
|
|
+import com.ym.mec.biz.service.SysUserCashAccountDetailService;
|
|
|
|
+import com.ym.mec.biz.service.SysUserCashAccountService;
|
|
import com.ym.mec.common.dal.BaseDAO;
|
|
import com.ym.mec.common.dal.BaseDAO;
|
|
import com.ym.mec.common.entity.ImGroupMember;
|
|
import com.ym.mec.common.entity.ImGroupMember;
|
|
import com.ym.mec.common.entity.ImGroupModel;
|
|
import com.ym.mec.common.entity.ImGroupModel;
|
|
@@ -27,18 +135,6 @@ import com.ym.mec.util.collection.MapUtil;
|
|
import com.ym.mec.util.date.DateUtil;
|
|
import com.ym.mec.util.date.DateUtil;
|
|
import com.ym.mec.util.http.HttpUtil;
|
|
import com.ym.mec.util.http.HttpUtil;
|
|
|
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
|
-import org.springframework.transaction.annotation.Propagation;
|
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
|
-
|
|
|
|
-import java.io.IOException;
|
|
|
|
-import java.math.BigDecimal;
|
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
|
-import java.util.*;
|
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
-
|
|
|
|
@Service
|
|
@Service
|
|
public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> implements MusicGroupService {
|
|
public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> implements MusicGroupService {
|
|
|
|
|
|
@@ -1935,13 +2031,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
courseScheduleTeacherSalary.setUpdateTime(new Date());
|
|
courseScheduleTeacherSalary.setUpdateTime(new Date());
|
|
courseScheduleTeacherSalaryDao.update(courseScheduleTeacherSalary);
|
|
courseScheduleTeacherSalaryDao.update(courseScheduleTeacherSalary);
|
|
}
|
|
}
|
|
- Teacher teacher = teacherDao.get(teacherId);
|
|
|
|
- MusicGroup musicGroup = musicGroupDao.get(classGroupDao.findByCourseSchedule(courseScheduleId.intValue(), 0).getMusicGroupId());
|
|
|
|
- Set<Integer> roleIds = new HashSet<>(1);
|
|
|
|
- roleIds.add(SysUserRole.SECTION_MANAGER);
|
|
|
|
-
|
|
|
|
- sysMessageService.batchSeoMessage(musicGroupDao.queryUserIdByRoleId(roleIds, musicGroup.getOrganId()), MessageTypeEnum.BACKSTAGE_TEACHER_AMOUNT_CHANGE, "",
|
|
|
|
- teacher.getRealName(), musicGroup.getName(), scope.equals("all") ? "所有" : "本次");
|
|
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|