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 d62e2589e..b4d2a584c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -736,8 +736,12 @@ public class OrderService { String pileSn = orderBasicInfo.getPileSn(); - // 发送停止充电指令 - pileRemoteService.remoteStopCharging(pileSn, orderBasicInfo.getConnectorCode(), orderBasicInfo.getTransactionCode()); + try { + // 发送停止充电指令 + pileRemoteService.remoteStopCharging(pileSn, orderBasicInfo.getConnectorCode(), orderBasicInfo.getTransactionCode()); + }catch (Exception e) { + log.error("人工结算订单-发送停止充电指令 error, ", e); + } List stationDeptIds = authorizedMap.getStationDeptIds(); if (CollectionUtils.isEmpty(stationDeptIds)) { diff --git a/jsowell-admin/src/test/java/PaymentTestController.java b/jsowell-admin/src/test/java/PaymentTestController.java index 59f4815f2..aed5a1e7c 100644 --- a/jsowell-admin/src/test/java/PaymentTestController.java +++ b/jsowell-admin/src/test/java/PaymentTestController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.huifu.adapay.core.exception.BaseAdaPayException; +import com.huifu.adapay.model.Payment; import com.huifu.adapay.model.PaymentReverse; import com.huifu.adapay.model.Refund; import com.jsowell.JsowellApplication; @@ -44,10 +45,7 @@ import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.TimeUnit; /** @@ -823,4 +821,14 @@ public class PaymentTestController { logger.info("无结算账户运营商:{}", targetList); } + + @Test + public void closeOrder() throws BaseAdaPayException { + String paymentId = "002212025070811225010788498509816119296"; + Map map = new LinkedHashMap<>(); + map.put("payment_id", paymentId); + Map close = Payment.close(map, wechatAppId1); + logger.info("关单接口调用结果:{}", close); + + } }