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

新增 广西平台Service相关方法

Browse Source
This commit is contained in:
Lemon
2024-12-25 14:40:57 +08:00
parent 330d4b3a99
commit 302d359783
16 changed files with 2985 additions and 2153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java
View File

@@ -75,4 +75,28 @@ public class QueryStartChargeDTO {
* 支付方式(1-余额支付；3-白名单支付；4-微信支付；5-支付宝支付)
*/
private String payMode;
/**
* 查询页码
*/
@JsonProperty(value = "PageNo")
private Integer pageNo;
/**
* 每页数量
*/
@JsonProperty(value = "PageSize")
private Integer pageSize;
/**
* 上次查询时间
*/
@JsonProperty(value = "LastQueryTime")
private String lastQueryTime;
/**
* 上次查询结束时间
*/
@JsonProperty(value = "LastQueryEndTime")
private String lastQueryEndTime;
}

6
jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationInfoDTO.java
View File

@@ -70,6 +70,12 @@ public class QueryStationInfoDTO {
@JsonProperty(value = "StationIDs")
private List<String> stationIds;
/**
* 更多标志
*/
@JsonProperty(value = "MoreFlag")
private Integer moreFlag;
private String address;

8
jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
View File

@@ -1,5 +1,6 @@
package com.jsowell.pile.mapper;
import com.alipay.api.domain.ChargeOrderInfo;
import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.OrderDetail;
import com.jsowell.pile.dto.*;
@@ -394,4 +395,11 @@ public interface OrderBasicInfoMapper {
List<String> tempGetOrderCodes(QueryOrderDTO dto);
/**
* 查询第三方平台订单列表
* @param dto
* @return
*/
List<OrderVO> selectThirdPartyOrderList(@Param("dto") QueryStartChargeDTO dto);
}

7
jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
View File

@@ -1,5 +1,6 @@
package com.jsowell.pile.service;
import com.alipay.api.domain.ChargeOrderInfo;
import com.huifu.adapay.core.exception.BaseAdaPayException;
import com.jsowell.adapay.response.PaymentReverseResponse;
import com.jsowell.adapay.vo.OrderSplitResult;
@@ -476,6 +477,12 @@ public interface OrderBasicInfoService{
*/
void createReservationOrder(ReservationChargingStartupResult chargingStartupResult);
/**
* 查询第三方平台订单列表
* @param dto
*/
List<OrderVO> selectThirdPartyOrderList(QueryStartChargeDTO dto);
//↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ 后管小程序 ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
/**

23
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.jsowell.pile.service.impl;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.alipay.api.domain.ChargeOrderInfo;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -2592,7 +2593,18 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
*/
@Override
public List<AccumulativeInfoVO> getAccumulativeInfoForLianLian(QueryStationInfoDTO dto) {
return orderBasicInfoMapper.getAccumulativeInfoForLianLian(dto);
List<AccumulativeInfoVO> accumulativeInfoList = orderBasicInfoMapper.getAccumulativeInfoForLianLian(dto);
for (AccumulativeInfoVO accumulativeInfoVO : accumulativeInfoList) {
String startTime = accumulativeInfoVO.getStartTime();
String endTime = accumulativeInfoVO.getEndTime();
if (startTime == null || endTime == null) {
continue;
}
// 计算充电时长
int chargingTime = Integer.parseInt(String.valueOf(DateUtils.intervalTime(startTime, endTime))) * 60;
accumulativeInfoVO.setChargingTime(String.valueOf(chargingTime));
}
return accumulativeInfoList;
}
/**
@@ -4096,6 +4108,15 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
orderPayRecordService.batchInsert(Lists.newArrayList(principalPayRecord));
}
/**
* 查询第三方平订单列表
* @param dto
* @return
*/
@Override
public List<OrderVO> selectThirdPartyOrderList(QueryStartChargeDTO dto) {
return orderBasicInfoMapper.selectThirdPartyOrderList(dto);
}
/**

14
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
View File

@@ -1224,7 +1224,6 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
public List<EquipmentInfo> getPileListForLianLian(String stationId) {
List<EquipmentInfo> resultList = new ArrayList<>();
// 通过站点id查询桩基本信息
// List<PileBasicInfo> list = this.getPileListByStationId(stationId);
List<PileDetailInfoVO> list = getPileDetailInfoList(stationId);
// 封装成联联平台对象
for (PileDetailInfoVO pileDetailInfoVO : list) {
@@ -1245,19 +1244,6 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
equipmentInfo.setEquipmentType(Integer.valueOf(pileDetailInfoVO.getSpeedType()));
equipmentInfo.setEquipmentModel(pileDetailInfoVO.getModelName());
// Map<String, String> pileStatus = pileConnectorInfoService.getPileStatus(Lists.newArrayList(pileBasicInfo.getSn()));
// Map<String, String> pileStatusMap = pileConnectorInfoService.getPileStatus(Lists.newArrayList(pileSn));
// String pileStatus = pileStatusMap.get(pileSn);
// if (StringUtils.equals(PileStatusEnum.ON_LINE.getValue(), pileStatus)) {
// // 1-在线
// pileStatus = LianLianPileStatusEnum.NORMAL.getCode();
// } else if (StringUtils.equals(PileStatusEnum.OFF_LINE.getValue(), pileStatus)) {
// // 2-离线
// pileStatus = LianLianPileStatusEnum.CLOSE_OFFLINE.getCode();
// } else if (StringUtils.equals(PileStatusEnum.FAULT.getValue(), pileStatus)) {
// // 3-故障
// pileStatus = LianLianPileStatusEnum.UNDER_MAINTENANCE.getCode();
// }
equipmentInfo.setEquipmentStatus(Integer.valueOf(pileDetailInfoVO.getPileStatus()));
equipmentInfo.setEquipmentPower(new BigDecimal(pileDetailInfoVO.getRatedPower()).setScale(1, BigDecimal.ROUND_HALF_UP));
equipmentInfo.setNewNationalStandard(1);

5
jsowell-pile/src/main/java/com/jsowell/pile/vo/lianlian/AccumulativeInfoVO.java
View File

@@ -41,6 +41,11 @@ public class AccumulativeInfoVO {
*/
private String endTime;
/**
* 充电时长
*/
private String chargingTime;
/**
* 枪口充电量
*/