From f55b38102c99878a0eb9a829ee9cf3bc8a76de01 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十月 2023 18:16:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/web/src/main/java/com/doumee/api/web/BusinessApi.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 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 9ca214a..f714118 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
@@ -11,6 +11,7 @@
import com.doumee.dao.business.model.RentSite;
import com.doumee.dao.business.model.Transactions;
import com.doumee.dao.business.web.request.RepairRequest;
+import com.doumee.dao.business.web.response.MemberRidesDetailResponse;
import com.doumee.dao.business.web.response.RidesDetailResponse;
import com.doumee.service.business.*;
import io.swagger.annotations.Api;
@@ -134,16 +135,47 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
- public ApiResponse transactionsPage (@RequestBody RepairRequest repairRequest) {
+ public ApiResponse transactionsPage (@RequestBody RepairRequest repairRequest) throws Exception{
repairRequest.setMemberId(getMemberId());
bikeRepairService.saveRepair(repairRequest);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+ @LoginRequired
+ @ApiOperation(value = "鎵爜瑙ｉ攣", notes = "灏忕▼搴忕")
+ @GetMapping("/openLock")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "閿佸ご鐮�", required = true)
+ })
+ public ApiResponse<MemberRidesDetailResponse> openLock(@RequestParam String code) {
+ return ApiResponse.success("鎿嶄綔鎴愬姛",memberRidesService.openLock(code,getMemberId()));
+ }
+ @LoginRequired
+ @ApiOperation(value = "鍒锋柊瑙ｉ攣鎯呭喌", notes = "灏忕▼搴忕")
+ @GetMapping("/refreshLock")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "楠戣璁板綍涓婚敭", required = true)
+ })
+ public ApiResponse<MemberRidesDetailResponse> refreshLock(@RequestParam String id) {
+ return ApiResponse.success("鎿嶄綔鎴愬姛",memberRidesService.refreshLock(id));
+ }
+ @LoginRequired
+ @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);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
}
--
Gitblit v1.9.3