From 1147614053efae0314a36c15293a6a5ed4e6d737 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 二月 2025 11:28:02 +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 |   52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 51 insertions(+), 1 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..1c5ee93 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));
     }
 
 
@@ -120,6 +126,38 @@
         rentSite.setIsdeleted(Constants.ZERO);
         rentSite.setStatus(Constants.ZERO);
         return  ApiResponse.success("鏌ヨ鎴愬姛",rentSiteService.findList(rentSite));
+    }
+
+    @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());
+    }
+
+
+    @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
@@ -260,6 +298,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 +310,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,6 +323,9 @@
     @LoginRequired
     @ApiOperation(value = "鐢佃溅寮�閿�", notes = "鐢佃溅寮�閿�")
     @PostMapping("/openElecBike")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+    })
     public ApiResponse openElecBike(@RequestBody OpenElecBikeRequest param) {
         param.setMemberId(getMemberId());
         jtt808Service.openLock(param);
@@ -288,6 +335,9 @@
     @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);

--
Gitblit v1.9.3