From 5a6cebc0bafc5a0368156291bcc9381943ebd4c8 Mon Sep 17 00:00:00 2001
From: zhx <zhx@haiyi.com>
Date: Wed, 24 Jun 2026 12:27:12 +0800
Subject: [PATCH] fix: default pay country pagination

---
 .../sys/pay/SysPayOpenCountryController.java  |  1 +
 .../impl/PayCountryClientServiceImpl.java     | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/rc-service/rc-service-console/console-adapter/src/main/java/com/red/circle/console/adapter/app/sys/pay/SysPayOpenCountryController.java b/rc-service/rc-service-console/console-adapter/src/main/java/com/red/circle/console/adapter/app/sys/pay/SysPayOpenCountryController.java
index 2651236f..3da6b1b6 100644
--- a/rc-service/rc-service-console/console-adapter/src/main/java/com/red/circle/console/adapter/app/sys/pay/SysPayOpenCountryController.java
+++ b/rc-service/rc-service-console/console-adapter/src/main/java/com/red/circle/console/adapter/app/sys/pay/SysPayOpenCountryController.java
@@ -39,6 +39,7 @@ public class SysPayOpenCountryController extends BaseController {
    */
   @GetMapping("/page")
   public PageResult<PayCountryDTO> page(SysPayCountryQryCmd query) {
+    query.setPageQuery(getPage());
     return sysPayCountryService.pageOpenPayCountry(query);
   }
 
diff --git a/rc-service/rc-service-order/order-inner-endpoint/src/main/java/com/red/circle/order/inner/service/impl/PayCountryClientServiceImpl.java b/rc-service/rc-service-order/order-inner-endpoint/src/main/java/com/red/circle/order/inner/service/impl/PayCountryClientServiceImpl.java
index c05bbe56..06bef7fa 100644
--- a/rc-service/rc-service-order/order-inner-endpoint/src/main/java/com/red/circle/order/inner/service/impl/PayCountryClientServiceImpl.java
+++ b/rc-service/rc-service-order/order-inner-endpoint/src/main/java/com/red/circle/order/inner/service/impl/PayCountryClientServiceImpl.java
@@ -4,6 +4,7 @@ import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
 import com.google.api.client.util.Maps;
 import com.red.circle.framework.core.asserts.ResponseAssert;
 import com.red.circle.framework.dto.PageResult;
+import com.red.circle.framework.dto.PageQuery;
 import com.red.circle.framework.mybatis.constant.PageConstant;
 import com.red.circle.order.app.command.pay.web.strategy.PayPlaceAnOrderService;
 import com.red.circle.order.infra.database.rds.entity.pay.PayCountry;
@@ -190,6 +191,10 @@ public class PayCountryClientServiceImpl implements PayCountryClientService {
   @Override
   public PageResult<PayCountryDTO> pageOpenPayCountry(SysPayCountryQryCmd query) {
 
+    if (Objects.isNull(query)) {
+      query = new SysPayCountryQryCmd();
+    }
+    fillDefaultPageQuery(query);
     PageResult<PayCountryDTO> sysPayCountryPage = payCountryService.pageOpenPayCountry(query)
         .convert(webPayInnerConvertor::toSysPayCountryDTO);
     Map<Long, SysCountryCodeDTO> sysCountryCodeMap = ResponseAssert.requiredSuccess(
@@ -205,6 +210,21 @@ public class PayCountryClientServiceImpl implements PayCountryClientService {
     });
   }
 
+  private void fillDefaultPageQuery(SysPayCountryQryCmd query) {
+    if (Objects.isNull(query.getPageQuery())) {
+      query.setPageQuery(new PageQuery());
+    }
+    if (Objects.isNull(query.getPageQuery().getCursor())) {
+      query.getPageQuery().setCursor(1);
+    }
+    if (Objects.isNull(query.getPageQuery().getLimit())) {
+      query.getPageQuery().setLimit(20);
+    }
+    if (Objects.isNull(query.getPageQuery().getSearchCount())) {
+      query.getPageQuery().setSearchCount(true);
+    }
+  }
+
   @Override
   public void addOpenPayCountry(List<SysPayCountryAddCmd> params) {
     payCountryService.saveBatch(params.stream()