From bd491c37218b0b3d9b518e4814967d814e781c02 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 19 一月 2026 18:07:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java
index 9aa503c..363448d 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java
@@ -5,6 +5,7 @@
import com.doumee.dao.business.model.Integral;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Shop;
+import com.doumee.dao.system.vo.ShopMoneyVO;
import com.doumee.dao.web.dto.MemberDTO;
import com.doumee.dao.web.dto.ResetSystemUserPwdDTO;
import com.doumee.dao.web.dto.ShopLoginDTO;
@@ -209,9 +210,10 @@
* @param shopId
* @return
*/
- SaleReportResponse saleReport(SaleReportRequest request, String shopId);
+ SaleReportResponse saleReport(SaleReportRequest request, Integer shopId);
String setGoodsPrice(Shop shop);
+ PageData<ShopMoneyVO> findPageMoney(PageWrap<Shop> pageWrap);
}
--
Gitblit v1.9.3