From e50954f0708ecbbc672352102ae3b24279d40cc1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 16 四月 2026 20:12:50 +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 | 63 +++++++++++++++++++++++++++++++
1 files changed, 63 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..60b5eee 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,12 +1,25 @@
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.ShopCenterVO;
+import com.doumee.dao.vo.ShopNearbyVO;
+import com.doumee.dao.vo.ShopWebDetailVO;
+import com.doumee.dao.vo.PayResponse;
+import com.doumee.service.business.OrdersService;
import com.doumee.service.business.ShopInfoService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -25,6 +38,9 @@
@Autowired
private ShopInfoService shopInfoService;
+ @Autowired
+ private OrdersService ordersService;
+
@LoginRequired
@ApiOperation("闂ㄥ簵鍏ラ┗鐢宠/淇敼")
@PostMapping("/apply")
@@ -41,4 +57,51 @@
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("鑾峰彇闂ㄥ簵鐧诲綍鍚庝俊鎭�")
+ @GetMapping("/getShopInfo")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "闂ㄥ簵token鍊�", required = true)
+ })
+ public ApiResponse<ShopCenterVO> getShopInfo() {
+ return ApiResponse.success("鏌ヨ鎴愬姛", shopInfoService.getShopCenterInfo(getShopId()));
+ }
+
+ @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()));
+ }
+
+ @LoginShopRequired
+ @ApiOperation("闂ㄥ簵鏀粯鎶奸噾")
+ @PostMapping("/payDeposit")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "闂ㄥ簵token鍊�", required = true)
+ })
+ public ApiResponse<PayResponse> payDeposit() {
+ return ApiResponse.success("鎿嶄綔鎴愬姛", ordersService.payShopDeposit(getShopId()));
+ }
+
}
--
Gitblit v1.9.3