update

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

@@ -2265,6 +2265,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         	//获取数据库中的记录
             CourseSchedule oldCourseSchedule = oldCourseScheduleMap.get(newCourseSchedule.getId());
 
+            if (Objects.isNull(newCourseSchedule.getGroupType())) {
+                newCourseSchedule.setGroupType(oldCourseSchedule.getGroupType());
+            }
+            
             //课程是否已结算
             int settlementNum = courseScheduleTeacherSalaryDao.checkCourseIsSettlement(oldCourseSchedule.getId().intValue());
             if (settlementNum > 0) {
@@ -2309,10 +2313,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 newCourseSchedule.setEndClassTime(endClassTime);
             }*/
 
-            if (Objects.isNull(newCourseSchedule.getGroupType())) {
-                newCourseSchedule.setGroupType(oldCourseSchedule.getGroupType());
-            }
-
             if(Objects.isNull(newCourseSchedule.getMusicGroupId())){
                 newCourseSchedule.setMusicGroupId(oldCourseSchedule.getMusicGroupId());
             }

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

@@ -149,8 +149,8 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 		try {
 
 			Map<String, Object> payMap = payService.getPayMap(tenantPaymentOrder.getExpectAmount(), tenantPaymentOrder.getOrderNo(), baseApiUrl
-					+ "/api-teacher/teacherOrder/notify", baseApiUrl + "/#/paymentResult?orderNo=" + tenantPaymentOrder.getOrderNo(), "商户入驻", "商户充值", userId,
-					classFee, organId);
+					+ "/api-teacher/teacherOrder/notify", baseApiUrl + "/api-teacher/studentOrder/paymentResult?orderNo=" + tenantPaymentOrder.getOrderNo(),
+					"商户入驻", "商户充值", userId, classFee, organId);
 
 			Map<String, BigDecimal> routingFee = (Map<String, BigDecimal>) payMap.get("routingFee");
 			tenantPaymentOrder.setComAmount(routingFee.get("COM"));