Merge remote-tracking branch 'origin/master_saas' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentVisit.java

@@ -132,6 +132,8 @@ public class StudentVisit extends BaseEntity {
     @Positive(message = "学生id必须大于0")
     private Integer studentId;
 
+    private String phone;
+
     /**
      * 老师id
      */

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/CouponDetailTypeEnum.java

@@ -95,16 +95,7 @@ public enum CouponDetailTypeEnum implements BaseEnum<String, CouponDetailTypeEnu
             case "CLOUD_TEACHER":
             case "CLOUD_TEACHER_PLUS":
                 return MEMBER.getCode();
-            case "MIX":
-            case "SINGLE":
-            case "TRAINING_MIX":
-            case "TRAINING_SINGLE":
-            case "HIGH":
-            case "COMPREHENSIVE":
-            case "ENLIGHTENMENT":
-            case "CLASSROOM":
-            case "HIGH_ONLINE":
-            case "MUSIC_NETWORK":
+            case "MUSIC":
                 return MUSIC.getCode();
             default:
                 return null;

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

@@ -267,9 +267,9 @@ public class StudentVisitServiceImpl extends BaseServiceImpl<Integer, StudentVis
                         } else {
                             objectMap.put(columnValue, row.get(s));
                         }
-                    } else if (columnValue.equals("studentId")) {
+                    } else if (columnValue.equals("phone")) {
                         if (StringUtils.isEmpty(row.get(s).toString())) {
-                            sb.append("第" + rowNum).append("行数据导入失败：学员编号不可为空;");
+                            sb.append("第" + rowNum).append("行数据导入失败：学员手机号不可为空;");
                             continue valueIsNull;
                         } else {
                             objectMap.put(columnValue, row.get(s));
@@ -311,6 +311,11 @@ public class StudentVisitServiceImpl extends BaseServiceImpl<Integer, StudentVis
                 }
                 try {
                     StudentVisit cost = JSONObject.parseObject(objectMap.toJSONString(), StudentVisit.class);
+                    SysUser user = teacherDao.getUserWithPhone(cost.getPhone());
+                    if(Objects.isNull(user) || !user.getUserType().contains("STUDENT")){
+                        throw new BizException("手机号{}不存在",cost.getPhone());
+                    }
+                    cost.setStudentId(user.getId());
                     StudentRegistration studentRegistration = studentRegistrationDao.queryByUserIdAndMusicGroupId(cost.getStudentId(), cost.getMusicGroupId());
                     if(Objects.isNull(studentRegistration)){
                         throw new BizException("学员{}不在乐团{}中，无需回访",cost.getStudentId(),cost.getMusicGroupId());

mec-web/src/main/resources/columnMapper.ini

@@ -125,7 +125,7 @@ ID = id
 
 [缴费中乐团批量回访]
 乐团编号 = musicGroupId
-学生编号 = studentId
+手机号 = phone
 回访日期 = visitTime
 学员情况 = overview
 家长反馈 = feedback