From 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 16 一月 2026 18:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 54 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 a1414f0..eea1737 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,13 +2,18 @@
 
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.Member;
 import com.doumee.dao.business.model.Shop;
 import com.doumee.dao.web.dto.MemberDTO;
 import com.doumee.dao.web.dto.ResetSystemUserPwdDTO;
-import com.doumee.dao.web.dto.shop.ShopDTO;
-import com.doumee.dao.web.dto.shop.ShopDataStatisticsDTO;
-import com.doumee.dao.web.dto.shop.ShopFaceDetailDTO;
-import com.doumee.dao.web.dto.shop.ShopSimpleDTO;
+import com.doumee.dao.web.dto.ShopLoginDTO;
+import com.doumee.dao.web.dto.shop.*;
+import com.doumee.dao.web.request.MyCustomerRequest;
+import com.doumee.dao.web.request.SaleReportRequest;
+import com.doumee.dao.web.response.AccountResponse;
+import com.doumee.dao.web.response.MyCustomerResponse;
+import com.doumee.dao.web.response.SaleReportResponse;
+import com.doumee.dao.web.response.ShopInfoResponse;
 
 import java.util.List;
 
@@ -160,6 +165,51 @@
     ShopDataStatisticsDTO getShopDataStatisticsDTO(Integer shopId);
 
     void resetPwd(Shop dto);
+    /**
+     * 鐢ㄦ埛涓嬪崟鏌ヨ鍙�夋嫨鐨勮嚜鎻愮粡閿�鍟�
+     * @param dto
+     * @return
+     */
+    List<Shop> getShopList(ShopListDTO dto);
+
+    /**
+     * 缁忛攢鍟嗚处鍙峰瘑鐮佺櫥褰�
+     * @param dto
+     * @return
+     */
+    AccountResponse shopPasswordLogin(ShopLoginDTO dto);
+
+    /**
+     * 缁忛攢鍟嗛潤榛樼櫥褰�
+     * @param dto
+     * @return
+     */
+    AccountResponse shopOpenidLogin(ShopLoginDTO dto);
+
+    /**
+     * 缁忛攢鍟嗗簵閾鸿鎯�
+     * @param shopId
+     * @return
+     */
+    ShopInfoResponse getShopInfo(Integer shopId);
+
+
+    /**
+     * 鎴戠殑瀹㈡埛淇℃伅
+     * @param request
+     * @param shopId
+     * @return
+     */
+    List<MyCustomerResponse> myCustomer(MyCustomerRequest request, Integer shopId);
+
+    /**
+     * 閿�鍞槑缁�
+     * @param request
+     * @param shopId
+     * @return
+     */
+    SaleReportResponse saleReport(SaleReportRequest request, String shopId);
+
 
     String setGoodsPrice(Shop shop);
 }

--
Gitblit v1.9.3