From b4d3224898d50b8f1e30b5c8083a520743927282 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 14 Jul 2025 21:08:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin

---
 oying-system/src/main/java/com/oying/modules/pc/store/service/StoreService.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/service/StoreService.java b/oying-system/src/main/java/com/oying/modules/pc/store/service/StoreService.java
index f1c3e56..f5443f1 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/service/StoreService.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/service/StoreService.java
@@ -10,6 +10,7 @@
 import java.math.BigDecimal;
 import java.time.LocalTime;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 店铺基础信息Service接口
@@ -23,15 +24,25 @@
 
     List<Store> queryAll(StoreQueryCriteria criteria);
 
+    List<Long> queryStoreIds(StoreQueryCriteria criteria);
+
     Store getMerchantStore(Long merchantId);
 
-    List<Store> queryUserStores(Long userId);
+    List<Store> getStoresByIds(Set<Long> ids);
+
+    List<Store> getUserStores(Long userId);
+
+    Store getOrThrow(Long storeId, Long version);
+
+    void create(Store resources);
 
     Store create(StoreCreateRequest request);
 
+    boolean update(Store resources, boolean isDirectUpdate);
+
     boolean update(StoreUpdateRequest request);
 
-    boolean updateLogo(Long storeId, String logo, Long version);
+    boolean updateLogo(Long storeId, Long logoImageId, Long version);
 
     boolean updateName(Long storeId, String storeName, Long version);
 
@@ -58,4 +69,6 @@
     boolean existsByIdAndMerchantId(Long storeId, Long merchantId);
 
     boolean existsStoreName(String storeName);
+
+    boolean bindUser(Long store);
 }

--
Gitblit v1.9.3