From 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 16 一月 2026 18:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_web/src/main/java/com/doumee/api/web/ShopApi.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/ShopApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/ShopApi.java
index edff3fb..3e1fc59 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/ShopApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/ShopApi.java
@@ -1,14 +1,24 @@
package com.doumee.api.web;
+import com.doumee.config.annotation.LoginRequired;
+import com.doumee.config.annotation.LoginShopRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.Shop;
+import com.doumee.dao.business.model.WithdrawRecord;
import com.doumee.dao.web.dto.shop.*;
+import com.doumee.dao.web.request.WithdrawApplyRequest;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* Created by IntelliJ IDEA.
@@ -68,4 +78,46 @@
shopService.update(shopDTO,memberId);
return ApiResponse.success(null);
}
+
+
+
+ @LoginRequired
+ @ApiOperation(value = "鐢ㄦ埛涓嬪崟鏌ヨ鍙�夋嫨鐨勮嚜鎻愮粡閿�鍟�", notes = "灏忕▼搴忕")
+ @PostMapping("/getShopList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse getShopList(@RequestBody ShopListDTO dto){
+ return ApiResponse.success(shopService.getShopList(dto));
+ }
+
+
+
+ @LoginShopRequired
+ @ApiOperation(value = "鎻愮幇鐢宠 - 缁忛攢鍟�", notes = "灏忕▼搴忕")
+ @PostMapping("/withdrawApply")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse withdrawApply(@RequestBody WithdrawApplyRequest request){
+ request.setMemberId(getShopId());
+ withdrawRecordService.withdrawApply(request,integralService);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+
+ @LoginShopRequired
+ @ApiOperation("鏌ヨ鎻愮幇鐢宠璇︽儏")
+ @GetMapping("/withdrawDetail")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse<WithdrawRecord> withdrawDetail(@RequestParam Integer id) {
+ return ApiResponse.success(withdrawRecordService.findById(id));
+ }
+
+
+
+
}
--
Gitblit v1.9.3