autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-30 20:17:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 测试环境支付回调

Browse Source
This commit is contained in:
Guoqs
2024-06-21 15:24:02 +08:00
parent 207d680b29
commit d8f3a77a6d
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/resources/application-dev.yml
View File

@@ -164,7 +164,7 @@ wechat:
adapay: adapay:
debugFlag: false debugFlag: false
prodMode: false prodMode: false
callback: http://192.168.2.3:8080/uniapp/pay/adapayCallback callback: http://apitest.jsowellcloud.com:8080/uniapp/pay/adapayCallback
jsowell: jsowell:
apiKey: api_live_b9bff039-0598-4491-88e7-06ca6dc7289e apiKey: api_live_b9bff039-0598-4491-88e7-06ca6dc7289e
mockApiKey: api_test_15662261-8123-4b51-95d9-ad0af60eab53 mockApiKey: api_test_15662261-8123-4b51-95d9-ad0af60eab53

2
jsowell-admin/src/main/resources/application-pre.yml
View File

@@ -160,7 +160,7 @@ wechat:
adapay: adapay:
debugFlag: false debugFlag: false
prodMode: true prodMode: true
callback: http://121.40.174.65:8080/uniapp/pay/adapayCallback callback: http://api.jsowellcloud.com/uniapp/pay/adapayCallback
jsowell: jsowell:
apiKey: api_live_b9bff039-0598-4491-88e7-06ca6dc7289e apiKey: api_live_b9bff039-0598-4491-88e7-06ca6dc7289e
mockApiKey: api_test_15662261-8123-4b51-95d9-ad0af60eab53 mockApiKey: api_test_15662261-8123-4b51-95d9-ad0af60eab53

2
jsowell-admin/src/main/resources/application-sit.yml
View File

@@ -163,7 +163,7 @@ wechat:
adapay: adapay:
debugFlag: true debugFlag: true
prodMode: false prodMode: false
callback: http://192.168.2.3:8080/uniapp/pay/adapayCallback callback: http://apitest.jsowellcloud.com:8080/uniapp/pay/adapayCallback
jsowell: jsowell:
apiKey: api_live_b9bff039-0598-4491-88e7-06ca6dc7289e apiKey: api_live_b9bff039-0598-4491-88e7-06ca6dc7289e
mockApiKey: api_test_15662261-8123-4b51-95d9-ad0af60eab53 mockApiKey: api_test_15662261-8123-4b51-95d9-ad0af60eab53

2
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
View File

@@ -834,6 +834,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public String startPersonalPileCharging(StartPersonPileDTO dto) { public String startPersonalPileCharging(StartPersonPileDTO dto) {
logger.info("【{}】-个人桩启动充电 param:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto));
// 校验是否有权限启动 // 校验是否有权限启动
String pileConnectorCode = dto.getPileConnectorCode(); String pileConnectorCode = dto.getPileConnectorCode();
String pileSn = pileConnectorCode.substring(0, pileConnectorCode.length() - 2); String pileSn = pileConnectorCode.substring(0, pileConnectorCode.length() - 2);
@@ -861,6 +862,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
PayOrderDTO payOrderDTO = new PayOrderDTO(); PayOrderDTO payOrderDTO = new PayOrderDTO();
payOrderDTO.setOrderCode(orderCode); payOrderDTO.setOrderCode(orderCode);
payOrderDTO.setPayMode(OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue()); payOrderDTO.setPayMode(OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue());
payOrderDTO.setMemberId(dto.getMemberId());
payOrder(payOrderDTO); payOrder(payOrderDTO);
return orderCode; return orderCode;
} }