From 0acd614bf9d91f640d90898327f3c79185c2d123 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 30 Jul 2025 15:31:34 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E5=90=8E=E7=AE=A1=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=9F=A5=E8=AF=A2=E5=BC=95=E6=B5=81=E6=8A=BD=E6=88=90?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=A1=B5=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/OrderSplitRecordController.java | 5 +++-- .../pile/service/OrderSplitRecordService.java | 2 +- .../impl/OrderSplitRecordServiceImpl.java | 17 +++++++++++++---- .../impl/PileStationInfoServiceImpl.java | 4 ++++ .../com/jsowell/pile/vo/web/PileStationVO.java | 5 +++++ 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderSplitRecordController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderSplitRecordController.java index 9b6627d1c..13ba72fe4 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderSplitRecordController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderSplitRecordController.java @@ -2,6 +2,7 @@ package com.jsowell.web.controller.pile; import com.google.common.collect.ImmutableMap; import com.jsowell.common.core.controller.BaseController; +import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.response.RestApiResponse; import com.jsowell.pile.dto.QueryOrderSplitRecordDTO; import com.jsowell.pile.service.OrderSplitRecordService; @@ -36,8 +37,8 @@ public class OrderSplitRecordController extends BaseController { public RestApiResponse getStationCommissionList(@RequestBody QueryOrderSplitRecordDTO dto) { RestApiResponse response = null; try { - List stationCommissionList = orderSplitRecordService.getStationCommissionList(dto); - response = new RestApiResponse<>(ImmutableMap.of("stationCommissionList", stationCommissionList)); + PageResponse pageResponse = orderSplitRecordService.getStationCommissionList(dto); + response = new RestApiResponse<>(pageResponse); }catch (Exception e) { logger.error("查询站点引流抽成订单列表 error", e); response = new RestApiResponse<>(e); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java index d9ec72eb3..18d066f10 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java @@ -106,6 +106,6 @@ public interface OrderSplitRecordService { * @param dto * @return */ - List getStationCommissionList(QueryOrderSplitRecordDTO dto); + PageResponse getStationCommissionList(QueryOrderSplitRecordDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java index 457dfda9f..26a9b2ba6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java @@ -568,21 +568,30 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { * @return */ @Override - public List getStationCommissionList(QueryOrderSplitRecordDTO dto) { + public PageResponse getStationCommissionList(QueryOrderSplitRecordDTO dto) { int pageNo = dto.getPageNum() == null ? 1 : dto.getPageNum(); int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize(); // 分页 PageUtils.startPage(pageNo, pageSize); List stationCommissionList = orderSplitRecordMapper.getStationCommissionList(dto); if (CollectionUtils.isEmpty(stationCommissionList)) { - return new ArrayList<>(); + return null; } - for (OrderSplitRecordVO orderSplitRecordVO : stationCommissionList) { + PageInfo pageInfo = new PageInfo<>(stationCommissionList); + for (OrderSplitRecordVO orderSplitRecordVO : pageInfo.getList()) { // 计算 抽成总金额 = 抽成电费 + 抽成服务费 BigDecimal commissionAmount = orderSplitRecordVO.getElectricitySplitAmount().add(orderSplitRecordVO.getServiceSplitAmount()); orderSplitRecordVO.setCommissionAmount(commissionAmount); } - return stationCommissionList; + // 组装分页返回参数 + PageResponse pageResponse = PageResponse.builder() + .pageSize(pageSize) + .pageNum(pageNo) + .list(pageInfo.getList()) + .pages(pageInfo.getPages()) + .total(pageInfo.getTotal()) + .build(); + return pageResponse; } /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index 47cc2b637..8e03737d3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -195,6 +195,10 @@ public class PileStationInfoServiceImpl implements PileStationInfoService { if (StringUtils.isNotBlank(pileStationInfo.getMatchCars())) { vo.setSelectMatchCars(Lists.newArrayList(pileStationInfo.getMatchCars().split(","))); } + // 支持服务费率 + if (StringUtils.isNotBlank(String.valueOf(pileStationInfo.getServiceRate()))) { + vo.setServiceRate(pileStationInfo.getServiceRate()); + } // 数据库保存的是GCJ02坐标，需要转换成天地图使用的WGS84坐标 if (StringUtils.isNotBlank(pileStationInfo.getStationLat()) && StringUtils.isNotBlank(pileStationInfo.getStationLng())) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java index b127602b5..0a681c626 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java @@ -288,4 +288,9 @@ public class PileStationVO { */ private String parkingLockFlag; + /** + * 支持服务费率 + */ + private BigDecimal serviceRate; + }