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 9270cf28f..7215be9f9 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -743,6 +743,11 @@ public class OrderService { return false; } + String pileSn = orderBasicInfo.getPileSn(); + + // 发送停止充电指令 + pileRemoteService.remoteStopCharging(pileSn, orderBasicInfo.getConnectorCode(), orderBasicInfo.getTransactionCode()); + List stationDeptIds = authorizedMap.getStationDeptIds(); if (CollectionUtils.isEmpty(stationDeptIds)) { // 运营商管理员 @@ -781,7 +786,7 @@ public class OrderService { String mode = pileMerchantInfoService.getDelayModeByMerchantId(orderBasicInfo.getMerchantId()); AbstractProgramLogic orderLogic = ProgramLogicFactory.getProgramLogic(mode); // 判断汽车还是电单车 - String pileSn = orderBasicInfo.getPileSn(); + if (YouDianUtils.isEBikePileSn(pileSn)) { // 电单车桩 EBikeMessageCmd03 message = new EBikeMessageCmd03(new BigDecimal(chargingDegree), EBikeStopReasonEnum.EXTERNAL_OPERATION_STOPPED.getCode()); @@ -796,8 +801,7 @@ public class OrderService { orderLogic.settleOrder(data, orderBasicInfo); } - // 发送停止充电指令 - pileRemoteService.remoteStopCharging(pileSn, orderBasicInfo.getConnectorCode(), orderBasicInfo.getTransactionCode()); + log.info("人工结算订单-end orderCode:{}", dto.getOrderCode()); diff --git a/jsowell-admin/src/test/resources/payment_ids b/jsowell-admin/src/test/resources/payment_ids index f8f11eff0..08e89e229 100644 --- a/jsowell-admin/src/test/resources/payment_ids +++ b/jsowell-admin/src/test/resources/payment_ids @@ -1,39 +1,36 @@ -002212025032707395010751116440759939072 -002212025032707495010751118955641921536 -002212025032707525410751119730954821632 -002212025032707541910751120083419492352 -002212025032708085010751123737666105344 -002212025032708103910751124196842721280 -002212025032708292210751128908041502720 -002212025032709073810751138536998817792 -002212025032709110410751139399103102976 -002212025032710370110751161028935651328 -002212025032805525510751451920944320512 -002212025032807022110751469395711340544 -002212025032807063810751470474940833792 -002212025032807180010751473334800060416 -002212025032807291410751476160502665216 -002212025032807330210751477118775635968 -002212025032807343110751477488698494976 -002212025032807351210751477663967571968 -002212025032807351410751477670158258176 -002212025032807382710751478482001956864 -002212025032807393110751478749735866368 -002212025032807415110751479337035993088 -002212025032807434910751479829592985600 -002212025032807445610751480111090843648 -002212025032807451510751480193108127744 -002212025032807461310751480436532678656 -002212025032807515410751481866872635392 -002212025032807542710751482506644000768 -002212025032807561710751482967493152768 -002212025032808030310751484671458373632 -002212025032808451010751495270955724800 -002212025032809471210751510882628132864 -002212025032810291910751521478707752960 -002212025032813124910751562628508397568 -002212025032815131910751592952094711808 -002212025032816151410751608533932281856 -002212025033007104710752196294741315584 -002212025033011185110752258722946600960 -002212025033011393810752263951839178752 +002212025030719382010744049501247139840 +002212025030719563810744054105780006912 +002212025030720004310744055134645907456 +002212025030721111810744072895195803648 +002212025030721380110744079620944789504 +002212025030722072910744087036189773824 +002212025030722132710744088537997561856 +002212025030722192210744090026037493760 +002212025030722550110744098998728314880 +002212025030723423710744110974292180992 +002212025030805292510744198248994275328 +002212025030808554110744250158658613248 +002212025030810021210744266897726410752 +002212025030810524610744279623020326912 +002212025030812184410744301257437491200 +002212025030813573910744326153365184512 +002212025030814204710744331972939493376 +002212025030814493010744339201237766144 +002212025030815441210744352967786770432 +002212025030815565310744356155980025856 +002212025030817010010744372291815133184 +002212025030817021410744372602568949760 +002212025030817054810744373499642003456 +002212025030817332810744380463881416704 +002212025030817455010744383575298199552 +002212025030818045210744388367630766080 +002212025030818111410744389967211974656 +002212025030818290110744394441994625024 +002212025030819011310744402545598148608 +002212025030819104310744404935923609600 +002212025030819110810744405041255165952 +002212025030819165410744406495237521408 +002212025030820033810744418252571099136 +002212025030820311210744425190327402496 +002212025030821023510744433088702984192 +002212025030821030310744433209268031488 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 358df6e76..88ad1acba 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 @@ -576,11 +576,16 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { @Override public void chargingPileFailedToStart(String transactionCode, String failedReasonMsg) { logger.info("启动失败退款 transactionCode:{}, 失败原因:{}", transactionCode, failedReasonMsg); - // OrderBasicInfo orderInfo = getOrderInfoByOrderCode(orderCode); OrderBasicInfo orderInfo = getOrderInfoByTransactionCode(transactionCode); if (orderInfo == null) { return; } + + String pileSn = orderInfo.getPileSn(); + + // 发送停止充电指令 + pileRemoteService.remoteStopCharging(pileSn, orderInfo.getConnectorCode(), orderInfo.getTransactionCode()); + // 启动失败原因 orderInfo.setReason(failedReasonMsg); // 订单退款(结算订单)