From d295f1f7706e51b158cb7252b6ac633b1f9a1982 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 12 五月 2026 09:07:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dingyuannongji
---
server/dmmall_web/src/main/java/com/doumee/api/web/ShopApi.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 bb24587..dee9d64 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
@@ -100,7 +100,7 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
- public ApiResponse getShopList(@RequestBody ShopListDTO dto){
+ public ApiResponse<List<Shop>> getShopList(@RequestBody ShopListDTO dto){
return ApiResponse.success(shopService.getShopList(dto));
}
@@ -112,12 +112,10 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
- public ApiResponse withdrawApply(@RequestBody WithdrawApplyRequest request){
+ public ApiResponse<Integer> withdrawApply(@RequestBody WithdrawApplyRequest request){
request.setMemberId(getShopId());
- withdrawRecordService.withdrawApply(request,integralService);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
+ return ApiResponse.success("鎿嶄綔鎴愬姛",withdrawRecordService.withdrawApply(request,integralService));
}
-
@LoginShopRequired
@@ -185,6 +183,17 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+ @LoginShopRequired
+ @ApiOperation("缁忛攢鍟� - 淇敼瀵嗙爜")
+ @PostMapping("/updatePwd")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse updatePwd(@RequestBody ShopUpdatePwdDTO dto) {
+ shopService.updatePwd(getShopId(), dto.getOldPassword(), dto.getNewPassword());
+ return ApiResponse.success("淇敼鎴愬姛");
+ }
+
--
Gitblit v1.9.3