mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-06-12 03:09:48 +08:00
update 华为Service
This commit is contained in:
@@ -651,8 +651,8 @@ public class HuaweiServiceV2 {
|
|||||||
if (connectorStatus != 0) {
|
if (connectorStatus != 0) {
|
||||||
setPileAlive(pileSn);
|
setPileAlive(pileSn);
|
||||||
}
|
}
|
||||||
// 计算时间间隔
|
// 计算充电时间(单位:分钟)
|
||||||
String poorDays = DateUtils.getDatePoor(DateUtils.parseDate(endTime), DateUtils.parseDate(startTime));
|
long sumChargingTime = DateUtils.intervalTime(startTime, endTime);
|
||||||
// 通过订单号查询交易流水号
|
// 通过订单号查询交易流水号
|
||||||
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(startChargeSeq);
|
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(startChargeSeq);
|
||||||
if (orderBasicInfo == null) {
|
if (orderBasicInfo == null) {
|
||||||
@@ -680,7 +680,7 @@ public class HuaweiServiceV2 {
|
|||||||
.outputVoltage(String.valueOf(dto.getVoltageA()))
|
.outputVoltage(String.valueOf(dto.getVoltageA()))
|
||||||
.outputCurrent(String.valueOf(dto.getCurrentA()))
|
.outputCurrent(String.valueOf(dto.getCurrentA()))
|
||||||
.SOC(String.valueOf(dto.getSoc()))
|
.SOC(String.valueOf(dto.getSoc()))
|
||||||
.sumChargingTime(poorDays)
|
.sumChargingTime(String.valueOf(sumChargingTime))
|
||||||
.chargingDegree(String.valueOf(dto.getTotalPower()))
|
.chargingDegree(String.valueOf(dto.getTotalPower()))
|
||||||
.chargingAmount(String.valueOf(dto.getTotalMoney()))
|
.chargingAmount(String.valueOf(dto.getTotalMoney()))
|
||||||
|
|
||||||
@@ -745,12 +745,14 @@ public class HuaweiServiceV2 {
|
|||||||
String pileSn = StringUtils.substring(connectorID, 0, 14);
|
String pileSn = StringUtils.substring(connectorID, 0, 14);
|
||||||
setPileAlive(pileSn);
|
setPileAlive(pileSn);
|
||||||
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(startChargeSeq);
|
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(startChargeSeq);
|
||||||
|
Date date = new Date();
|
||||||
if (orderBasicInfo == null) {
|
if (orderBasicInfo == null) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
if (succStat == Constants.zero) {
|
if (succStat == Constants.zero) {
|
||||||
// 成功标识为 0-成功,修改订单状态为 2-待结算,具体的订单金额等详情金额,从所推送的订单信息中取
|
// 成功标识为 0-成功,修改订单状态为 2-待结算,具体的订单金额等详情金额,从所推送的订单信息中取
|
||||||
orderBasicInfo.setOrderStatus(OrderStatusEnum.STAY_SETTLEMENT.getValue());
|
orderBasicInfo.setOrderStatus(OrderStatusEnum.STAY_SETTLEMENT.getValue());
|
||||||
|
orderBasicInfo.setChargeEndTime(date);
|
||||||
}else {
|
}else {
|
||||||
// 若成功标识为失败,则将失败原因记录存库
|
// 若成功标识为失败,则将失败原因记录存库
|
||||||
String reason = StopFailedReasonEnum.getReasonByCode(failReasonCode);
|
String reason = StopFailedReasonEnum.getReasonByCode(failReasonCode);
|
||||||
|
|||||||
Reference in New Issue
Block a user