Merge branch 'zx_saas_payment_config_0218' of http://git.dayaedu.com/yonge/mec into dev

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

@@ -2241,23 +2241,18 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
         }
 
-        if (CollectionUtils.isNotEmpty(courseScheduleList)) {
+        if (courseScheduleList.size() > 0) {
             //检测新排课冲突
             courseScheduleService.checkNewCourseSchedules(courseScheduleList, false, false);
         }
 
         //老师结算表
-        if (CollectionUtils.isNotEmpty(courseScheduleTeacherSalaryList)) {
+        if (courseScheduleTeacherSalaryList.size() > 0) {
             courseScheduleTeacherSalaryService.batchInsert(courseScheduleTeacherSalaryList);
         }
         //学生结算表
-        if (CollectionUtils.isNotEmpty(courseScheduleList)){
-            Map<Long,BigDecimal> salaryMap = new HashMap<>();
-            if (CollectionUtils.isNotEmpty(courseScheduleTeacherSalaryList)) {
-                salaryMap = courseScheduleTeacherSalaryList.stream()
-                        .collect(Collectors.toMap(CourseScheduleTeacherSalary::getCourseScheduleId, CourseScheduleTeacherSalary::getExpectSalary));
-            }
-            courseScheduleStudentPaymentService.createForMusicGroup(musicGroupId, courseScheduleList, studentIdList,salaryMap);
+        if (courseScheduleList.size() > 0) {
+            courseScheduleStudentPaymentService.createForMusicGroup(musicGroupId, courseScheduleList, studentIdList);
             studentService.updateStudentServiceTag(null, studentIdList, YesOrNoEnum.YES.getCode());
         }
         //创建IM群组
@@ -2481,7 +2476,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             //3、将老师加入关联关系
             classGroupTeacherMapperService.getDao().classGroupTeachersInsert(classGroupTeacherMapperList);
             //创建IM群组
-//            addImGroup(classGroup, userIds, teacherIds);
+            addImGroup(classGroup, userIds, teacherIds);
         }
         //排课
         List<CourseSchedule> courseScheduleList = new ArrayList<>();
@@ -2523,12 +2518,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
             Integer musicGroupStudentClassAdjustId = classGroup4MixDto.getMusicGroupStudentClassAdjustId();
             //学生结算表
-            Map<Long,BigDecimal> salaryMap = new HashMap<>();
-            if (org.apache.commons.collections.CollectionUtils.isNotEmpty(courseScheduleTeacherSalaryList)) {
-                salaryMap = courseScheduleTeacherSalaryList.stream()
-                        .collect(Collectors.toMap(CourseScheduleTeacherSalary::getCourseScheduleId, CourseScheduleTeacherSalary::getExpectSalary));
-            }
-            courseScheduleStudentPaymentService.createForMusicGroup(courseScheduleList, studentIdList, musicGroupStudentClassAdjustId,salaryMap);
+            courseScheduleStudentPaymentService.createForMusicGroup(courseScheduleList, studentIdList, musicGroupStudentClassAdjustId);
             return classGroup;
         }
         return null;
@@ -2842,14 +2832,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
         if (!CollectionUtils.isEmpty(studentList)) {
             studentService.updateStudentServiceTag(null, studentIds, YesOrNoEnum.YES.getCode());
-            Map<Long,BigDecimal> salaryMap = new HashMap<>();
-            if (CollectionUtils.isNotEmpty(courseScheduleTeacherSalaryList)) {
-                //汇总同一节课课程课酬
-                salaryMap = courseScheduleTeacherSalaryList.stream().collect(Collectors.groupingBy(CourseScheduleTeacherSalary::getCourseScheduleId,
-                        Collectors.reducing(BigDecimal.ZERO, CourseScheduleTeacherSalary::getExpectSalary, BigDecimal::add)));
-            }
+
             //学生结算表
-            courseScheduleStudentPaymentService.createForMusicGroup(musicGroupId, courseScheduleList, studentIds,salaryMap);
+            courseScheduleStudentPaymentService.createForMusicGroup(musicGroupId, courseScheduleList, studentIds);
         }
         //学校端推送
         courseScheduleModifyLogService.pushSchoolCourseCreate(courseScheduleList.get(0),musicGroup);
@@ -3497,12 +3482,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
         //学生结算表
         if (!CollectionUtils.isEmpty(studentIdList)) {
-            Map<Long,BigDecimal> salaryMap = new HashMap<>();
-            if (CollectionUtils.isNotEmpty(courseScheduleTeacherSalaryList)) {
-                salaryMap = courseScheduleTeacherSalaryList.stream()
-                        .collect(Collectors.toMap(CourseScheduleTeacherSalary::getCourseScheduleId, CourseScheduleTeacherSalary::getExpectSalary));
-            }
-            courseScheduleStudentPaymentService.createForMusicGroup(musicGroupId, courseScheduleList, studentIdList,salaryMap);
+            courseScheduleStudentPaymentService.createForMusicGroup(musicGroupId, courseScheduleList, studentIdList);
             studentService.updateStudentServiceTag(null, studentIdList, YesOrNoEnum.YES.getCode());
         }
         return classGroup;

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

@@ -33,6 +33,7 @@ import org.apache.commons.lang.math.NumberUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
@@ -40,7 +41,6 @@ import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
@@ -55,53 +55,53 @@ import static com.ym.mec.biz.dal.enums.DealStatusEnum.SUCCESS;
 @Service
 public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRepair> implements StudentRepairService {
     private static final Logger log = LoggerFactory.getLogger(StudentRepairServiceImpl.class);
-    @Resource
+    @Autowired
     private StudentRepairDao studentRepairDao;
-    @Resource
+    @Autowired
     private SysUserFeignService sysUserFeignService;
-    @Resource
+    @Autowired
     private PayService payService;
-    @Resource
+    @Autowired
     private IdGeneratorService idGeneratorService;
-    @Resource
+    @Autowired
     private SysConfigDao sysConfigDao;
-    @Resource
+    @Autowired
     private StudentPaymentOrderService studentPaymentOrderService;
-    @Resource
+    @Autowired
     private StudentPaymentOrderDetailService studentPaymentOrderDetailService;
-    @Resource
+    @Autowired
     private MusicGroupDao musicGroupDao;
-    @Resource
+    @Autowired
     private SysUserCashAccountService sysUserCashAccountService;
-    @Resource
+    @Autowired
     private SysUserCashAccountDetailService sysUserCashAccountDetailService;
-    @Resource
+    @Autowired
     private SysMessageService sysMessageService;
-    @Resource
+    @Autowired
     private StudentService studentService;
-    @Resource
+    @Autowired
     private StudentPaymentRouteOrderService studentPaymentRouteOrderService;
-    @Resource
+    @Autowired
     private SellOrderService sellOrderService;
-    @Resource
+    @Autowired
     private StudentGoodsSellDao studentGoodsSellDao;
-    @Resource
+    @Autowired
     private StudentPaymentOrderAddressService studentPaymentOrderAddressService;
 
     @Lazy
-    @Resource
+    @Autowired
     private ContractService contractService;
-    @Resource
+    @Autowired
     private GoodsService goodsService;
-    @Resource
+    @Autowired
     private StudentInstrumentService studentInstrumentService;
-    @Resource
+    @Autowired
     private StudentGoodsSellService studentGoodsSellService;
-    @Resource
+    @Autowired
     private SysCouponCodeService sysCouponCodeService;
-    @Resource
+    @Autowired
     private TeacherService teacherService;
-    @Resource
+    @Autowired
     private MallFeignService mallFeignService;
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());