From b329b5c501d154e55853d3e51726ec8a07e6e282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Wed, 3 Sep 2025 16:01:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(pay):=20=E4=BC=98=E5=8C=96=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98URL=E6=9E=84=E5=BB=BA=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 重构redirectUri构建方式，调整参数顺序提高可读性
- 简化URL拼接逻辑，移除不必要的条件判断
- 保持原有功能不变的情况下改进代码结构
---
 .../pigx/pay/controller/PayGoodsOrderController.java         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java
index c56b5c657..47027919e 100755
--- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java
+++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java
@@ -108,9 +108,8 @@ public class PayGoodsOrderController {
 			String wxUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s"
 					+ "&redirect_uri=%s&response_type=code&scope=snsapi_base&state=%s";
 
-			String redirectUri = String.format("%s/api/%s/goods/wx?amount=%s&TENANT-ID=%s",
-					WebUtils.isMicro() ? "pay" : "admin", channel.getNotifyUrl(), goods.getAmount(),
-					TenantContextHolder.getTenantId());
+			String redirectUri = String.format("%s/api/%s/goods/wx?amount=%s&TENANT-ID=%s", channel.getNotifyUrl(),
+					WebUtils.isMicro() ? "pay" : "admin", goods.getAmount(), TenantContextHolder.getTenantId());
 
 			response.sendRedirect(
 					String.format(wxUrl, channel.getAppId(), URLUtil.encode(redirectUri), channel.getAppId()));