From 19fd7785705f30d25c6c8e44b9356cc585af68cd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 19 三月 2025 14:26:41 +0800
Subject: [PATCH] 111
---
server/web/src/main/java/com/doumee/api/web/BusinessApi.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 1c5ee93..409c43c 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
@@ -146,7 +146,7 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse<List<Bikes>> eleBikeList() {
- return ApiResponse.success("鏌ヨ鎴愬姛",bikesService.getEleBikes());
+ return ApiResponse.success("鏌ヨ鎴愬姛",bikesService.getEleBikes(getMemberId()));
}
@@ -181,6 +181,7 @@
public ApiResponse<PageData<Discount>> discountPage (@RequestBody PageWrap<Discount> pageWrap) {
Discount discount = new Discount();
discount.setStatus(Constants.ZERO);
+ discount.setMinShow(Constants.ZERO);
pageWrap.setModel(discount);
return ApiResponse.success(discountService.findPage(pageWrap));
}
@@ -326,10 +327,9 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
- public ApiResponse openElecBike(@RequestBody OpenElecBikeRequest param) {
+ public ApiResponse<MemberRidesDetailResponse> openElecBike(@RequestBody OpenElecBikeRequest param) {
param.setMemberId(getMemberId());
- jtt808Service.openLock(param);
- return ApiResponse.success( null);
+ return ApiResponse.success(jtt808Service.openLock(param));
}
@LoginRequired
@@ -344,5 +344,10 @@
return ApiResponse.success( null);
}
-
+ @ApiOperation(value = "寮哄埗杩樿溅", notes = "寮哄埗杩樿溅")
+ @PostMapping("/forceBack")
+ public ApiResponse forceBack(@RequestBody Goodsorder goodsorder) {
+ jtt808Service.forceBack(goodsorder.getId());
+ return ApiResponse.success( null);
+ }
}
--
Gitblit v1.9.3