From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化
---
server/web/src/main/java/com/doumee/api/web/BusinessApi.java | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 109 insertions(+), 3 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..4406c18 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;
@@ -71,6 +73,12 @@
@Autowired
private DiscountService discountService;
+ @Autowired
+ private SitesService sitesService;
+
+ @Autowired
+ private BikesService bikesService;
+
@PreventRepeat
@LoginRequired
@ApiOperation(value = "鎶奸噾鏀粯", notes = "灏忕▼搴忕")
@@ -91,7 +99,7 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "discountId", value = "濂楅涓婚敭", required = true)
})
public ApiResponse<Object> createDiscountOrderPay(@RequestParam String discountId) {
- return ApiResponse.success("鎿嶄綔鎴愬姛",goodsorderService.createDiscountOrderPay(discountId,getMemberId()));
+ return ApiResponse.success("鎿嶄綔鎴愬姛",goodsorderService.createDiscountOrderPay(getMemberId(),discountId));
}
@@ -121,6 +129,38 @@
}
@LoginRequired
+ @ApiOperation(value = "鐢靛姩杞︾珯鐐瑰垪琛�", notes = "灏忕▼搴忕")
+ @GetMapping("/eleSiteList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<List<Sites>> eleSiteList() {
+ return ApiResponse.success("鏌ヨ鎴愬姛",sitesService.getSiteList(Constants.ONE));
+ }
+
+
+ @LoginRequired
+ @ApiOperation(value = "鏌ヨ鎵�鏈夌數鍔ㄨ溅淇℃伅", notes = "灏忕▼搴忕")
+ @GetMapping("/eleBikeList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<List<Bikes>> eleBikeList() {
+ return ApiResponse.success("鏌ヨ鎴愬姛",bikesService.getEleBikes(getMemberId()));
+ }
+
+
+ @LoginRequired
+ @ApiOperation(value = "鑾峰彇鐢靛姩杞﹁繍钀ュ尯鍩�", notes = "灏忕▼搴忕")
+ @GetMapping("/getEleBusinessArea")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<String> getEleBusinessArea() {
+ return ApiResponse.success("鏌ヨ鎴愬姛",systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.PARK_LAT_LNG_LIST).getCode());
+ }
+
+ @LoginRequired
@ApiOperation("娑堣垂鏄庣粏")
@PostMapping("/transactionsPage")
@ApiImplicitParams({
@@ -134,18 +174,28 @@
@LoginRequired
@ApiOperation(value = "鐑攢濂楅", notes = "鐑攢濂楅")
- @GetMapping("/discountPage")
+ @PostMapping("/discountPage")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
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));
}
-
+ @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 +234,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,18 +296,60 @@
return ApiResponse.success("鏌ヨ鎴愬姛",systemDictDataBiz.queryByCode(dicCode,label));
}
+ @LoginRequired
@ApiOperation(value = "鐢佃溅绔欑偣杩樿溅", notes = "鐢佃溅绔欑偣杩樿溅")
@PostMapping("/backElecBike")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
public ApiResponse backElecBike(@RequestBody BackElecBikeRequest param) {
param.setMemberId(getMemberId());
jtt808Service.backElecBike(param);
return ApiResponse.success( null);
}
+
+ @LoginRequired
@ApiOperation(value = "鐢佃溅涓存椂鍋滆溅", notes = "鐢佃溅涓存椂鍋滆溅")
@PostMapping("/pauseElecBike")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
public ApiResponse pauseElecBike(@RequestBody BackElecBikeRequest param) {
param.setMemberId(getMemberId());
jtt808Service.pauseElecBike(param);
return ApiResponse.success( null);
}
+
+
+ @LoginRequired
+ @ApiOperation(value = "鐢佃溅寮�閿�", notes = "鐢佃溅寮�閿�")
+ @PostMapping("/openElecBike")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse<MemberRidesDetailResponse> openElecBike(@RequestBody OpenElecBikeRequest param) {
+ param.setMemberId(getMemberId());
+ return ApiResponse.success(jtt808Service.openLock(param));
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "涓村仠寮�閿�", notes = "涓村仠寮�閿�")
+ @PostMapping("/pauseOpenElecBike")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse pauseOpenElecBike(@RequestBody BackElecBikeRequest param) {
+ param.setMemberId(getMemberId());
+ jtt808Service.pauseOpenElecBike(param);
+ 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