From 32a43e602e4a78478781532d31fbc38755188df7 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 28 二月 2025 09:32:15 +0800 Subject: [PATCH] 111 --- server/web/src/main/java/com/doumee/api/web/BusinessApi.java | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 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..8414b7f 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 @@ -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