From 856f526f823f5dad88c28657d82f971ff66afb1e Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 15 九月 2025 13:37:01 +0800
Subject: [PATCH] 优化
---
server/web/src/main/java/com/doumee/api/web/BusinessApi.java | 65 ++++++++++++++++++++++++++++++--
1 files changed, 61 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 e4e531a..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
@@ -73,6 +73,12 @@
@Autowired
private DiscountService discountService;
+ @Autowired
+ private SitesService sitesService;
+
+ @Autowired
+ private BikesService bikesService;
+
@PreventRepeat
@LoginRequired
@ApiOperation(value = "鎶奸噾鏀粯", notes = "灏忕▼搴忕")
@@ -93,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));
}
@@ -123,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({
@@ -143,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));
}
@@ -260,6 +299,9 @@
@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);
@@ -269,6 +311,9 @@
@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);
@@ -279,20 +324,32 @@
@LoginRequired
@ApiOperation(value = "鐢佃溅寮�閿�", notes = "鐢佃溅寮�閿�")
@PostMapping("/openElecBike")
- public ApiResponse openElecBike(@RequestBody OpenElecBikeRequest param) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse<MemberRidesDetailResponse> openElecBike(@RequestBody OpenElecBikeRequest param) {
param.setMemberId(getMemberId());
- jtt808Service.openLock(param);
- return ApiResponse.success( null);
+ 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