Merge branch 'dev' of http://192.168.2.46:8099/jsowell/jsowell-charger-web into dev

2026-04-22 03:55:17 +08:00 · 2024-07-30 14:19:40 +08:00
parent 01fb1e7b2a 3308554a70
commit 9edd3d9933
44 changed files with 1065 additions and 271 deletions
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java
@@ -50,7 +50,7 @@ public class OrderController extends BaseController {
 	 */
 	@PostMapping("/generateOrder")
 	public RestApiResponse<?> generateOrder(HttpServletRequest request, @RequestBody GenerateOrderDTO dto) {
-		logger.info("生成订单 param:{}", JSON.toJSONString(dto));
+		// logger.info("生成订单 param:{}", JSON.toJSONString(dto));
 		RestApiResponse<?> response;
 		try {
 			if ((StringUtils.isBlank(dto.getPileSn()) || StringUtils.isBlank(dto.getConnectorCode())) && StringUtils.isBlank(dto.getPileConnectorCode())) {
@@ -80,7 +80,7 @@ public class OrderController extends BaseController {
 			logger.error("生成订单 error, param:{}", JSON.toJSONString(dto), e);
 			response = new RestApiResponse<>(ReturnCodeEnum.CODE_GENERATE_ORDER_ERROR);
 		}
-		logger.info("生成订单 result:{}", JSON.toJSONString(response));
+		logger.info("生成订单, param:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
 		return response;
 	}

@@ -137,7 +137,7 @@ public class OrderController extends BaseController {
 	 */
 	@PostMapping("/getOrderList")
 	public RestApiResponse<?> getOrderInfo(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) {
-		logger.info("查询订单信息 param:{}", JSON.toJSONString(dto));
+		// logger.info("查询订单信息 param:{}", JSON.toJSONString(dto));
 		RestApiResponse<?> response = null;
 		try {
 			String memberId = getMemberIdByAuthorization(request);
@@ -154,7 +154,7 @@ public class OrderController extends BaseController {
 			logger.error("查询订单信息 error", e);
 			response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_ORDER_INFO_BY_MEMBER_ID_ERROR);
 		}
-		logger.info("查询订单信息, result:{}", JSON.toJSONString(response));
+		logger.info("查询订单信息, param:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
 		return response;
 	}

@@ -167,7 +167,7 @@ public class OrderController extends BaseController {
 	 */
 	@PostMapping("/getOrderDetail")
 	public RestApiResponse<?> getOrderDetail(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) {
-		logger.info("小程序获取订单详情 param:{}", JSON.toJSONString(dto));
+		// logger.info("小程序获取订单详情 param:{}", JSON.toJSONString(dto));
 		RestApiResponse<?> response = null;
 		try {
 			String memberId = getMemberIdByAuthorization(request);
@@ -194,27 +194,27 @@ public class OrderController extends BaseController {
 	 * @param dto
 	 * @return
 	 */
-	@PostMapping("/getOrderDetailV2")
-	public RestApiResponse<?> getOrderDetailV2(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) {
-		logger.info("小程序获取订单详情V2 param:{}", JSON.toJSONString(dto));
-		RestApiResponse<?> response = null;
-		try {
-			String memberId = getMemberIdByAuthorization(request);
-			if (StringUtils.isBlank(memberId)) {
-				throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR);
-			}
-			UniAppOrderDetailVO uniAppOrderDetail = orderService.getUniAppOrderDetailV2(dto.getOrderCode());
-			response = new RestApiResponse<>(uniAppOrderDetail);
-		} catch (BusinessException e) {
-			logger.warn("小程序获取订单详情V2 warn", e);
-			response = new RestApiResponse<>(e.getCode(), e.getMessage());
-		} catch (Exception e) {
-			logger.error("小程序获取订单详情V2 error", e);
-			response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_ORDER_DETAIL_ERROR);
-		}
-		logger.info("小程序获取订单详情V2, result:{}", JSON.toJSONString(response));
-		return response;
-	}
+	// @PostMapping("/getOrderDetailV2")
+	// public RestApiResponse<?> getOrderDetailV2(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) {
+	// 	logger.info("小程序获取订单详情V2 param:{}", JSON.toJSONString(dto));
+	// 	RestApiResponse<?> response = null;
+	// 	try {
+	// 		String memberId = getMemberIdByAuthorization(request);
+	// 		if (StringUtils.isBlank(memberId)) {
+	// 			throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR);
+	// 		}
+	// 		UniAppOrderDetailVO uniAppOrderDetail = orderService.getUniAppOrderDetailV2(dto.getOrderCode());
+	// 		response = new RestApiResponse<>(uniAppOrderDetail);
+	// 	} catch (BusinessException e) {
+	// 		logger.warn("小程序获取订单详情V2 warn", e);
+	// 		response = new RestApiResponse<>(e.getCode(), e.getMessage());
+	// 	} catch (Exception e) {
+	// 		logger.error("小程序获取订单详情V2 error", e);
+	// 		response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_ORDER_DETAIL_ERROR);
+	// 	}
+	// 	logger.info("小程序获取订单详情V2, result:{}", JSON.toJSONString(response));
+	// 	return response;
+	// }

 	/**
 	 * 根据订单号查询充电桩启动状态
@@ -268,7 +268,7 @@ public class OrderController extends BaseController {
 	 */
 	@PostMapping("/closeStartFailedOrder")
 	public RestApiResponse<?> closeStartFailedOrder(@RequestBody QueryOrderDTO dto) {
-		logger.info("关闭支付未启动的订单 param:{}", JSON.toJSONString(dto));
+		// logger.info("关闭支付未启动的订单 param:{}", JSON.toJSONString(dto));
 		RestApiResponse<?> response = null;
 		try {
 			orderService.closeStartFailedOrder(dto);
@@ -277,7 +277,7 @@ public class OrderController extends BaseController {
 			logger.error("关闭支付未启动的订单 error", e);
 			response = new RestApiResponse<>("00300002", "关闭支付未启动的订单异常");
 		}
-		logger.info("关闭支付未启动的订单 result:{}", response);
+		logger.info("关闭支付未启动的订单, param:{}, result:{}", JSON.toJSONString(dto), response);
 		return response;
 	}

@@ -305,6 +305,7 @@ public class OrderController extends BaseController {
 			logger.error("查询未开发票订单 error", e);
 			response = new RestApiResponse<>("00300003", "查询未开发票订单异常");
 		}
+		logger.info("查询未开发票订单 param:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
 		return response;
 	}

@@ -317,7 +318,7 @@ public class OrderController extends BaseController {
 	 */
 	@PostMapping("/queryUninvoicedStationList")
 	public RestApiResponse<?> queryUninvoicedStationList(HttpServletRequest request, @RequestBody QueryOrderDTO dto) {
-		logger.info("查询未开发票的站点list param:{}", JSON.toJSONString(dto));
+		// logger.info("查询未开发票的站点list param:{}", JSON.toJSONString(dto));
 		RestApiResponse<?> response;
 		try {
 			String memberId = getMemberIdByAuthorization(request);
@@ -334,6 +335,7 @@ public class OrderController extends BaseController {
 			logger.error("查询未开发票的站点list error", e);
 			response = new RestApiResponse<>("00300004", "查询未开发票的站点list异常");
 		}
+		logger.info("查询未开发票的站点list param:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
 		return response;
 	}

--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java
@@ -13,6 +13,8 @@ import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.dto.*;
 import com.jsowell.pile.service.PileBasicInfoService;
 import com.jsowell.pile.service.PileMerchantInfoService;
+import com.jsowell.pile.service.PileReservationInfoService;
+import com.jsowell.pile.vo.PileReservationInfoVO;
 import com.jsowell.pile.vo.uniapp.customer.PersonPileConnectorSumInfoVO;
 import com.jsowell.pile.vo.uniapp.customer.PersonPileRealTimeVO;
 import com.jsowell.pile.vo.uniapp.customer.PersonalPileInfoVO;
@@ -43,6 +45,9 @@ public class PersonPileController extends BaseController {
    @Autowired
    private PileBasicInfoService pileBasicInfoService;

+    @Autowired
+    private PileReservationInfoService pileReservationInfoService;
+

    /**
     * 用户绑定个人桩
@@ -117,7 +122,7 @@ public class PersonPileController extends BaseController {
            if (StringUtils.isNotBlank(appId)) {
                String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByWxAppId(appId);
                if (StringUtils.isNotBlank(firstLevelMerchantId)) {
-                    dto.setMerchantId(firstLevelMerchantId);
+                    dto.setFirstLevelMerchantId(firstLevelMerchantId);
                }
            }
            String memberId = getMemberIdByAuthorization(request);
@@ -136,6 +141,8 @@ public class PersonPileController extends BaseController {
    }


+
+
    /**
     * 通过memberId查个人桩列表
     * <p>
@@ -162,7 +169,6 @@ public class PersonPileController extends BaseController {

    /**
     * 获取枪口实时数据
-     * <p>
     * http://localhost:8080/uniapp/personalPile/getConnectorRealTimeInfo
     *
     * @param request
@@ -171,7 +177,6 @@ public class PersonPileController extends BaseController {
     */
    @PostMapping("/getConnectorRealTimeInfo")
    public RestApiResponse<?> getConnectorRealTimeInfo(HttpServletRequest request, @RequestBody QueryPersonPileDTO dto) {
-        logger.info("获取个人桩枪口实时数据  params:{}", JSON.toJSONString(dto));
        RestApiResponse<?> response = null;
        try {
            String memberId = getMemberIdByAuthorization(request);
@@ -179,13 +184,13 @@ public class PersonPileController extends BaseController {
            PersonPileRealTimeVO connectorRealTimeInfo = pileService.getConnectorRealTimeInfo(dto);
            response = new RestApiResponse<>(connectorRealTimeInfo);
        } catch (BusinessException e) {
-            logger.error("获取个人桩枪口实时数据 error", e);
+            logger.error("获取个人桩枪口实时数据 warn:{}", e.getMessage());
            response = new RestApiResponse<>(e.getCode(), e.getMessage());
        } catch (Exception e) {
            logger.error("获取个人桩枪口实时数据 error", e);
            response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_PERSONAL_PILE_CONNECTOR_INFO_ERROR);
        }
-        logger.info("获取个人桩枪口实时数据 result:{}", response);
+        logger.info("获取个人桩枪口实时数据 params:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
        return response;
    }

@@ -248,7 +253,7 @@ public class PersonPileController extends BaseController {
    }

    /**
-     * 个人桩启动充电
+     * 个人桩启动充电/个人桩一键启动
     * http://localhost:8080/uniapp/personalPile/startPersonalPileCharging
     */
    @PostMapping("/startPersonalPileCharging")
@@ -268,25 +273,56 @@ public class PersonPileController extends BaseController {
            logger.error("个人桩启动充电error, params:{}", dto, e);
        } catch (Exception e) {
            logger.error("个人桩启动充电error, params:{}", dto, e);
-            response = new RestApiResponse<>(ReturnCodeEnum.CODE_CREATE_RESERVED_ERROR);
+            response = new RestApiResponse<>(ReturnCodeEnum.CODE_START_PERSONAL_PILE_CHARGING_ERROR);
        }
        logger.info("个人桩启动充电params:{}, result:{}", dto, response);
        return response;
    }


+    /**
+     * 个人桩停止充电
+     * http://localhost:8080/uniapp/personalPile/personPileStopCharging
+     * 管理员可以停自己启动的和别人启动的
+     * 其他人员只能停止自己启动的
+     */
+    @PostMapping("/personPileStopCharging")
+    public RestApiResponse<?> personPileStopCharging(HttpServletRequest request, @RequestBody PersonPileStopChargingDTO dto) {
+        RestApiResponse<?> response = null;
+        try {
+            String appId = request.getHeader("appId");
+            if (StringUtils.isNotBlank(appId)) {
+                String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByWxAppId(appId);
+                if (StringUtils.isNotBlank(firstLevelMerchantId)) {
+                    dto.setFirstLevelMerchantId(firstLevelMerchantId);
+                }
+            }
+            String memberId = getMemberIdByAuthorization(request);
+            dto.setMemberId(memberId);
+            pileReservationInfoService.personPileStopCharging(dto);
+            response = new RestApiResponse<>();
+        } catch (BusinessException e) {
+            logger.error("个人桩停止充电error", e);
+            response = new RestApiResponse<>(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            logger.error("个人桩停止充电error", e);
+            response = new RestApiResponse<>(ReturnCodeEnum.CODE_PERSON_PILE_STOP_CHARGING_ERROR);
+        }
+        return response;
+    }
+
+
    /**
     * 添加预约充电
     * http://localhost:8080/uniapp/personalPile/createReserved
     */
    @PostMapping("/createReserved")
    public RestApiResponse<?> createReserved(HttpServletRequest request, @RequestBody CreateReservedDTO dto) {
-        // logger.info("修改预约充电状态params:{}", dto);
        RestApiResponse<?> response = null;
        try {
            String memberId = getMemberIdByAuthorization(request);
            dto.setMemberId(memberId);
-            int reservedId = pileService.createReserved(dto);
+            int reservedId = pileReservationInfoService.createReservation(dto);
            response = new RestApiResponse<>(ImmutableMap.of("reservedId", reservedId));
        } catch (BusinessException e) {
            logger.error("添加预约充电error, params:{}", dto, e);
@@ -305,12 +341,11 @@ public class PersonPileController extends BaseController {
     */
    @PostMapping("/queryReservedList")
    public RestApiResponse<?> queryReservedList(HttpServletRequest request, @RequestBody PileReservationDTO dto) {
-        // logger.info("修改预约充电状态params:{}", dto);
        RestApiResponse<?> response = null;
        try {
            String memberId = getMemberIdByAuthorization(request);
            dto.setMemberId(memberId);
-            PageResponse pageResponse = pileService.queryReservedList(dto);
+            PageResponse pageResponse = pileReservationInfoService.queryReservationList(dto);
            response = new RestApiResponse<>(pageResponse);
        } catch (BusinessException e) {
            logger.error("查询预约列表error, params:{}", dto, e);
@@ -323,18 +358,40 @@ public class PersonPileController extends BaseController {
        return response;
    }

+    /**
+     * 修改预约充电
+     * http://localhost:8080/uniapp/personalPile/updateReservation
+     */
+    @PostMapping("/updateReservation")
+    public RestApiResponse<?> updateReservation(HttpServletRequest request, @RequestBody PileReservationDTO dto) {
+        RestApiResponse<?> response = null;
+        try {
+            String memberId = getMemberIdByAuthorization(request);
+            dto.setMemberId(memberId);
+            pileReservationInfoService.updateReservation(dto);
+            response = new RestApiResponse<>();
+        } catch (BusinessException e) {
+            logger.error("修改预约充电信息error, params:{}", dto, e);
+            response = new RestApiResponse<>(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            logger.error("修改预约充电信息error, params:{}", dto, e);
+            response = new RestApiResponse<>(ReturnCodeEnum.CODE_UPDATE_RESERVED_STATUS_ERROR);
+        }
+        logger.info("修改预约充电信息params:{}, result:{}", dto, response);
+        return response;
+    }
+
    /**
     * 修改预约充电状态
     * http://localhost:8080/uniapp/personalPile/updateReservedStatus
     */
    @PostMapping("/updateReservedStatus")
    public RestApiResponse<?> updateReservedStatus(HttpServletRequest request, @RequestBody PileReservationDTO dto) {
-        // logger.info("修改预约充电状态params:{}", dto);
        RestApiResponse<?> response = null;
        try {
            String memberId = getMemberIdByAuthorization(request);
            dto.setMemberId(memberId);
-            pileService.updateReservedStatus(dto);
+            pileReservationInfoService.updateReservationStatus(dto);
            response = new RestApiResponse<>();
        } catch (BusinessException e) {
            logger.error("修改预约充电状态error, params:{}", dto, e);
@@ -353,23 +410,43 @@ public class PersonPileController extends BaseController {
     */
    @PostMapping("/deleteReservation")
    public RestApiResponse<?> deleteReservation(HttpServletRequest request, @RequestBody PileReservationDTO dto) {
-        // logger.info("修改预约充电状态params:{}", dto);
        RestApiResponse<?> response = null;
        try {
            String memberId = getMemberIdByAuthorization(request);
            dto.setMemberId(memberId);
-            pileService.deleteReservation(dto);
+            pileReservationInfoService.deleteReservation(dto);
            response = new RestApiResponse<>();
        } catch (BusinessException e) {
-            logger.error("修改预约充电状态error, params:{}", dto, e);
+            logger.error("删除预约error, params:{}", dto, e);
            response = new RestApiResponse<>(e.getCode(), e.getMessage());
        } catch (Exception e) {
-            logger.error("修改预约充电状态error, params:{}", dto, e);
+            logger.error("删除预约error, params:{}", dto, e);
            response = new RestApiResponse<>(ReturnCodeEnum.CODE_UPDATE_RESERVED_STATUS_ERROR);
        }
-        logger.info("修改预约充电状态params:{}, result:{}", dto, response);
+        logger.info("删除预约params:{}, result:{}", dto, response);
        return response;
    }

-
+    /**
+     * 根据充电桩查询预约信息
+     * http://localhost:8080/uniapp/personalPile/queryReservationInfo
+     */
+    @PostMapping("/queryReservationInfo")
+    public RestApiResponse<?> queryReservationInfo(HttpServletRequest request, @RequestBody PileReservationDTO dto) {
+        RestApiResponse<?> response = null;
+        try {
+            String memberId = getMemberIdByAuthorization(request);
+            dto.setMemberId(memberId);
+            PileReservationInfoVO vo = pileReservationInfoService.queryReservationInfo(dto);
+            response = new RestApiResponse<>(vo);
+        } catch (BusinessException e) {
+            logger.error("根据充电桩查询预约状态error, params:{}", dto, e);
+            response = new RestApiResponse<>(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            logger.error("根据充电桩查询预约状态error, params:{}", dto, e);
+            response = new RestApiResponse<>(ReturnCodeEnum.CODE_QUERY_RESERVATION_STATUS_ERROR);
+        }
+        logger.info("根据充电桩查询预约状态params:{}, result:{}", dto, response);
+        return response;
+    }
 }
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -557,12 +557,29 @@ public class OrderService {
            throw new BusinessException(ReturnCodeEnum.CODE_QUERY_ORDER_INFO_IS_NULL);
        }

+        String pileSn = orderBasicInfo.getPileSn();
+        String connectorCode = orderBasicInfo.getConnectorCode();
+
+        // 异步发送获取实时数据指令
+        if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.IN_THE_CHARGING.getValue())) {
+            CompletableFuture.runAsync(() -> {
+                try {
+                    pileRemoteService.getRealTimeMonitorData(pileSn, connectorCode);
+                } catch (Exception e) {
+                    log.error("异步发送获取实时数据指令error", e);
+                }
+            });
+        }
+
        vo.setOrderCode(orderBasicInfo.getOrderCode());
-        vo.setPileSn(orderBasicInfo.getPileSn());
-        vo.setConnectorCode(orderBasicInfo.getConnectorCode());
-        vo.setPileConnectorCode(orderBasicInfo.getPileSn() + orderBasicInfo.getConnectorCode());
+        vo.setPileSn(pileSn);
+        vo.setConnectorCode(connectorCode);
+        vo.setPileConnectorCode(pileSn + connectorCode);
        String orderStatus = orderBasicInfo.getOrderStatus();
        vo.setOrderStatus(orderStatus);
+        // 订单状态描述
+        String orderStatusDescribe = orderBasicInfoService.transformOrderStatusDescribe(orderStatus, orderBasicInfo.getPayStatus());
+        vo.setOrderStatusDescribe(orderStatusDescribe);
        if (Objects.nonNull(orderBasicInfo.getChargeStartTime())) {
            vo.setStartChargingTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeStartTime()));
        }
@@ -583,9 +600,6 @@ public class OrderService {
        if (StringUtils.isNotBlank(String.valueOf(stationInfo.getOccupyFee()))) {
            vo.setOccupyFee(stationInfo.getOccupyFee());
        }
-        // 订单状态描述
-        String orderStatusDescribe = orderBasicInfoService.transformOrderStatusDescribe(orderStatus, orderBasicInfo.getPayStatus());
-        vo.setOrderStatusDescribe(orderStatusDescribe);

        // 获取充电桩枪口信息
        PileConnectorDetailVO pileConnectorDetailVO = pileService.queryPileConnectorDetail(vo.getPileConnectorCode());
@@ -661,19 +675,6 @@ public class OrderService {
        return vo;
    }

-    /**
-     * 小程序订单详情V2
-     *
-     * @param orderCode
-     * @return
-     */
-    public UniAppOrderDetailVO getUniAppOrderDetailV2(String orderCode) {
-        UniAppOrderDetailVO resultVO = new UniAppOrderDetailVO();
-
-
-        return resultVO;
-    }
-
    /**
     * 根据订单号查询充电桩启动状态
     *
--- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
+++ b/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;
@@ -339,7 +337,7 @@ public class PileService {
 	 */
 	public void adminIssuePile(PileMemberBindingDTO dto) {
 		// 通过前端传的手机号查询是否有此用户
-		MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber(), dto.getMerchantId());
+		MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber(), dto.getFirstLevelMerchantId());
 		if (memberBasicInfo == null) {
 			// 为空说明此用户未注册平台账号
 			throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER);
@@ -377,7 +375,7 @@ public class PileService {
 			PileMemberRelation info = new PileMemberRelation();
 			info.setPileSn(dto.getPileSn());
 			info.setMemberId(memberBasicInfo.getMemberId());
-			info.setType("2");
+			info.setType(Constants.TWO);
 			pileMemberRelationService.insertPileMemberRelation(info);
 		}
 	}
@@ -390,7 +388,7 @@ public class PileService {
 	public PersonPileRealTimeVO getConnectorRealTimeInfo(QueryPersonPileDTO dto) {
 		// 根据memberId查出该用户 正在充电、个人桩启动（白名单支付方式）的订单号
 		OrderBasicInfo orderBasicInfo = OrderBasicInfo.builder()
-				.memberId(dto.getMemberId())
+				// .memberId(dto.getMemberId())
 				.orderStatus(OrderStatusEnum.IN_THE_CHARGING.getValue())
 				.pileConnectorCode(dto.getPileConnectorCode())
 				.payMode(OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue()) // 3- 白名单支付
@@ -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;
 	}
@@ -569,60 +568,6 @@ public class PileService {
 		}
 	}

-	public int createReserved(CreateReservedDTO dto) {
-		PileReservationInfo reservedInfo = new PileReservationInfo();
-		reservedInfo.setMemberId(dto.getMemberId());
-		reservedInfo.setPileSn(dto.getPileSn());
-		reservedInfo.setPileConnectorCode(dto.getPileConnectorCode());
-		reservedInfo.setStatus(Constants.ZERO); // 默认未生效
-		// reservedInfo.setStartTime(DateUtils.parseDate(dto.getStartTime()));
-		reservedInfo.setStartTime(Time.valueOf(dto.getStartTime()));
-		// reservedInfo.setEndTime(DateUtils.parseDate(dto.getEndTime()));
-		if (StringUtils.isNotBlank(dto.getEndTime())) {
-			reservedInfo.setEndTime(Time.valueOf(dto.getEndTime()));
-		}
-		if (StringUtils.isNotBlank(dto.getFreq())) {
-			reservedInfo.setReservationType("recurring");
-			reservedInfo.setFreq(dto.getFreq());
-		} else {
-			reservedInfo.setReservationType("single");
-			reservedInfo.setFreq(null);
-		}
-		reservedInfo.setCreateBy(dto.getMemberId());
-		pileReservationInfoService.insertSelective(reservedInfo);
-		return reservedInfo.getId();
-	}
-
-	public PageResponse queryReservedList(PileReservationDTO dto) {
-		int pageNo = dto.getPageNo() == null ? Constants.one : dto.getPageNo();
-		int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
-		PageHelper.startPage(pageNo, pageSize);
-		List<PileReservationInfo> list = pileReservationInfoService.getReservationsByMemberIdAndPileSn(dto.getMemberId(), dto.getPileSn());
-		PageInfo<PileReservationInfo> pageInfo = new PageInfo<>(list);
-
-		PageResponse pageResponse = new PageResponse();
-		pageResponse.setPageNum(pageInfo.getPageNum());
-		pageResponse.setPageSize(pageInfo.getPageSize());
-		pageResponse.setPages(pageInfo.getPages());
-		pageResponse.setTotal(pageInfo.getTotal());
-
-		List<PileReservedVO> resultList = Lists.newArrayList();
-		for (PileReservationInfo reservedInfo : pageInfo.getList()) {
-			resultList.add(
-					PileReservedVO.builder()
-							.reservedId(reservedInfo.getId() + "")
-							.pileSn(reservedInfo.getPileSn())
-							.startTime(reservedInfo.getStartTime().toString())
-							.endTime(reservedInfo.getEndTime().toString())
-							.freq(reservedInfo.getFreq())
-							.status(reservedInfo.getStatus())
-							.build()
-			);
-		}
-		pageResponse.setList(resultList);
-		return pageResponse;
-	}
-
 	public void deleteReservation(PileReservationDTO dto) {
 		pileReservationInfoService.deleteReservation(dto);
 	}
@@ -656,4 +601,5 @@ public class PileService {
 		// System.out.println(i);
 		return String.valueOf(i);
 	}
+
 }
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderPileOccupyController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderPileOccupyController.java
@@ -111,4 +111,14 @@ public class OrderPileOccupyController extends BaseController {
    // {
    //     return toAjax(orderPileOccupyService.deleteByPrimaryKey(ids));
    // }
+
+    /**
+     * 重新计算占桩金额
+     * retryCalculateOccupyPileOrderAmount
+     */
+    @PreAuthorize("@ss.hasPermi('pile:occupy:edit')")
+    @PostMapping("/retryCalculateOccupyPileOrderAmount")
+    public AjaxResult retryCalculateOccupyPileOrderAmount(@RequestBody MakeOrderFreeDTO dto) {
+        return toAjax(orderPileOccupyService.retryCalculateOccupyPileOrderAmount(dto.getOccupyCode()));
+    }
 }