diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChargeAlgorithmController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChargeAlgorithmController.java index 249cf62ea..f80d889e4 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChargeAlgorithmController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChargeAlgorithmController.java @@ -31,7 +31,7 @@ public class ChargeAlgorithmController extends BaseController { RestApiResponse response = null; try { // String result = chargeAlgorithmService.pushOrderInfo(orderCode); - String result = batteryChargeReportService.pushChargeData(dto.getOrderCode(), dto.getReportType()); + String result = batteryChargeReportService.getTaskIdByOrderCode(dto.getOrderCode(), dto.getReportType()); response = new RestApiResponse<>(result); }catch (Exception e) { logger.error("算法应用推送订单信息 error, ", e); diff --git a/jsowell-admin/src/test/java/PaymentTestController.java b/jsowell-admin/src/test/java/PaymentTestController.java index 74e3be056..8e163d7de 100644 --- a/jsowell-admin/src/test/java/PaymentTestController.java +++ b/jsowell-admin/src/test/java/PaymentTestController.java @@ -539,10 +539,10 @@ public class PaymentTestController { */ @Test public void createPaymentReverseRequestTest() { - String paymentId = "002212025091615421510813930946193444864"; + String paymentId = "002212025091616304410813943148522684416"; BigDecimal refundAmount = new BigDecimal("0.5"); String memberId = "65622699"; - String orderCode = "C67588633864"; + String orderCode = "C65858163754"; // 延迟分账未确认调撤销调撤销接口退款 PaymentReverseOperation operation = new PaymentReverseOperation(); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java index 0ae1269c1..76ebeffab 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java @@ -70,11 +70,11 @@ public class BatteryChargeReportService { private PileStationInfoService pileStationInfoService; /** - * 统一发送充电电池数据 + * 通过订单号统一发送充电电池数据获取 taskId * * @param orderCode */ - public String pushChargeData(String orderCode, String reportType) { + public String getTaskIdByOrderCode(String orderCode, String reportType) { // 根据订单号查询订单信息 OrderVO orderVO = orderBasicInfoService.getChargeOrderInfoByOrderCode(orderCode); if (orderVO == null) {