From 1e22fd4f9b5e1e6beb95d68a74c0311f2300762a Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期二, 17 十月 2023 18:24:33 +0800 Subject: [PATCH] 111 --- server/web/src/main/java/com/doumee/api/web/BusinessApi.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 51 insertions(+), 6 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..2766dad 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 @@ -1,17 +1,17 @@ package com.doumee.api.web; +import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.annotation.LoginRequired; 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; +import com.doumee.dao.system.model.SystemDictData; import com.doumee.service.business.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -54,6 +54,9 @@ @Autowired private MemberRidesService memberRidesService; + + @Autowired + private SystemDictDataBiz systemDictDataBiz; @LoginRequired @ApiOperation(value = "鎶奸噾鏀粯", notes = "灏忕▼搴忕") @@ -124,7 +127,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())); } @@ -134,16 +137,58 @@ @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 = "鎵爜瑙i攣", 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 = "鍒锋柊瑙i攣鎯呭喌", 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("鎿嶄綔鎴愬姛"); + } + @LoginRequired + @ApiOperation(value = "鑾峰彇瀛楀吀鍊间俊鎭�", notes = "灏忕▼搴忕") + @GetMapping("/getSysDict") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "dicCode", value = "瀛楀吀缂栫爜", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "label", value = "瀛楀吀鏁板�肩紪鐮�", required = true) + }) + public ApiResponse<SystemDictData> getSysDict(@RequestParam String dicCode, @RequestParam String label) { + return ApiResponse.success("鏌ヨ鎴愬姛",systemDictDataBiz.queryByCode(dicCode,label)); + } } -- Gitblit v1.9.3