统一处理关单逻辑

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

@@ -2,11 +2,10 @@ package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.microsvc.toolkit.middleware.im.ImPluginContext;
-import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.microsvc.toolkit.middleware.im.ImPluginContext;
+import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
@@ -16,7 +15,6 @@ import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.dal.wrapper.LiveGroupWrapper;
 import com.ym.mec.biz.service.*;
-import com.ym.mec.biz.service.im.ImGroupCoreService;
 import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.dal.BaseDAO;
@@ -36,12 +34,13 @@ import com.ym.mec.util.date.DateUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.*;
@@ -65,113 +64,113 @@ import static com.ym.mec.biz.dal.enums.MusicGroupStatusEnum.PROGRESS;
 @Service
 public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup> implements ClassGroupService {
 
-    @Autowired
+    @Resource
     private ClassGroupDao classGroupDao;
-    @Autowired
+    @Resource
     private SchoolDao schoolDao;
-    @Autowired
+    @Resource
     private VipGroupDao vipGroupDao;
-    @Autowired
+    @Resource
     private TeacherAttendanceDao teacherAttendanceDao;
-    @Autowired
+    @Resource
     private MusicGroupDao musicGroupDao;
-    @Autowired
+    @Resource
     private PracticeGroupDao practiceGroupDao;
-    @Autowired
+    @Resource
     private CoursesGroupDao coursesGroupDao;
-    @Autowired
+    @Resource
     private MusicGroupBuildLogDao musicGroupBuildLogDao;
-    @Autowired
+    @Resource
     private ClassGroupRelationService classGroupRelationService;
-    @Autowired
+    @Resource
     private ClassGroupStudentMapperDao classGroupStudentMapperDao;
-    @Autowired
+    @Resource
     private ClassGroupStudentMapperService classGroupStudentMapperService;
-    @Autowired
+    @Resource
     private ClassGroupRelationDao classGroupRelationDao;
-    @Autowired
+    @Resource
     private ClassGroupTeacherMapperService classGroupTeacherMapperService;
-    @Autowired
+    @Resource
     private CourseScheduleDao courseScheduleDao;
-    @Autowired
+    @Resource
     private TeacherDefaultMusicGroupSalaryService teacherDefaultMusicGroupSalaryService;
-    @Autowired
+    @Resource
     private StudentRegistrationDao studentRegistrationDao;
-    @Autowired
+    @Resource
     private MusicGroupStudentFeeDao musicGroupStudentFeeDao;
-    @Autowired
+    @Resource
     private SysUserService sysUserService;
-    @Autowired
+    @Resource
     private SubjectService subjectService;
-    @Autowired
+    @Resource
     private CourseScheduleStudentPaymentDao courseScheduleStudentPaymentDao;
-    @Autowired
+    @Resource
     private CourseScheduleTeacherSalaryDao courseScheduleTeacherSalaryDao;
-    @Autowired
+    @Resource
     private StudentAttendanceDao studentAttendanceDao;
-    @Autowired
+    @Resource
     private CourseScheduleTeacherSalaryService courseScheduleTeacherSalaryService;
-    @Autowired
+    @Resource
     private StudentRegistrationService studentRegistrationService;
-    @Autowired
+    @Resource
     private ImGroupMemberService imGroupMemberService;
-    @Autowired
+    @Resource
     private ImGroupService imGroupService;
-    @Autowired
+    @Resource
     private ImUserFriendService imUserFriendService;
-    @Autowired
+    @Resource
     private CourseScheduleService courseScheduleService;
-    @Autowired
+    @Resource
     private CourseScheduleStudentPaymentService courseScheduleStudentPaymentService;
-    @Autowired
+    @Resource
     private CourseScheduleModifyLogService courseScheduleModifyLogService;
-    @Autowired
+    @Resource
     private StudentApplyRefundsDao studentApplyRefundsDao;
-    @Autowired
+    @Resource
     private RedisCache<String, Object> redisCache;
-    @Autowired
+    @Resource
     private ClassGroupService classGroupService;
-    @Autowired
+    @Resource
     private TeacherDao teacherDao;
-    @Autowired
+    @Resource
     private SysConfigDao sysConfigDao;
-    @Autowired
+    @Resource
     private SysTenantConfigService sysTenantConfigService;
-    @Autowired
+    @Resource
     private SubjectDao subjectDao;
-    @Autowired
+    @Resource
     private GroupDao groupDao;
-    @Autowired
+    @Resource
     private CourseScheduleEvaluateDao courseScheduleEvaluateDao;
-    @Autowired
+    @Resource
     private SysConfigService sysConfigService;
-    @Autowired
+    @Resource
     private StudentService studentService;
-    @Autowired
+    @Resource
     private MusicGroupPaymentCalenderCourseSettingsService musicGroupPaymentCalenderCourseSettingsService;
-    @Autowired
+    @Resource
     private OrganizationCourseUnitPriceSettingsDao organizationCourseUnitPriceSettingsDao;
-    @Autowired
+    @Resource
     private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
-    @Autowired
+    @Resource
     private MusicGroupPaymentCalenderService musicGroupPaymentCalenderService;
-    @Autowired
+    @Resource
     private MusicGroupStudentClassAdjustDao musicGroupStudentClassAdjustDao;
-    @Autowired
+    @Resource
     private MusicGroupPaymentCalenderDetailDao musicGroupPaymentCalenderDetailDao;
-    @Autowired
+    @Resource
     private MusicGroupQuitDao musicGroupQuitDao;
-    @Autowired
+    @Resource
     private MusicGroupSchoolTermStudentCourseDetailDao musicGroupSchoolTermStudentCourseDetailDao;
-    @Autowired
+    @Resource
     private MusicGroupSchoolTermCourseDetailDao musicGroupSchoolTermCourseDetailDao;
-    @Autowired
+    @Resource
     private CooperationOrganService cooperationOrganService;
-    @Autowired
+    @Resource
     private ClassGroupTeacherMapperDao classGroupTeacherMapperDao;
-    @Autowired
+    @Resource
     private ImPluginContext imPluginContext;
-    @Autowired
+    @Resource
     private ImLiveBroadcastRoomMemberService imLiveBroadcastRoomMemberService;
 
     @Override