From fc9240bd6b246ad71c4050510880a49ce07138a3 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 13 二月 2026 09:51:13 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dingyuannongji
---
server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 eea1737..e51fe67 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
@@ -2,8 +2,10 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+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;
@@ -30,7 +32,7 @@
* @param shop 瀹炰綋瀵硅薄
* @return Integer
*/
- Integer create(Shop shop);
+ Integer create(Shop shop) throws Exception;
/**
* 涓婚敭鍒犻櫎
@@ -196,11 +198,10 @@
/**
* 鎴戠殑瀹㈡埛淇℃伅
- * @param request
* @param shopId
* @return
*/
- List<MyCustomerResponse> myCustomer(MyCustomerRequest request, Integer shopId);
+ PageData<Member> myCustomer(PageWrap<MyCustomerRequest> pageWrap, Integer shopId);
/**
* 閿�鍞槑缁�
@@ -208,8 +209,13 @@
* @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);
+
+
+ void logOut(String token,Integer shopId);
}
--
Gitblit v1.9.3