Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -2248,7 +2248,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         }
 
         for (ExtendTeacherBasicDto organAndSubjectTeacher : organAndSubjectTeachers) {
-            if (!includeTeacherIds.contains(organAndSubjectTeacher.getId())) {
+            if (!includeTeacherIds.contains(organAndSubjectTeacher.getId())
+                    && 1 == organAndSubjectTeacher.getIsSupportExtraPracticeLesson()) {
                 includeTeacherIds.add(organAndSubjectTeacher.getId());
             }
         }
@@ -3059,9 +3060,10 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             userMap.put(practiceGroup.getStudentId(), practiceGroup.getStudentId().toString());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PAY_PRACTICE_BUY_SUCCESS,
                     userMap, null, 0, null, "STUDENT", groupStartTime, groupEndTime, teacherName, drillTimesOnWeek, firstCourseStartTime);
-            SysUser student = sysUserFeignService.queryUserById(practiceGroup.getStudentId());
+//            SysUser student = sysUserFeignService.queryUserById(practiceGroup.getStudentId());
+            SysUser student = teacherDao.getUser(practiceGroup.getStudentId());
             Map<Integer, String> userPhoneMap = new HashMap<>();
-            userPhoneMap.put(practiceGroup.getStudentId(), student.getPhone().toString());
+            userPhoneMap.put(practiceGroup.getStudentId(), student.getPhone());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.PAY_PRACTICE_BUY_SUCCESS,
                     userPhoneMap, null, 0, null, "STUDENT", groupStartTime, groupEndTime, teacherName, drillTimesOnWeek, firstCourseStartTime);
         }catch (Exception e){
@@ -3177,7 +3179,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
         List<StudentPaymentOrder> ingOrders = statusOrderMap.get(DealStatusEnum.ING);
         if(CollectionUtils.isEmpty(ingOrders)||ingOrders.size()<=0){
-            throw new BizException("改订单支付失败，请重新购买");
+            throw new BizException("该订单支付失败，请重新购买");
         }else{
             for (StudentPaymentOrder ingOrder : ingOrders) {
                 ingOrder.setStatus(DealStatusEnum.CLOSE);
@@ -3199,7 +3201,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     orderNo,
                     baseApiUrl+"/api-student/studentOrder/notify",
                     baseApiUrl+"/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
-                    "vip课购买",
+                    "陪练课购买",
                     practiceGroup.getName(),
                     practiceGroup.getStudentId(),
                     classFee,
@@ -3207,6 +3209,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             );
 
             Map<String,BigDecimal> routingFee = (Map<String,BigDecimal>)payMap.get("routingFee");
+            newOrder.setStatus(DealStatusEnum.ING);
             newOrder.setOrderNo(orderNo);
             newOrder.setOrganId(practiceGroup.getOrganId());
             newOrder.setComAmount(routingFee.get("COM"));