Merge branch 'feature/0721-tenant' into develop

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/execl/analysis/TenantAccountRecordImportAnalysis.java

@@ -101,7 +101,7 @@ public class TenantAccountRecordImportAnalysis extends DataAnalysis<TenantAccoun
             // 课件信息校验
             tenantAccountRecord = recordMap.get(item.getId());
             if (Objects.isNull(tenantAccountRecord)) {
-                ret += "流水记录编号无效:" + item.getId();
+                ret += "流水记录编号无效:" + (StringUtils.isBlank(item.getId())?"不能为空":item.getId());
                 if (StringUtils.isNotEmpty(ret)) {
                     verifyDataMap.put(item.getRowIndex(), ret);
                     ret = ""; // 重置数据状态
@@ -111,17 +111,17 @@ public class TenantAccountRecordImportAnalysis extends DataAnalysis<TenantAccoun
 
             // 检测机构编号，金额，订单号，结算状态
             if (StringUtils.isBlank(item.getTenantId()) || !tenantAccountRecord.getTenantId().toString().equals(item.getTenantId())) {
-                ret += "机构编号无效:" + item.getTenantId();
+                ret += "机构编号无效:" + (StringUtils.isBlank(item.getTenantId())?"不能为空":item.getTenantId());
             }
 
             if (StringUtils.isBlank(item.getTransAmount()) || tenantAccountRecord.getTransAmount().compareTo(new BigDecimal(item.getTransAmount())) != 0) {
-                ret += "交易金额错误:" + item.getTransAmount();
+                ret += "交易金额错误:" + (StringUtils.isBlank(item.getTransAmount())?"不能为空":item.getTransAmount());
             }
             if (StringUtils.isBlank(item.getOrderNo()) || !tenantAccountRecord.getOrderNo().equals(item.getOrderNo())) {
-                ret += "订单号无效:" + item.getOrderNo();
+                ret += "订单号无效:" + (StringUtils.isBlank(item.getOrderNo())?"不能为空":item.getOrderNo());
             }
             if (StringUtils.isBlank(item.getSettlement()) || !Lists.newArrayList("是","否").contains(item.getSettlement())) {
-                ret += "是否完成结算无效:" + item.getSettlement();
+                ret += "是否完成结算无效:" + (StringUtils.isBlank(item.getSettlement())?"不能为空":item.getSettlement());
             }
             if (StringUtils.isNotEmpty(ret)) {
                 verifyDataMap.put(item.getRowIndex(), ret);

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

@@ -117,7 +117,7 @@ public class TenantAccountRecordServiceImpl extends ServiceImpl<TenantAccountRec
             return;
         }
         // 过滤为空的
-        List<TenantAccountRecordImport> collect = importList.stream().filter(o -> o.getPostStatus() == null).collect(Collectors.toList());
+        List<TenantAccountRecordImport> collect = importList.stream().filter(o -> o.getPostStatus() != null).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(collect)) {
             return;
         }

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

@@ -476,34 +476,39 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
         if (totalErrSize > 0) {
             StringBuilder errMsg = new StringBuilder("");
             errMsg.append("导入失败，共").append(totalErrSize).append("条错误信息~");
+            List<String> errData = new ArrayList<>();
             if (!phone_err_lines.isEmpty()) {
-                errMsg.append("\n");
+                StringBuilder err = new StringBuilder("");
                 String errLines = phone_err_lines.stream().map(String::valueOf).collect(Collectors.joining("、"));
-                errMsg.append("第").append(errLines).append("行错误，").append(phone_err);
+                err.append("第").append(errLines).append("行错误，").append(phone_err);
+                errData.add(err.toString());
             }
 
             if (!code_send_lines.isEmpty()) {
-                errMsg.append("\n");
+                StringBuilder err = new StringBuilder("");
                 String errLines = code_send_lines.stream().map(String::valueOf).collect(Collectors.joining("、"));
-                errMsg.append("第").append(errLines).append("行错误，").append(errLines).append(code_send);
+                err.append("第").append(errLines).append("行错误，").append(errLines).append(code_send);
+                errData.add(err.toString());
             }
 
             if (!code_not_exist_lines.isEmpty()) {
-                errMsg.append("\n");
+                StringBuilder err = new StringBuilder("");
                 String errLines = code_not_exist_lines.stream().map(String::valueOf).collect(Collectors.joining("、"));
-                errMsg.append("第").append(errLines).append("行错误，").append(code_not_exist);
+                err.append("第").append(errLines).append("行错误，").append(code_not_exist);
+                errData.add(err.toString());
             }
 
             if (!code_repeat_lines.isEmpty()) {
-                errMsg.append("\n");
+                StringBuilder err = new StringBuilder("");
                 List<String> lineErr = new ArrayList<>();
                 for (List<Integer> value : code_repeat_lines.values()) {
                     String errLines = value.stream().map(String::valueOf).collect(Collectors.joining("、"));
                     lineErr.add("第" + errLines + "行");
                 }
-                errMsg.append(String.join(",", lineErr)).append("行错误，").append(code_repeat);
+                err.append(String.join(",", lineErr)).append("行错误，").append(code_repeat);
+                errData.add(err.toString());
             }
-            throw new BizException(errMsg.toString());
+            throw new BizException(errMsg.toString(), errData);
         }
 
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -31,7 +31,6 @@
         , t.tenant_id_ as tenantId
         , t.create_time_ as `createTime`
         , t.update_time_ as `updateTime`
-        , t.avatar_ as `avatar`
         </sql>
     <update id="setSubject">
         update student set subject_id_ = #{subjectIds},update_time_ = now() where user_id_ = #{id}
@@ -42,6 +41,7 @@
             <include refid="baseColumns"/>,
             if(u.lock_flag_ = 0 and t.lock_flag_ = 0,0,1) as lockFlag,
             u.avatar_ as userAvatar,
+            u.avatar_ as avatar,
             u.real_name_ as realName,
             u.id_card_no_ as idCardNo,
             u.username_ as username,
@@ -66,6 +66,7 @@
         SELECT
             <include refid="baseColumns"/>,
             if(u.lock_flag_ = 0 and t.lock_flag_ = 0,0,1) as lockFlag,
+            u.avatar_ as avatar,
             u.real_name_ as realName,
             u.id_card_no_ as idCardNo,
             u.username_ as username,
@@ -89,6 +90,7 @@
             <include refid="baseColumns"/>,
             if(u.lock_flag_ = 0 and t.lock_flag_ = 0,0,1) as lockFlag,
             u.avatar_ as userAvatar,
+            u.avatar_ as avatar,
             u.username_ as username,
             u.gender_ as gender,
             u.birthdate_ as birthdate,
@@ -276,7 +278,7 @@
     <select id="queryMyFollow" resultMap="queryMyFollowResult">
         SELECT
             s.teacher_id_ as userId,
-            tr.avatar_ as avatar,
+            u.avatar_ as avatar,
             u.username_ as userName,
             u.real_name_ as realName,
             u.gender_ as gender,

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -99,7 +99,7 @@
         u.username_ as username,
         u.phone_ as phone,
         u.real_name_ as realName,
-        if (t.avatar_ = '' OR t.avatar_ IS NULL, u.avatar_, t.avatar_) as avatar,
+        u.avatar_ as avatar,
         u.birthdate_ as birthdate,
         u.gender_ as gender,
         (case when t.membership_end_time_ >= now() then 1 else 0 end) isVip,
@@ -227,7 +227,7 @@
         SELECT
         <include refid="baseColumns"/>,
         if(u.lock_flag_ = 0 and t.lock_flag_ = 0,0,1) as lockFlag,
-        if(t.avatar_ = '' OR t.avatar_ = NULL, u.avatar_, t.avatar_) as avatar,
+        u.avatar_ as avatar,
         u.username_ as username,
         u.gender_ as `gender`,
         u.birthdate_ as birthdate,