diff --git a/jsowell-admin/src/test/java/PaymentTestController.java b/jsowell-admin/src/test/java/PaymentTestController.java index 58a5c7d1d..b39220367 100644 --- a/jsowell-admin/src/test/java/PaymentTestController.java +++ b/jsowell-admin/src/test/java/PaymentTestController.java @@ -423,10 +423,10 @@ public class PaymentTestController { */ @Test public void createPaymentReverseRequestTest() { - String paymentId = "002212025010720373310722683516795273216"; - BigDecimal refundAmount = new BigDecimal("1.08"); - String memberId = "48781184"; - String orderCode = "C67335843091"; + String paymentId = "002212025112213314210838178078469394432"; + BigDecimal refundAmount = new BigDecimal("49.5"); + String memberId = "67717378"; + String orderCode = "C088649732085"; // 延迟分账未确认调撤销调撤销接口退款 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 fa45a3249..8af781be1 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 @@ -68,6 +68,7 @@ public class BatteryChargeReportService { @Autowired private PileStationInfoService pileStationInfoService; + @Autowired private ChargeAlgorithmRecordService chargeAlgorithmRecordService; /** @@ -100,12 +101,16 @@ public class BatteryChargeReportService { log.error("订单:{} 获取到 taskId 为空", orderCode); return null; } - // 存入数据库 - ChargeAlgorithmRecord record = new ChargeAlgorithmRecord(); - record.setOrderCode(orderCode); - record.setTaskId(taskId); - chargeAlgorithmRecordService.insertOrUpdateSelective(record); - + ChargeAlgorithmRecord record = chargeAlgorithmRecordService.queryRecordByOrderCode(orderCode); + if (record != null) { + record.setTaskId(taskId); + chargeAlgorithmRecordService.updateChargeAlgorithmRecord(record); + }else { + record = new ChargeAlgorithmRecord(); + record.setTaskId(taskId); + record.setOrderCode(orderCode); + chargeAlgorithmRecordService.insertOrUpdateSelective(record); + } return taskId; }