From ae07f5d74325aac4bc8468a19a2e23771aa93861 Mon Sep 17 00:00:00 2001 From: Lemon Date: Sun, 7 Apr 2024 09:25:30 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E7=BB=93=E6=9D=9F=E5=85=85?= =?UTF-8?q?=E7=94=B5=E6=97=B6=E5=88=A4=E6=96=AD=E8=AF=A5=E6=A1=A9=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AF=B9=E6=8E=A5=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=EF=BC=8C=E8=B0=83=E7=94=A8=E7=BB=9F=E4=B8=80=E5=81=9C?= =?UTF-8?q?=E6=9C=BA=E6=8C=87=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/service/OrderService.java | 51 ++++++++++++------- 1 file changed, 33 insertions(+), 18 deletions(-) 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 20cfa9c8e..d4847a9aa 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -317,29 +317,44 @@ public class OrderService { if (!StringUtils.equals(orderInfo.getMemberId(), dto.getMemberId())) { throw new BusinessException(ReturnCodeEnum.CODE_ORDER_MEMBER_NOT_MATCH_ERROR); } - // 判断该桩所在的站点是否推送了第三方站点（需要我方平台发送启动指令的，如：华为平台） - List relationInfoList = thirdPartyStationRelationService.getRelationInfoList(orderInfo.getStationId()); - - if (CollectionUtils.isNotEmpty(relationInfoList)) { - for (ThirdPartyStationRelationVO vo : relationInfoList) { - String startMode = vo.getStartMode(); - if (StringUtils.equals(Constants.ONE, startMode)) { - // 启动类型为 1 的即为对接了类似华为平台，需要调用第三方平台的统一停止充电接口 - ThirdPartyCommonStopChargeDTO commonStopChargeDTO = new ThirdPartyCommonStopChargeDTO(); - commonStopChargeDTO.setThirdPartyType(vo.getThirdPartyType()); - commonStopChargeDTO.setOrderBasicInfo(orderInfo); - // 调用统一停止充电接口 - String result = commonService.commonStopCharge(commonStopChargeDTO); - log.info("订单:{}调用第三方平台统一停止充电接口，调用结果 SuccStat:{}", orderInfo.getOrderCode(), result); - }else { - // 发送停止指令 - pileRemoteService.remoteStopCharging(orderInfo.getPileSn(), orderInfo.getConnectorCode(), orderInfo.getTransactionCode()); - } + // 判断该桩是否推送了第三方站点（需要我方平台发送启动指令的，如：华为平台） + List list = snRelationService.selectSnRelationListByParams(orderInfo.getStationId(), orderInfo.getPileSn(), null); + if (CollectionUtils.isNotEmpty(list)) { + for (ThirdPartySnRelationVO vo : list) { + ThirdPartyCommonStopChargeDTO commonStopChargeDTO = new ThirdPartyCommonStopChargeDTO(); + commonStopChargeDTO.setThirdPartyType(vo.getThirdPartyType()); + commonStopChargeDTO.setOrderBasicInfo(orderInfo); + // 调用统一停止充电接口 + String result = commonService.commonStopCharge(commonStopChargeDTO); + log.info("订单:{} 调用统一停止充电接口, result:{}", orderInfo, result); } }else { // 发送停止指令 pileRemoteService.remoteStopCharging(orderInfo.getPileSn(), orderInfo.getConnectorCode(), orderInfo.getTransactionCode()); } + + // List relationInfoList = thirdPartyStationRelationService.getRelationInfoList(orderInfo.getStationId()); + // + // if (CollectionUtils.isNotEmpty(relationInfoList)) { + // for (ThirdPartyStationRelationVO vo : relationInfoList) { + // String startMode = vo.getStartMode(); + // if (StringUtils.equals(Constants.ONE, startMode)) { + // // 启动类型为 1 的即为对接了类似华为平台，需要调用第三方平台的统一停止充电接口 + // ThirdPartyCommonStopChargeDTO commonStopChargeDTO = new ThirdPartyCommonStopChargeDTO(); + // commonStopChargeDTO.setThirdPartyType(vo.getThirdPartyType()); + // commonStopChargeDTO.setOrderBasicInfo(orderInfo); + // // 调用统一停止充电接口 + // String result = commonService.commonStopCharge(commonStopChargeDTO); + // log.info("订单:{}调用第三方平台统一停止充电接口，调用结果 SuccStat:{}", orderInfo.getOrderCode(), result); + // }else { + // // 发送停止指令 + // pileRemoteService.remoteStopCharging(orderInfo.getPileSn(), orderInfo.getConnectorCode(), orderInfo.getTransactionCode()); + // } + // } + // }else { + // // 发送停止指令 + // pileRemoteService.remoteStopCharging(orderInfo.getPileSn(), orderInfo.getConnectorCode(), orderInfo.getTransactionCode()); + // } // 发送停止指令 // pileRemoteService.remoteStopCharging(orderInfo.getPileSn(), orderInfo.getConnectorCode(), orderInfo.getTransactionCode()); log.info("订单号:{}发送停机指令成功", dto.getOrderCode());