Merge remote-tracking branch 'origin/master'

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

@@ -671,23 +671,31 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             classGroupTeacherSalaryDao.insert(newClassGroupTeacherSalary);
         }
 
+        TeacherDefaultVipGroupSalary teacherDefaultVipGroupSalary = teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(vipGroup.getUserId(), vipGroup.getVipGroupCategoryId());
+
         BigDecimal onlineTeacherSalary,
                 offlineTeacherSalary;
 
         onlineTeacherSalary=classGroupTeacherSalary.getOnlineClassesSalary();
+        if(Objects.isNull(onlineTeacherSalary)){
+            onlineTeacherSalary=teacherDefaultVipGroupSalary.getOnlineClassesSalary();
+        }
         offlineTeacherSalary=classGroupTeacherSalary.getSalary();
+        if(Objects.isNull(offlineTeacherSalary)){
+            offlineTeacherSalary=teacherDefaultVipGroupSalary.getOfflineClassesSalary();
+        }
 
         VipGroupCategory vipGroupCategory = vipGroupCategoryDao.get(vipGroup.getVipGroupCategoryId().intValue());
 
         BigDecimal studentNumDecimal = new BigDecimal(studentNum);
         BigDecimal oldStudentNumDecimal = new BigDecimal(vipGroupCategory.getStudentNum());
 
-        if(Objects.nonNull(onlineTeacherSalary)){
+        if(Objects.nonNull(onlineTeacherSalary)||onlineTeacherSalary.compareTo(BigDecimal.ZERO)<=0){
             onlineTeacherSalary = onlineTeacherSalary
                     .divide(oldStudentNumDecimal, CommonConstants.DECIMAL_PLACE,BigDecimal.ROUND_DOWN)
                     .multiply(studentNumDecimal).setScale(0, BigDecimal.ROUND_HALF_UP);
         }
-        if(Objects.nonNull(offlineTeacherSalary)){
+        if(Objects.nonNull(offlineTeacherSalary)||offlineTeacherSalary.compareTo(BigDecimal.ZERO)<=0){
             offlineTeacherSalary = offlineTeacherSalary
                     .divide(oldStudentNumDecimal,CommonConstants.DECIMAL_PLACE,BigDecimal.ROUND_DOWN)
                     .multiply(studentNumDecimal).setScale(0,BigDecimal.ROUND_HALF_UP);

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

@@ -133,7 +133,7 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 		tenantPaymentOrder.setActivitiesId(activitiesId);
 		tenantPaymentOrderDao.insert(tenantPaymentOrder);
 
-		String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
+		String baseApiUrl = sysConfigDao.findConfigValue("teacher_base_url");
 
 		// 分类费用 course，instrument，accessories，other
 		Map<String, BigDecimal> classFee = new HashMap<>();
@@ -145,7 +145,7 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 		try {
 
 			Map<String, Object> payMap = payService.getPayMap(tenantPaymentOrder.getExpectAmount(), tenantPaymentOrder.getOrderNo(), baseApiUrl
-					+ "/api-teacher/teacherOrder/notify", baseApiUrl + "/api-teacher/teacherOrder/paymentResult?orderNo=" + tenantPaymentOrder.getOrderNo(),
+					+ "/api-teacher/teacherOrder/notify", baseApiUrl + "/#/paymentResult?orderNo=" + tenantPaymentOrder.getOrderNo(),
 					"商户入驻", "商户充值", userId, classFee, organId);
 
 			Map<String, BigDecimal> routingFee = (Map<String, BigDecimal>) payMap.get("routingFee");

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

@@ -1076,7 +1076,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		List<ClassGroupStudentMapper> classGroupStudents = classGroupStudentMapperDao.findByClassGroup(classGroup.getId());
 
 		List<ImGroupMember> imGroupMemberList = new ArrayList<>();
-		imGroupMemberList.add(new ImGroupMember(vipGroupApplyBaseInfoDto.getEducationalTeacherId().toString()));
+		if(Objects.nonNull(vipGroupApplyBaseInfoDto.getEducationalTeacherId())){
+            imGroupMemberList.add(new ImGroupMember(vipGroupApplyBaseInfoDto.getEducationalTeacherId().toString()));
+        }
 		imGroupMemberList.add(new ImGroupMember(vipGroupApplyBaseInfoDto.getUserId().toString()));
 		//生成学生单课缴费信息
 		for (ClassGroupStudentMapper classGroupStudent : classGroupStudents) {

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -52,14 +52,15 @@
         <result column="email_" property="email"/>
         <result column="im_token_" property="imToken"/>
         <result column="subject_name_" property="splitSubjectName"/>
+        <result column="id_card_no_" property="idCardNo"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="Teacher">
         SELECT t.id_,t.organ_id_ teacher_organ_id_,t.job_type_,t.job_nature_,t.is_probation_period_,t.education_background_,t.graduate_school_,t.graduate_school_,
         t.technical_titles_,t.work_unit_,t.subject_id_,t.entry_date_,t.certificate_type_,t.certificate_num_,t.flow_organ_range_,t.update_time_,
-        t.create_time_,t.introduction_,t.demission_date_,t.is_support_course_schedule_rewards_rules_,t.is_support_extra_practice_lesson_,t.lecture_num_,
-        su.real_name_,su.password_,su.salt_,su.phone_,su.avatar_,
+        t.create_time_,t.introduction_,t.demission_date_,t.is_support_course_schedule_rewards_rules_,t.is_support_extra_practice_lesson_,t.lecture_num_,t.idcard_front_img_,t.idcard_back_img_,t.idcard_hand_img_,
+        su.real_name_,su.id_card_no_,su.password_,su.salt_,su.phone_,su.avatar_,
         su.lock_flag_,su.del_flag_,su.wx_openid_,su.qq_openid_,su.user_type_,
         su.gender_,su.nation_,su.birthdate_,su.email_,su.im_token_,su.username_,su.organ_id_
         FROM teacher t

mec-teacher/src/main/java/com/ym/mec/teacher/controller/CourseGroupController.java

@@ -68,6 +68,12 @@ public class CourseGroupController extends BaseController {
         return succeed(coursesGroupService.findTeacherCourseGroups(sysUser.getId(),queryInfo));
     }
 
+    @ApiOperation(value = "获取课程对应班级头部信息")
+    @GetMapping("/getGroupHeadInfo")
+    public HttpResponseResult getGroupHeadInfo(Long courseScheduleId){
+        return succeed(courseScheduleId);
+    }
+
     @ApiOperation(value = "获取课程组下指定教师的课表")
     @GetMapping("/findGroupCourses")
     public HttpResponseResult findGroupCourses(GroupCourseScheduleQueryInfo queryInfo){