diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index c63ae725a..667ab840c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -524,10 +524,12 @@ public class OrderService { */ public UniAppOrderVO getUniAppOrderDetail(String orderCode) { OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); + OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode); + UniAppOrderVO vo = new UniAppOrderVO(); if (orderBasicInfo == null) { throw new BusinessException(ReturnCodeEnum.CODE_QUERY_ORDER_INFO_IS_NULL); } - UniAppOrderVO vo = new UniAppOrderVO(); + vo.setOrderCode(orderBasicInfo.getOrderCode()); vo.setPileSn(orderBasicInfo.getPileSn()); vo.setConnectorCode(orderBasicInfo.getConnectorCode()); @@ -590,9 +592,9 @@ public class OrderService { vo.setOutputCurrent(data.getOutputCurrent()); vo.setOutputVoltage(data.getOutputVoltage()); vo.setSOC(data.getSOC()); - BigDecimal chargingAmount = new BigDecimal(monitorData.getChargingAmount()).setScale(2, BigDecimal.ROUND_HALF_UP); // 充电金额 + BigDecimal chargingAmount = new BigDecimal(monitorData.getChargingAmount()).setScale(4, BigDecimal.ROUND_HALF_UP); // 充电金额 vo.setChargingAmount(chargingAmount.toString()); - BigDecimal chargingDegree = new BigDecimal(monitorData.getChargingDegree()).setScale(2, BigDecimal.ROUND_HALF_UP); // 充电度数 + BigDecimal chargingDegree = new BigDecimal(monitorData.getChargingDegree()).setScale(4, BigDecimal.ROUND_HALF_UP); // 充电度数 vo.setChargingDegree(chargingDegree.toString()); vo.setSumChargingTime(monitorData.getSumChargingTime()); vo.setTimeRemaining(monitorData.getTimeRemaining()); @@ -602,12 +604,13 @@ public class OrderService { Collections.reverse(chargingDataList); vo.setChargingDataList(chargingDataList); } - - OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode); if (orderDetail != null) { OrderAmountDetailVO billingDetails = new OrderAmountDetailVO(); BeanUtils.copyBeanProp(billingDetails, orderDetail); vo.setBillingDetails(billingDetails); + if (StringUtils.equals(OrderStatusEnum.ORDER_COMPLETE.getValue(), orderStatus)) { + vo.setChargingDegree(String.valueOf(orderDetail.getTotalUsedElectricity())); + } } try { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PushStationInfoDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PushStationInfoDTO.java index 8f80fa4cb..2bc71208c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PushStationInfoDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PushStationInfoDTO.java @@ -5,6 +5,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + /** * 联联平台推送站点信息 * @@ -47,4 +49,9 @@ public class PushStationInfoDTO { * 站点id */ private Long stationId; + + /** + * 要推送的第三方平台类型数组 + */ + private List thirdPartyTypes; }