From 095210f9149c73e6e00d997b39fd6c44a65e4d38 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 28 四月 2026 22:04:17 +0800
Subject: [PATCH] 代码生成

---
 server/web/src/main/java/com/doumee/api/web/ShopInfoApi.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 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 3fd37ab..6087e89 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
@@ -8,6 +8,7 @@
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.dao.business.model.Member;
+import com.doumee.dao.dto.ChangePasswordDTO;
 import com.doumee.dao.dto.ShopApplyDTO;
 import com.doumee.dao.dto.ShopDetailQueryDTO;
 import com.doumee.dao.dto.ShopInfoMaintainDTO;
@@ -25,6 +26,7 @@
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import javax.validation.Valid;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,7 +35,7 @@
  * @author rk
  * @date 2026/04/10
  */
-@Api(tags = "闂ㄥ簵鍏ラ┗")
+@Api(tags = "闂ㄥ簵涓氬姟鎺ュ彛")
 @RestController
 @RequestMapping("/web/shopInfo")
 public class ShopInfoApi extends ApiController {
@@ -60,6 +62,7 @@
         return ApiResponse.success(shopInfoService.getMyShop(this.getMemberId()));
     }
 
+
     @ApiOperation("闄勮繎闂ㄥ簵鍒嗛〉鍒楄〃")
     @PostMapping("/nearby")
     public ApiResponse<PageData<ShopNearbyVO>> nearby(@RequestBody @Validated PageWrap<ShopNearbyDTO> pageWrap) {
@@ -83,6 +86,16 @@
     }
 
     @LoginShopRequired
+    @ApiOperation("闂ㄥ簵绔煡璇㈤棬搴楄鎯�")
+    @GetMapping("/shopDetail")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "闂ㄥ簵token鍊�", required = true)
+    })
+    public ApiResponse<ShopDetailVO> shopDetail() {
+        return ApiResponse.success("鏌ヨ鎴愬姛", shopInfoService.getShopDetail(getShopId()));
+    }
+
+    @LoginShopRequired
     @ApiOperation("闂ㄥ簵閿�鍞粺璁�")
     @GetMapping("/salesStats")
     @ApiImplicitParams({
@@ -97,7 +110,7 @@
     @ApiOperation("缁存姢闂ㄥ簵淇℃伅锛堟敮浠樻娂閲戝悗锛�")
     @PostMapping("/maintain")
     public ApiResponse maintain(@RequestBody ShopInfoMaintainDTO dto) {
-        shopInfoService.maintainShopInfo(this.getMemberId(), dto);
+        shopInfoService.maintainShopInfo(this.getShopId(), dto);
         return ApiResponse.success("鎿嶄綔鎴愬姛");
     }
 
@@ -105,7 +118,7 @@
     @ApiOperation("鏌ヨ闂ㄥ簵缁存姢淇℃伅")
     @PostMapping("/maintainInfo")
     public ApiResponse<ShopInfoMaintainDTO> maintainInfo() {
-        return ApiResponse.success(shopInfoService.getShopMaintainInfo(this.getMemberId()));
+        return ApiResponse.success(shopInfoService.getShopMaintainInfo(this.getShopId()));
     }
 
     @LoginRequired
@@ -125,9 +138,9 @@
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "闂ㄥ簵token鍊�", required = true),
     })
-    public ApiResponse changePassword(@RequestParam String newPassword) {
+    public ApiResponse changePassword(@RequestBody @Valid ChangePasswordDTO dto) {
         String token = this.getRequest().getHeader(JwtTokenUtil.HEADER_KEY);
-        shopInfoService.changePassword(this.getShopId(), newPassword, token);
+        shopInfoService.changePassword(this.getShopId(), dto.getOldPassword(), dto.getNewPassword(), token);
         return ApiResponse.success("瀵嗙爜淇敼鎴愬姛锛岃閲嶆柊鐧诲綍");
     }
 

--
Gitblit v1.9.3