From 0a206f3acb9af0ec9db650861d34a256cda1c960 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 26 二月 2026 17:48:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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..689a720 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;
@@ -31,7 +32,7 @@
* @param shop 瀹炰綋瀵硅薄
* @return Integer
*/
- Integer create(Shop shop);
+ Integer create(Shop shop) throws Exception;
/**
* 涓婚敭鍒犻櫎
@@ -59,7 +60,7 @@
*
* @param shop 瀹炰綋瀵硅薄
*/
- void updateById(Shop shop);
+ void updateById(Shop shop) throws Exception;
void updateIsRecById(Shop shop);
@@ -70,7 +71,7 @@
*
* @param shops 瀹炰綋闆�
*/
- void updateByIdInBatch(List<Shop> shops);
+// void updateByIdInBatch(List<Shop> shops);
/**
* 鏀寔缁存姢搴楅摵淇℃伅
@@ -197,11 +198,10 @@
/**
* 鎴戠殑瀹㈡埛淇℃伅
- * @param request
* @param shopId
* @return
*/
- List<MyCustomerResponse> myCustomer(MyCustomerRequest request, Integer shopId);
+ PageData<Member> myCustomer(PageWrap<MyCustomerRequest> pageWrap, Integer shopId);
/**
* 閿�鍞槑缁�
@@ -209,9 +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