Merge remote-tracking branch 'origin/feature/0721-tenant' into feature/0721-tenant

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;
         }