From be4bfd2dac75cf4249ef30f85c4fbb07d0dcc67f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 24 十月 2023 18:15:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/web/src/main/java/com/doumee/api/web/BusinessApi.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/BusinessApi.java b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
index 516bbc7..30b5a99 100644
--- a/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java
@@ -2,15 +2,13 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.LoginRequired;
+import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.dao.business.model.BaseParam;
-import com.doumee.dao.business.model.MemberRides;
-import com.doumee.dao.business.model.RentSite;
-import com.doumee.dao.business.model.Transactions;
+import com.doumee.dao.business.model.*;
import com.doumee.dao.business.web.request.RepairRequest;
import com.doumee.dao.business.web.response.MemberRidesDetailResponse;
import com.doumee.dao.business.web.response.RidesDetailResponse;
@@ -130,7 +128,7 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
- public ApiResponse<String> onlineBike() {
+ public ApiResponse<MemberRides> onlineBike() {
return ApiResponse.success("鏌ヨ鎴愬姛",memberRidesService.getOnlineBike(getMemberId()));
}
@@ -172,14 +170,14 @@
@LoginRequired
+ @PreventRepeat
@ApiOperation(value = "璁㈠崟缁撶畻", notes = "灏忕▼搴忕")
@GetMapping("/goodsOrderSettlement")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "orderId", value = "璁㈠崟涓婚敭", required = true)
})
- public ApiResponse goodsOrderSettlement(@RequestParam String orderId) {
- goodsorderService.goodsOrderSettlement(orderId);
+ public ApiResponse goodsOrderSettlement() {
+ goodsorderService.goodsOrderSettlement(getMemberId());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
--
Gitblit v1.9.3