From 7ee466ebc953bb5640bcf42f2b8e2a87aa471c21 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 15 四月 2026 20:12:21 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun

---
 server/web/src/main/java/com/doumee/api/web/ShopInfoApi.java |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/server/web/src/main/java/com/doumee/api/web/ShopInfoApi.java b/server/web/src/main/java/com/doumee/api/web/ShopInfoApi.java
index d128ca8..0f31c5a 100644
--- a/server/web/src/main/java/com/doumee/api/web/ShopInfoApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/ShopInfoApi.java
@@ -1,10 +1,18 @@
 package com.doumee.api.web;
 
 import com.doumee.core.annotation.LoginRequired;
+import com.doumee.core.annotation.LoginShopRequired;
 import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
 import com.doumee.dao.business.model.Member;
 import com.doumee.dao.dto.ShopApplyDTO;
+import com.doumee.dao.dto.ShopDetailQueryDTO;
+import com.doumee.dao.dto.ShopInfoMaintainDTO;
+import com.doumee.dao.dto.ShopNearbyDTO;
 import com.doumee.dao.vo.ShopDetailVO;
+import com.doumee.dao.vo.ShopNearbyVO;
+import com.doumee.dao.vo.ShopWebDetailVO;
 import com.doumee.service.business.ShopInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -41,4 +49,31 @@
         return ApiResponse.success(shopInfoService.getMyShop(this.getMemberId()));
     }
 
+    @ApiOperation("闄勮繎闂ㄥ簵鍒嗛〉鍒楄〃")
+    @PostMapping("/nearby")
+    public ApiResponse<PageData<ShopNearbyVO>> nearby(@RequestBody @Validated PageWrap<ShopNearbyDTO> pageWrap) {
+        return ApiResponse.success(shopInfoService.findNearbyShops(pageWrap));
+    }
+
+    @ApiOperation("闂ㄥ簵璇︽儏")
+    @PostMapping("/detail")
+    public ApiResponse<ShopWebDetailVO> detail(@RequestBody @Validated ShopDetailQueryDTO dto) {
+        return ApiResponse.success(shopInfoService.getShopWebDetail(dto));
+    }
+
+    @LoginShopRequired
+    @ApiOperation("缁存姢闂ㄥ簵淇℃伅锛堟敮浠樻娂閲戝悗锛�")
+    @PostMapping("/maintain")
+    public ApiResponse maintain(@RequestBody ShopInfoMaintainDTO dto) {
+        shopInfoService.maintainShopInfo(this.getMemberId(), dto);
+        return ApiResponse.success("鎿嶄綔鎴愬姛");
+    }
+
+    @LoginShopRequired
+    @ApiOperation("鏌ヨ闂ㄥ簵缁存姢淇℃伅")
+    @PostMapping("/maintainInfo")
+    public ApiResponse<ShopInfoMaintainDTO> maintainInfo() {
+        return ApiResponse.success(shopInfoService.getShopMaintainInfo(this.getMemberId()));
+    }
+
 }

--
Gitblit v1.9.3