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

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

@@ -122,8 +122,8 @@ public class TenantAccountRecordServiceImpl extends ServiceImpl<TenantAccountRec
             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());
+        List<String> successIds = collect.stream().filter(o -> PostStatusEnum.RECORDED.equals(o.getPostStatus())).map(TenantAccountRecordImport::getId).collect(Collectors.toList());
+        List<String> waitIds = collect.stream().filter(o -> PostStatusEnum.WAIT.equals(o.getPostStatus())).map(TenantAccountRecordImport::getId).collect(Collectors.toList());
 
         if (CollectionUtils.isNotEmpty(successIds)) {
             List<TenantAccountRecord> list = this.lambdaQuery()