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 | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 66 insertions(+), 5 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 57dadf4..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,12 +2,20 @@
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.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.ResetSystemUserPwdDTO;
+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;
@@ -24,7 +32,7 @@
* @param shop 瀹炰綋瀵硅薄
* @return Integer
*/
- Integer create(Shop shop);
+ Integer create(Shop shop) throws Exception;
/**
* 涓婚敭鍒犻櫎
@@ -157,4 +165,57 @@
* @return
*/
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 shopId
+ * @return
+ */
+ PageData<Member> myCustomer(PageWrap<MyCustomerRequest> pageWrap, Integer shopId);
+
+ /**
+ * 閿�鍞槑缁�
+ * @param request
+ * @param shopId
+ * @return
+ */
+ 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