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

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CloudTeacherOrderDao.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.CloudTeacherActiveTargetDetailDto;
 import com.ym.mec.biz.dal.dto.CloudTeacherOrderDto;
+import com.ym.mec.biz.dal.dto.Mapper;
 import com.ym.mec.biz.dal.entity.CloudTeacherOrder;
 import com.ym.mec.biz.dal.entity.CloudTeacherStudent;
 import com.ym.mec.common.dal.BaseDAO;
@@ -107,7 +108,7 @@ public interface CloudTeacherOrderDao extends BaseDAO<Long, CloudTeacherOrder> {
     
     List<CloudTeacherOrder> queryByUserIdAndStatus(@Param("userId")Integer userId, @Param("status")Integer status);
 
-    List<String> findUserNameByOrderId(@Param("platformOrderId")Integer platformOrderId);
+    List<Mapper> findUserNameByOrderId(@Param("platformOrderId")Integer platformOrderId);
 
     void batchInsert(@Param("bean") CloudTeacherOrder cloudTeacherOrder, @Param("userIds") List<Integer> userIds);
 }

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

@@ -3,9 +3,12 @@ package com.ym.mec.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.CloudTeacherDao;
 import com.ym.mec.biz.dal.dao.CloudTeacherOrderDao;
 import com.ym.mec.biz.dal.dto.CloudTeacherOrderDto;
+import com.ym.mec.biz.dal.dto.Mapper;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
@@ -73,6 +76,8 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
     private SysMessageService sysMessageService;
     @Autowired
     private TenantInfoService tenantInfoService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
     @Override
     public boolean addStudents(CloudTeacherAddQueryInfo cloudTeacherAddQueryInfo) {
@@ -294,11 +299,10 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
 
     @Override
     public int sendSms(TenantOrderRecord record) {
-        List<String> orderUsers = cloudTeacherOrderDao.findUserNameByOrderId(record.getId());
+        List<Mapper> orderUsers = cloudTeacherOrderDao.findUserNameByOrderId(record.getId());
         Map<Integer, String> userPhones = new HashMap<>();
-        int i = 0;
-        for (String phone : orderUsers) {
-            userPhones.put(i++, phone);
+        for (Mapper mapper : orderUsers) {
+            userPhones.put((Integer) mapper.getKey(), mapper.getValue().toString());
         }
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.CLOUD_TEACHER_ORDER_SUCCESS, userPhones, null, 0, null, null);
         return 0;

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

@@ -1013,7 +1013,7 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         Map result = new HashMap();
         String practiceSubjectIdListConfig = sysTenantConfigService.getTenantConfigValue(SysConfigService.PRACTICE_SUBJECT_ID_LIST,tenantId);
         if(StringUtils.isEmpty(practiceSubjectIdListConfig)){
-            throw new BizException("未设置网管课可选分部，请联系老师");
+            throw new BizException("未设置网管课可选分部，请配置网管课可选分部。");
         }
         SysConfig practiceApplyIntervalTimeConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_APPLY_INTERVAL_TIME);
         SysConfig practiceCourseMinutesConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_COURSE_MINUTES);

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

@@ -271,7 +271,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         Map result = new HashMap(7);
         String practiceSubjectIdListConfig = sysTenantConfigService.getTenantConfigValue(SysConfigService.PRACTICE_SUBJECT_ID_LIST, tenantId);
         if (StringUtils.isEmpty(practiceSubjectIdListConfig)) {
-            throw new BizException("未设置网管课可选分部，请联系老师");
+            throw new BizException("请配置网管课可选分部。");
         }
 //        String practiceApplyStartTimeConfig = sysTenantConfigService.getTenantConfigValue(SysConfigService.PRACTICE_APPLY_START_TIME,tenantId);
 //        String practiceApplyEndTimeConfig = sysTenantConfigService.getTenantConfigValue(SysConfigService.PRACTICE_APPLY_END_TIME,tenantId);
@@ -302,7 +302,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     public Object getPracticeApplySubjects(Integer tenantId) {
         String practiceSubjectIdListConfig = sysTenantConfigService.getTenantConfigValue(SysConfigService.PRACTICE_SUBJECT_ID_LIST, tenantId);
         if (StringUtils.isEmpty(practiceSubjectIdListConfig)) {
-            throw new BizException("未设置网管课可选分部，请联系老师");
+            throw new BizException("请配置网管课可选分部。");
         }
         return subjectDao.findBySubjectByIdList(practiceSubjectIdListConfig);
     }
@@ -1218,7 +1218,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         Map result = new HashMap();
         String practiceSubjectIdListConfig = sysTenantConfigService.getTenantConfigValue(SysConfigService.PRACTICE_SUBJECT_ID_LIST, practiceGroup.getTenantId());
         if (StringUtils.isEmpty(practiceSubjectIdListConfig)) {
-            throw new BizException("未设置网管课可选分部，请联系老师");
+            throw new BizException("请配置网管课可选分部。");
         }
         if (Objects.isNull(practiceGroup.getSubjectId())
                 || !Arrays.asList(practiceSubjectIdListConfig.split(",")).contains(practiceGroup.getSubjectId().toString())) {
@@ -1803,7 +1803,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         Map result = new HashMap();
         String practiceSubjectIdListConfig = sysTenantConfigService.getTenantConfigValue(SysConfigService.PRACTICE_SUBJECT_ID_LIST, tenantId);
         if (StringUtils.isEmpty(practiceSubjectIdListConfig)) {
-            throw new BizException("未设置网管课可选分部，请联系老师");
+            throw new BizException("请配置网管课可选分部。");
         }
 //        String practiceApplyStartTimeConfig = sysTenantConfigService.getTenantConfigValue(SysConfigService.PRACTICE_APPLY_START_TIME,tenantId);
 //        String practiceApplyEndTimeConfig = sysTenantConfigService.getTenantConfigValue(SysConfigService.PRACTICE_APPLY_END_TIME,tenantId);

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

@@ -124,8 +124,12 @@
         where cto.platform_order_id_ = #{platformOrderId} and su.del_flag_ = 0
     </select>
 
-    <select id="findUserNameByOrderId" resultType="java.lang.String">
-        select su.phone_ as phone from cloud_teacher_order cto
+    <resultMap type="com.ym.mec.biz.dal.dto.Mapper" id="mapper">
+        <result column="userId" property="key"/>
+        <result column="phone" property="value"/>
+    </resultMap>
+    <select id="findUserNameByOrderId" resultMap="mapper">
+        select su.id_ as userId, su.phone_ as phone from cloud_teacher_order cto
         left join sys_user su on cto.student_id_ = su.id_
         where platform_order_id_ = #{platformOrderId} and su.del_flag_ = 0
     </select>