From c74a6f59490cfb9a0ee37f70427739b74e7fbd58 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 20 五月 2026 08:50:29 +0800
Subject: [PATCH] 代码生成

---
 server/web/src/main/java/com/doumee/api/web/ShopInfoApi.java |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 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 a9fe8f5..f8883d0 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,12 +8,14 @@
 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;
 import com.doumee.dao.dto.ShopNearbyDTO;
 import com.doumee.dao.vo.ShopDetailVO;
 import com.doumee.dao.vo.ShopCenterVO;
+import com.doumee.dao.vo.LocationTagShopCountVO;
 import com.doumee.dao.vo.ShopNearbyVO;
 import com.doumee.dao.vo.ShopSalesStatsVO;
 import com.doumee.dao.vo.ShopWebDetailVO;
@@ -25,8 +27,11 @@
 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.*;
+
+import java.util.List;
 
 /**
  * 闂ㄥ簵鍏ラ┗锛堝皬绋嬪簭绔級
@@ -65,6 +70,13 @@
     @PostMapping("/nearby")
     public ApiResponse<PageData<ShopNearbyVO>> nearby(@RequestBody @Validated PageWrap<ShopNearbyDTO> pageWrap) {
         return ApiResponse.success(shopInfoService.findNearbyShops(pageWrap));
+    }
+
+    @ApiOperation("鎸変綅缃爣绛剧粺璁¢棬搴楁暟閲�")
+    @GetMapping("/locationTagShopCount")
+    public ApiResponse<List<LocationTagShopCountVO>> locationTagShopCount(
+            @RequestParam(required = false) Integer cityId) {
+        return ApiResponse.success(shopInfoService.countShopsByLocationTag(cityId));
     }
 
     @ApiOperation("闂ㄥ簵璇︽儏")
@@ -108,7 +120,7 @@
     @ApiOperation("缁存姢闂ㄥ簵淇℃伅锛堟敮浠樻娂閲戝悗锛�")
     @PostMapping("/maintain")
     public ApiResponse maintain(@RequestBody ShopInfoMaintainDTO dto) {
-        shopInfoService.maintainShopInfo(this.getMemberId(), dto);
+        shopInfoService.maintainShopInfo(this.getShopId(), dto);
         return ApiResponse.success("鎿嶄綔鎴愬姛");
     }
 
@@ -136,10 +148,22 @@
     @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("瀵嗙爜淇敼鎴愬姛锛岃閲嶆柊鐧诲綍");
     }
 
+    @LoginShopRequired
+    @ApiOperation("闂ㄥ簵鎵撳嵃璁㈠崟鏍囩")
+    @GetMapping("/printOrderLabel/{orderId}")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "闂ㄥ簵token鍊�", required = true),
+            @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "orderId", value = "璁㈠崟涓婚敭", required = true)
+    })
+    public ApiResponse printOrderLabel(@PathVariable Integer orderId) {
+        ordersService.printOrderLabel(orderId, this.getShopId());
+        return ApiResponse.success("鎵撳嵃鎴愬姛");
+    }
+
 }

--
Gitblit v1.9.3