From 4500fd649daf2e64aa13067f34934076394426bf Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Mon, 9 Sep 2024 21:10:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/api/uniapp/customer/PileController.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java
index bc0eb488a..17be21e5a 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java
@@ -1,6 +1,7 @@
 package com.jsowell.api.uniapp.customer;
 
 import com.alibaba.fastjson2.JSON;
+import com.google.common.collect.Maps;
 import com.jsowell.common.annotation.Anonymous;
 import com.jsowell.common.core.controller.BaseController;
 import com.jsowell.common.core.page.PageResponse;
@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
 /**
@@ -242,7 +244,13 @@ public class PileController extends BaseController {
             // .join()会抛出未经检查的异常，不会强制开发者处理异常 .get()会抛出检查异常，需要开发者处理
             all.join();
             all.get();
-            response = new RestApiResponse<>(connectorInfoListFuture.get());
+
+            Map<String, Object> map = Maps.newHashMap();
+            map.put("connectorInfoList", connectorInfoListFuture.get());
+            map.put("billingPriceList", billingPriceFuture.get());
+            map.put("merchantInfoVO", merchantInfoVOFuture.get());
+
+            response = new RestApiResponse<>(map);
         }catch (Exception e) {
             logger.error("查询充电枪口详情 error", e);
             response = new RestApiResponse<>(e);