update 预约充电

jsowell-admin/src/main/java/com/jsowell/service/PileService.java

@@ -20,7 +20,6 @@ import com.jsowell.pile.util.SnUtils;
 import com.jsowell.pile.service.*;
 import com.jsowell.pile.transaction.dto.PileTransactionDTO;
 import com.jsowell.pile.transaction.service.TransactionService;
-import com.jsowell.pile.vo.PileReservedVO;
 import com.jsowell.pile.vo.base.ConnectorInfoVO;
 import com.jsowell.pile.vo.base.MerchantInfoVO;
 import com.jsowell.pile.vo.base.PileInfoVO;
@@ -40,7 +39,6 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.sql.Time;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -399,7 +397,6 @@ public class PileService {
 		if (basicInfo == null){
 			throw new BusinessException(ReturnCodeEnum.CODE_NO_CHARGING_ORDER_ERROR);
 		}
-		String orderCode = basicInfo.getOrderCode();
 		// 根据订单号从redis中获取实时数据信息(默认时间倒叙排列，所以取第一条)
 		List<RealTimeMonitorData> chargingRealTimeData = orderBasicInfoService.getChargingRealTimeData(basicInfo.getTransactionCode());
 		if (CollectionUtils.isEmpty(chargingRealTimeData)) {
@@ -414,6 +411,8 @@ public class PileService {
 				.instantCurrent(realTimeMonitorData.getOutputCurrent())
 				.instantVoltage(realTimeMonitorData.getOutputVoltage())
 				.instantPower(realTimeMonitorData.getOutputPower())
+				.status(orderBasicInfo.getOrderStatus())
+				.soc(realTimeMonitorData.getSOC())
 				.build();
 		return vo;
 	}