Merge branch 'feature/0721-tenant' into develop

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -464,13 +464,6 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
             if (!subjectNames.contains(student.getSubjectName())) {
                 errMsg.add(String.format("第%s行声部不支持", msgRowNo));
             }
-            try {
-                if(!StringUtils.isEmpty(student.getBirthday())){
-                    LocalDate.parse(student.getBirthday(), DateTimeFormatter.ISO_LOCAL_DATE);
-                }
-            }catch (Exception e) {
-                errMsg.add(String.format("第%s行生日格式错误", msgRowNo));
-            }
 
             if (errMsg.size() > 100) {
                 break;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -513,6 +513,10 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
                 userAccountService.save(userAccount);
             }
         } else {
+            // 如果机构解绑，更新机构ID为-1
+            if (Boolean.TRUE.equals(teacherSubmitReq.getBindTenant())) {
+                teacherSubmitReq.setTenantId(-1L);
+            }
             if (!teacher.getTenantId().equals(teacherSubmitReq.getTenantId())) {
                 TeacherWrapper.UpdateTenant updateTenant = new TeacherWrapper.UpdateTenant();
                 updateTenant.setTeacherId(teacher.getUserId());
@@ -997,10 +1001,15 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
                 }
             });
             imUserFriendService.delFriendByTenantId(teacher.getTenantId(), teacher.getUserId());
+        }else {
+            if (ESettlementFrom.TENANT.equals(teacher.getSettlementFrom())) {
+                // 解绑后，结算方式如果是机构，默认调整为老师
+                teacher.setSettlementFrom(ESettlementFrom.TEACHER);
+                teacher.setIsSettlement(true);
+            }
         }
 
         teacher.setTenantId(updateTenant.getTenantId());
-        teacher.setSettlementFrom(ESettlementFrom.TENANT);
         this.updateById(teacher);
 
         Optional<TenantUnbindRecord> first = tenantUnbindRecordMapper.getRecord(oldTenantId,

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantActivationCodeServiceImpl.java

@@ -320,7 +320,7 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
     public void importActiveCode(List<ExcelDataReaderProperty<TenantActivationCodeWrapper.ImportTemplate>> dataList,
                                  Long tenantId, Long userId, Long tenantAlbumPurchaseId) {
         if (dataList.isEmpty()) {
-            return;
+            throw new BizException("未解析到数据");
         }
         dataList.sort(Comparator.comparingInt(ExcelDataReaderProperty::getRowIndex));
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/StudentWrapper.java

@@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -147,8 +148,6 @@ public class StudentWrapper {
 
         private static final String PHONE_REG = "^1\\d{10}$";
 
-        private static final SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd");
-
         public List<String> checkValid() {
             ArrayList<String> errMsg = new ArrayList<>();
             if (StringUtils.isEmpty(userName)) {
@@ -169,7 +168,7 @@ public class StudentWrapper {
                     birthday = birthday.replaceAll("/", "-");
                 }
                 try {
-                    SDF.parse(birthday);
+                    LocalDate.parse(birthday, DateTimeFormatter.ISO_LOCAL_DATE);
                 } catch (Exception e) {
                     errMsg.add("出生日期格式错误");
                 }

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/StudentController.java

@@ -32,6 +32,7 @@ import com.yonge.toolset.utils.easyexcel.ExcelException;
 import com.yonge.toolset.utils.easyexcel.ExcelUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -52,6 +53,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+@Slf4j
 @RestController
 @RequestMapping("/student")
 @Api(value = "学生表", tags = "学生表")
@@ -189,8 +191,8 @@ public class StudentController extends BaseController {
             studentService.importStudentExcel(reader.getDataList(), user.getTenantId(), user.getId());
             return HttpResponseResult.succeed();
         } catch (ExcelException e) {
-            return HttpResponseResult.failed(BizHttpStatus.IMPORT.getCode(), e.getErrMsgList(),
-                    BizHttpStatus.IMPORT.getMsg());
+            log.error("导入学生失败：" + JSON.toJSONString(e.getErrMsgList()));
+            return HttpResponseResult.failed("文件解析失败");
         }
     }
 

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantActivationCodeController.java

@@ -182,6 +182,7 @@ public class TenantActivationCodeController extends BaseController {
         query.setActivationStatus(false);
         query.setTenantAlbumPurchaseId(Long.valueOf(orderNo));
         query.setSendStatus(EActivationCode.WAIT);
+        query.setActivationStatus(false);
         query.setPage(1);
         query.setRows(9999);
         IPage<TenantActivationCodeWrapper.TenantActivationCode> queryInfo =
@@ -292,8 +293,8 @@ public class TenantActivationCodeController extends BaseController {
                     tenantAlbumPurchaseId);
             return HttpResponseResult.succeed();
         } catch (ExcelException e) {
-            return HttpResponseResult.failed(BizHttpStatus.IMPORT.getCode(), e.getErrMsgList(),
-                    BizHttpStatus.IMPORT.getMsg());
+            log.error("导入激活码失败:"+JSON.toJSONString(e.getErrMsgList()));
+            return HttpResponseResult.failed("文件解析错误");
         }
     }