浏览代码

fix(account): sync-all 翻页逻辑修复 + _can_batch 保护

alphah 2 周之前
父节点
当前提交
124b904c4c
共有 1 个文件被更改,包括 3 次插入5 次删除
  1. 3 5
      backend/app/plugin/module_payment/account/service.py

+ 3 - 5
backend/app/plugin/module_payment/account/service.py

@@ -903,7 +903,7 @@ class AccountService:
         ent_result = await auth.db.execute(ent_stmt)
         enterprises = ent_result.scalars().all()
 
-        if not enterprises and not _can_batch:
+        if not _can_batch:
             # 降级模式:直接查 DEALING 转账
             stmt = select(TransferModel).where(
                 TransferModel.status == TransferStatusEnum.DEALING.value,
@@ -1046,10 +1046,8 @@ class AccountService:
                     log.warning(f"全量同步 - 企业 {eid} 第 {page_num} 页异常: {e}")
                     break
 
-                # 翻页
-                current_page = getattr(batch_result, 'page_num', 0) or 0
-                total_pages = getattr(batch_result, 'total_page_count', 0) or 0
-                if current_page >= total_pages:
+                # 翻页:API 无 total_page_count,用返回条数判断
+                if len(consume_list) < page_size:
                     break
                 page_num += 1