From 3b21b61d28097c72811ce5a0a6a72b7722c68b1d Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 20 二月 2025 11:21:10 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1 --- server/web/src/main/java/com/doumee/api/web/BusinessApi.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 51 insertions(+), 2 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 e1fd075..e4e531a 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,9 +11,11 @@ import com.doumee.core.model.PageWrap; import com.doumee.dao.business.model.*; import com.doumee.dao.business.web.request.BackElecBikeRequest; +import com.doumee.dao.business.web.request.OpenElecBikeRequest; import com.doumee.dao.business.web.request.RepairRequest; import com.doumee.dao.business.web.response.HomeResponse; import com.doumee.dao.business.web.response.MemberRidesDetailResponse; +import com.doumee.dao.business.web.response.MemberRidesResponse; import com.doumee.dao.business.web.response.RidesDetailResponse; import com.doumee.dao.system.model.SystemDictData; import com.doumee.jtt808.web.service.Jtt808Service; @@ -134,7 +136,7 @@ @LoginRequired @ApiOperation(value = "鐑攢濂楅", notes = "鐑攢濂楅") - @GetMapping("/discountPage") + @PostMapping("/discountPage") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) }) @@ -145,7 +147,16 @@ return ApiResponse.success(discountService.findPage(pageWrap)); } - + @LoginRequired + @ApiOperation(value = "濂楅璇︽儏", notes = "濂楅璇︽儏") + @GetMapping("/discountDetail") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "濂楅涓婚敭", required = true) + }) + public ApiResponse<Discount> discountPage (@RequestParam String id) { + return ApiResponse.success(discountService.findById(id)); + } @LoginRequired @@ -184,6 +195,20 @@ bikeRepairService.saveRepair(repairRequest); return ApiResponse.success("鎿嶄綔鎴愬姛"); } + + + @PreventRepeat + @LoginRequired + @ApiOperation(value = "鎵爜鑾峰彇杞﹁締淇℃伅", notes = "灏忕▼搴忕") + @GetMapping("/getBikeChargingRule") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "閿佸ご鐮併�佺數杞︾爜", required = true) + }) + public ApiResponse<MemberRidesResponse> getBikeChargingRule(@RequestParam String code) { + return ApiResponse.success("鎿嶄綔鎴愬姛",memberRidesService.getBikeChargingRule(code,getMemberId())); + } + @PreventRepeat @LoginRequired @@ -232,6 +257,7 @@ return ApiResponse.success("鏌ヨ鎴愬姛",systemDictDataBiz.queryByCode(dicCode,label)); } + @LoginRequired @ApiOperation(value = "鐢佃溅绔欑偣杩樿溅", notes = "鐢佃溅绔欑偣杩樿溅") @PostMapping("/backElecBike") public ApiResponse backElecBike(@RequestBody BackElecBikeRequest param) { @@ -239,6 +265,8 @@ jtt808Service.backElecBike(param); return ApiResponse.success( null); } + + @LoginRequired @ApiOperation(value = "鐢佃溅涓存椂鍋滆溅", notes = "鐢佃溅涓存椂鍋滆溅") @PostMapping("/pauseElecBike") public ApiResponse pauseElecBike(@RequestBody BackElecBikeRequest param) { @@ -246,4 +274,25 @@ jtt808Service.pauseElecBike(param); return ApiResponse.success( null); } + + + @LoginRequired + @ApiOperation(value = "鐢佃溅寮�閿�", notes = "鐢佃溅寮�閿�") + @PostMapping("/openElecBike") + public ApiResponse openElecBike(@RequestBody OpenElecBikeRequest param) { + param.setMemberId(getMemberId()); + jtt808Service.openLock(param); + return ApiResponse.success( null); + } + + @LoginRequired + @ApiOperation(value = "涓村仠寮�閿�", notes = "涓村仠寮�閿�") + @PostMapping("/pauseOpenElecBike") + public ApiResponse pauseOpenElecBike(@RequestBody BackElecBikeRequest param) { + param.setMemberId(getMemberId()); + jtt808Service.pauseOpenElecBike(param); + return ApiResponse.success( null); + } + + } -- Gitblit v1.9.3