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 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);