From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/ShopInfoService.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/ShopInfoService.java b/server/services/src/main/java/com/doumee/service/business/ShopInfoService.java
index 2908a9e..35a568e 100644
--- a/server/services/src/main/java/com/doumee/service/business/ShopInfoService.java
+++ b/server/services/src/main/java/com/doumee/service/business/ShopInfoService.java
@@ -9,6 +9,7 @@
import com.doumee.dao.vo.ShopCenterVO;
import com.doumee.dao.vo.ShopDetailVO;
import com.doumee.dao.vo.ShopNearbyVO;
+import com.doumee.dao.vo.ShopSalesStatsVO;
import com.doumee.dao.vo.ShopWebDetailVO;
import java.math.BigDecimal;
@@ -109,7 +110,7 @@
* @param request 鐢宠璇锋眰
* @param member 褰撳墠鐧诲綍浼氬憳
*/
- void applyShop(ShopApplyDTO request, Member member);
+ void applyShop(ShopApplyDTO request);
/**
* 鏌ヨ闂ㄥ簵璇︽儏锛堝惈闄勪欢锛�
@@ -193,10 +194,44 @@
ShopLoginVO shopPasswordLogin(ShopLoginDTO dto);
/**
- * 闂ㄥ簵闈欓粯鐧诲綍锛堟牴鎹畂penid锛�
- * @param openid
+ * 闂ㄥ簵闈欓粯鐧诲綍锛堥粯璁ょ敤鎴锋惡甯︾殑openid杩涜鏌ヨ锛�
+ * @param memberId
* @return 鐧诲綍缁撴灉
*/
- ShopLoginVO shopSilentLogin(String openid);
+ ShopLoginVO shopSilentLogin(Integer memberId);
+
+ /**
+ * 闂ㄥ簵閿�鍞粺璁�
+ *
+ * @param shopId 闂ㄥ簵涓婚敭
+ * @param period 缁熻鍛ㄦ湡锛�0=浠婃棩, 1=鏈湀, 2=涓婃湀
+ * @return 閿�鍞粺璁�
+ */
+ ShopSalesStatsVO getShopSalesStats(Integer shopId, Integer period);
+
+ /**
+ * 闂ㄥ簵淇敼瀵嗙爜
+ *
+ * @param shopId 闂ㄥ簵涓婚敭
+ * @param oldPassword 鏃у瘑鐮�
+ * @param newPassword 鏂板瘑鐮�
+ * @param token 褰撳墠token锛堜慨鏀规垚鍔熷悗娓呴櫎锛�
+ */
+ void changePassword(Integer shopId, String oldPassword, String newPassword, String token);
+
+ /**
+ * 缁戝畾鎵撳嵃鏈�
+ */
+ void bindPrinter(com.doumee.dao.dto.PrinterBindDTO dto);
+
+ /**
+ * 瑙ｇ粦鎵撳嵃鏈�
+ */
+ void unbindPrinter(Integer shopId);
+
+ /**
+ * 鏌ヨ鎵撳嵃鏈虹姸鎬�
+ */
+ Object queryPrinterStatus(Integer shopId);
}
--
Gitblit v1.9.3