From c3f00b4a1f0932ebdaea5626383d64855a611b15 Mon Sep 17 00:00:00 2001
From: wangff <feifan.wang@hao168.com>
Date: Tue, 25 Nov 2025 16:52:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=97=A8=E5=BA=97=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/wallet/AccountBillQueryRequest.java      | 12 +++++++-----
 .../store/service/wallet/impl/WalletServiceImpl.java |  7 ++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/AccountBillQueryRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/AccountBillQueryRequest.java
index faeb2f7ce..5bb6eb607 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/AccountBillQueryRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/AccountBillQueryRequest.java
@@ -1,6 +1,5 @@
 package com.cool.store.request.wallet;
 
-import com.cool.store.common.PageBasicInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,10 +15,7 @@ import java.util.Date;
  * @since 2025/11/17
  */
 @Data
-public class AccountBillQueryRequest extends PageBasicInfo {
-    @ApiModelProperty("门店id")
-    @NotNull(message = "门店id不能为空")
-    private Long shopId;
+public class AccountBillQueryRequest extends StoreShopRequest {
 
     @ApiModelProperty("交易开始时间，不传查当月")
     private Date beginDate;
@@ -39,4 +35,10 @@ public class AccountBillQueryRequest extends PageBasicInfo {
 
     @ApiModelProperty("费用类型ID")
     private Long feeItemId;
+
+    //页码
+    private Integer pageNum;
+
+    //分页大小
+    private Integer pageSize;
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java
index 034b9c4db..4341d3db2 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java
@@ -338,17 +338,14 @@ public class WalletServiceImpl implements WalletService {
 
     @Override
     public AccountBillPageVO getBillPage(AccountBillQueryRequest request) {
-        ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId());
-        if (Objects.isNull(shopInfo)) {
-            throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST);
-        }
+        String storeId = getStoreId(request);
         LocalDate now = LocalDate.now();
         if (Objects.isNull(request.getBeginDate()) || Objects.isNull(request.getEndDate())) {
             request.setBeginDate(Date.valueOf(now.withDayOfMonth(1)));
             request.setEndDate(Date.valueOf(now));
         }
         BillPageRequest billPageRequest = BillPageRequest.builder()
-                .outStoreId(shopInfo.getStoreId())
+                .outStoreId(storeId)
                 .beginDate(DateUtil.format(request.getBeginDate(), "yyyy-MM-dd HH:mm:ss"))
                 .endDate(DateUtil.format(request.getEndDate(), "yyyy-MM-dd HH:mm:ss"))
                 .walletType(request.getWalletType())