diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 529e8bbeb..ba8ef5ca9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -312,6 +312,20 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { String label = ThirdPlatformTypeEnum.getTypeLabelByTypeCode(thirdPartyType); orderListVO.setThirdPartyType(label + "启动"); } + + // 设置soc + if (StringUtils.isNotBlank(orderListVO.getStartSoc()) || StringUtils.isNotBlank(orderListVO.getEndSoc())) { + // 取redis中的soc数据 + Map socMap = YKCUtils.getSOCMap(orderListVO.getTransactionCode()); + if (Objects.nonNull(socMap)) { + if (StringUtils.isBlank(orderListVO.getStartSoc())) { + orderListVO.setStartSoc(socMap.get("startSoc")); + } + if (StringUtils.isBlank(orderListVO.getEndSoc())) { + orderListVO.setEndSoc(socMap.get("endSoc")); + } + } + } } batchQueryFeeAmt(orderListVOS); diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue index a13192454..bb13a52c3 100644 --- a/jsowell-ui/src/views/order/order/index.vue +++ b/jsowell-ui/src/views/order/order/index.vue @@ -149,7 +149,7 @@ {{ item.startSoc }} - {{ item.endSoc }} + {{ item.endSoc }} {{ item.chargeEndTime }}