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

@@ -120,7 +120,9 @@ public class TenantAccountRecordImportAnalysis extends DataAnalysis<TenantAccoun
             if (StringUtils.isBlank(item.getOrderNo()) || !tenantAccountRecord.getOrderNo().equals(item.getOrderNo())) {
                 ret += "订单号无效:" + item.getOrderNo();
             }
-
+            if (StringUtils.isBlank(item.getSettlement()) || !Lists.newArrayList("是","否").contains(item.getSettlement())) {
+                ret += "是否完成结算无效:" + item.getSettlement();
+            }
             if (StringUtils.isNotEmpty(ret)) {
                 verifyDataMap.put(item.getRowIndex(), ret);
                 ret = ""; // 重置数据状态

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

@@ -116,34 +116,48 @@ public class TenantAccountRecordServiceImpl extends ServiceImpl<TenantAccountRec
         if (CollectionUtils.isEmpty(importList)) {
             return;
         }
-        // 过滤出结算成功的
-        List<TenantAccountRecordImport> collect = importList.stream().filter(o -> o.getPostStatus().equals(PostStatusEnum.RECORDED)).collect(Collectors.toList());
+        // 过滤为空的
+        List<TenantAccountRecordImport> collect = importList.stream().filter(o -> o.getPostStatus() == null).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(collect)) {
             return;
         }
-
-        // id 集合
-        List<String> ids = collect.stream().map(o -> o.getId()).collect(Collectors.toList());
-        List<TenantAccountRecord> list = this.lambdaQuery()
-                .in(TenantAccountRecord::getId, ids)
-                .list();
-        if (CollectionUtils.isEmpty(list)) {
-            return;
+        // 过滤出结算成功的
+        List<String> successIds = collect.stream().filter(o -> PostStatusEnum.RECORDED.getCode().equals(o.getSettlement())).map(TenantAccountRecordImport::getId).collect(Collectors.toList());
+        List<String> waitIds = collect.stream().filter(o -> PostStatusEnum.WAIT.getCode().equals(o.getSettlement())).map(TenantAccountRecordImport::getId).collect(Collectors.toList());
+
+        if (CollectionUtils.isNotEmpty(successIds)) {
+            List<TenantAccountRecord> list = this.lambdaQuery()
+                    .in(TenantAccountRecord::getId, successIds)
+                    .list();
+            this.lambdaUpdate()
+                    .in(TenantAccountRecord::getId, successIds)
+                    .set(TenantAccountRecord::getPostStatus,PostStatusEnum.RECORDED)
+                    .update();
+
+            // 平台支出ID集合
+            List<Long> platformCashAccountRecordIds = list.stream().map(o -> o.getPlatformCashAccountRecordId()).collect(Collectors.toList());
+
+            platformCashAccountRecordService.lambdaUpdate()
+                    .in(PlatformCashAccountRecord::getId,platformCashAccountRecordIds)
+                    .set(PlatformCashAccountRecord::getPostStatus,PostStatusEnum.RECORDED)
+                    .update();
+        }
+        if (CollectionUtils.isNotEmpty(waitIds)) {
+            List<TenantAccountRecord> list = this.lambdaQuery()
+                    .in(TenantAccountRecord::getId, waitIds)
+                    .list();
+            this.lambdaUpdate()
+                    .in(TenantAccountRecord::getId, waitIds)
+                    .set(TenantAccountRecord::getPostStatus,PostStatusEnum.WAIT)
+                    .update();
+
+            // 平台支出ID集合
+            List<Long> platformCashAccountRecordIds = list.stream().map(o -> o.getPlatformCashAccountRecordId()).collect(Collectors.toList());
+
+            platformCashAccountRecordService.lambdaUpdate()
+                    .in(PlatformCashAccountRecord::getId,platformCashAccountRecordIds)
+                    .set(PlatformCashAccountRecord::getPostStatus,PostStatusEnum.WAIT)
+                    .update();
         }
-
-        this.lambdaUpdate()
-                .in(TenantAccountRecord::getId, ids)
-                .set(TenantAccountRecord::getPostStatus,PostStatusEnum.RECORDED)
-                .update();
-
-        // 平台支出ID集合
-        List<Long> platformCashAccountRecordIds = list.stream().map(o -> o.getPlatformCashAccountRecordId()).collect(Collectors.toList());
-
-        platformCashAccountRecordService.lambdaUpdate()
-                .in(PlatformCashAccountRecord::getId,platformCashAccountRecordIds)
-                .set(PlatformCashAccountRecord::getPostStatus,PostStatusEnum.RECORDED)
-                .update();
-
-
     }
 }