From d8f3a77a6d974e45f0a18456bd3d173717de26a7 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Fri, 21 Jun 2024 15:24:02 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-admin/src/main/resources/application-dev.yml | 2 +- jsowell-admin/src/main/resources/application-pre.yml | 2 +- jsowell-admin/src/main/resources/application-sit.yml | 2 +- .../pile/service/programlogic/DelayMerchantProgramLogic.java | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index e99765ead..700e3c364 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -164,7 +164,7 @@ wechat: adapay: debugFlag: false prodMode: false - callback: http://192.168.2.3:8080/uniapp/pay/adapayCallback + callback: http://apitest.jsowellcloud.com:8080/uniapp/pay/adapayCallback jsowell: apiKey: api_live_b9bff039-0598-4491-88e7-06ca6dc7289e mockApiKey: api_test_15662261-8123-4b51-95d9-ad0af60eab53 diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml index 1e6facb70..f37f820cb 100644 --- a/jsowell-admin/src/main/resources/application-pre.yml +++ b/jsowell-admin/src/main/resources/application-pre.yml @@ -160,7 +160,7 @@ wechat: adapay: debugFlag: false prodMode: true - callback: http://121.40.174.65:8080/uniapp/pay/adapayCallback + callback: http://api.jsowellcloud.com/uniapp/pay/adapayCallback jsowell: apiKey: api_live_b9bff039-0598-4491-88e7-06ca6dc7289e mockApiKey: api_test_15662261-8123-4b51-95d9-ad0af60eab53 diff --git a/jsowell-admin/src/main/resources/application-sit.yml b/jsowell-admin/src/main/resources/application-sit.yml index 883fcc662..42a65e641 100644 --- a/jsowell-admin/src/main/resources/application-sit.yml +++ b/jsowell-admin/src/main/resources/application-sit.yml @@ -163,7 +163,7 @@ wechat: adapay: debugFlag: true prodMode: false - callback: http://192.168.2.3:8080/uniapp/pay/adapayCallback + callback: http://apitest.jsowellcloud.com:8080/uniapp/pay/adapayCallback jsowell: apiKey: api_live_b9bff039-0598-4491-88e7-06ca6dc7289e mockApiKey: api_test_15662261-8123-4b51-95d9-ad0af60eab53 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java index 24243af25..ae87098e5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java @@ -834,6 +834,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { */ @Transactional(rollbackFor = Exception.class) public String startPersonalPileCharging(StartPersonPileDTO dto) { + logger.info("【{}】-个人桩启动充电 param:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto)); // 校验是否有权限启动 String pileConnectorCode = dto.getPileConnectorCode(); String pileSn = pileConnectorCode.substring(0, pileConnectorCode.length() - 2); @@ -861,6 +862,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { PayOrderDTO payOrderDTO = new PayOrderDTO(); payOrderDTO.setOrderCode(orderCode); payOrderDTO.setPayMode(OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue()); + payOrderDTO.setMemberId(dto.getMemberId()); payOrder(payOrderDTO); return orderCode; }