diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 2b24b3d..636617c 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -134,7 +134,7 @@ payment: # 1 USDT 对应的业务货币金额;订单实际支付 USDT = amount / 此汇率,向下保留 2 位。 usdt-exchange-rate: ${USDT_EXCHANGE_RATE:1} # 开放API创建订单成功后返回的公共收银台地址。 - checkout-url: ${PAYMENT_CHECKOUT_URL:http://192.168.3.103/public/usdtCheckout} + checkout-url: ${PAYMENT_CHECKOUT_URL:http://192.168.3.103/public/usdtPay} # 钱包链上操作资源预算配置。 tron: diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/PaymentOrderOpenApiService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/PaymentOrderOpenApiService.java index a4ea09e..3638656 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/PaymentOrderOpenApiService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/PaymentOrderOpenApiService.java @@ -224,7 +224,7 @@ public class PaymentOrderOpenApiService { private PaymentOrderCreateResult result(UsdtOrdersPlus order) { return new PaymentOrderCreateResult(order.getOrderId(), order.getTradeId(), order.getToken(), order.getActualAmount(), new Date(order.getCreatedAt().getTime() + ORDER_TTL_MILLIS), - checkoutUrl); + checkoutUrl+"?tradeId="+order.getTradeId()); } private Map parseParameters(String plainData) { diff --git a/ruoyi-system/src/test/java/com/ruoyi/system/service/PaymentOrderOpenApiServiceTest.java b/ruoyi-system/src/test/java/com/ruoyi/system/service/PaymentOrderOpenApiServiceTest.java index 2546e07..e6d93d4 100644 --- a/ruoyi-system/src/test/java/com/ruoyi/system/service/PaymentOrderOpenApiServiceTest.java +++ b/ruoyi-system/src/test/java/com/ruoyi/system/service/PaymentOrderOpenApiServiceTest.java @@ -30,7 +30,7 @@ public class PaymentOrderOpenApiServiceTest { @Test public void shouldExposeConfiguredCheckoutUrlInCreateResult() { - String checkoutUrl = "http://192.168.3.103/public/usdtCheckout"; + String checkoutUrl = "http://192.168.3.103/public/usdtCheckout?tradeId=123"; PaymentOrderCreateResult result = new PaymentOrderCreateResult( "order-1", "trade-1", "TAddress", BigDecimal.ONE, new Date(), checkoutUrl);