|
@@ -903,7 +903,7 @@ class AccountService:
|
|
|
ent_result = await auth.db.execute(ent_stmt)
|
|
ent_result = await auth.db.execute(ent_stmt)
|
|
|
enterprises = ent_result.scalars().all()
|
|
enterprises = ent_result.scalars().all()
|
|
|
|
|
|
|
|
- if not enterprises and not _can_batch:
|
|
|
|
|
|
|
+ if not _can_batch:
|
|
|
# 降级模式:直接查 DEALING 转账
|
|
# 降级模式:直接查 DEALING 转账
|
|
|
stmt = select(TransferModel).where(
|
|
stmt = select(TransferModel).where(
|
|
|
TransferModel.status == TransferStatusEnum.DEALING.value,
|
|
TransferModel.status == TransferStatusEnum.DEALING.value,
|
|
@@ -1046,10 +1046,8 @@ class AccountService:
|
|
|
log.warning(f"全量同步 - 企业 {eid} 第 {page_num} 页异常: {e}")
|
|
log.warning(f"全量同步 - 企业 {eid} 第 {page_num} 页异常: {e}")
|
|
|
break
|
|
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
|
|
break
|
|
|
page_num += 1
|
|
page_num += 1
|
|
|
|
|
|