From 0ef46975993c06e780ec4981d7535167673aa51d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 25 八月 2025 10:39:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/gy_jifenshangcheng into dev

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/payment/PaymentUtil.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/payment/PaymentUtil.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/payment/PaymentUtil.java
index 9d0ae2a..776a2c0 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/payment/PaymentUtil.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/payment/PaymentUtil.java
@@ -22,7 +22,7 @@
 	/**
 	 * 商户密钥
 	 */
-	private static final String key = "a2369875124965782f148539657823152";
+	private static final String key = "ss369875124965782f148539657826321";
 	/**
 	 * 商户号
 	 */
@@ -280,10 +280,10 @@
 	
 	
 	public static void main(String[] args) {
-//		UniPayResult uniPayResult = PaymentUtil.uniPay("852963742", 0.01D, "测试商品", "这是用于对接支付测试的商品描述",
-//				"", "/order/shopping-cart/shoppingCartPaymentCallback", "ooOrs64zHLuInkZ_GF0LpIN9_Rxc", "777168500885852");
-//		PaymentUtil.queryOrder("852963742");
-//		PaymentUtil.closeOrder("852963742");
+		UniPayResult uniPayResult = PaymentUtil.uniPay("852963742", 0.01D, "测试商品", "这是用于对接支付测试的商品描述",
+				"", "/order/shopping-cart/shoppingCartPaymentCallback", "ooOrs64zHLuInkZ_GF0LpIN9_Rxc", "777168500885852");
+		PaymentUtil.queryOrder("852963742");
+		PaymentUtil.closeOrder("852963742");
 		
 	}
 }

--
Gitblit v1.7.1