autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 19:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 后管页面查询引流抽成订单列表接口增加分页返回值

Browse Source
This commit is contained in:
Lemon
2025-07-30 15:31:34 +08:00
parent 659f7a75cb
commit 0acd614bf9
5 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java
View File

@@ -106,6 +106,6 @@ public interface OrderSplitRecordService {
* @param dto
* @return
*/
List<OrderSplitRecordVO> getStationCommissionList(QueryOrderSplitRecordDTO dto);
PageResponse getStationCommissionList(QueryOrderSplitRecordDTO dto);
}

17
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
View File

@@ -568,21 +568,30 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
* @return
*/
@Override
public List<OrderSplitRecordVO> 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<OrderSplitRecordVO> stationCommissionList = orderSplitRecordMapper.getStationCommissionList(dto);
if (CollectionUtils.isEmpty(stationCommissionList)) {
return new ArrayList<>();
return null;
}
for (OrderSplitRecordVO orderSplitRecordVO : stationCommissionList) {
PageInfo<OrderSplitRecordVO> 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;
}
/**

4
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
View File

@@ -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())) {

5
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
View File

@@ -288,4 +288,9 @@ public class PileStationVO {
*/
private String parkingLockFlag;
/**
* 支持服务费率
*/
private BigDecimal serviceRate;
}