From 947ecf21aaf880187fa86b909445d34e953ac80b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Sun, 14 Dec 2025 10:09:19 +0800
Subject: [PATCH] =?UTF-8?q?feat(subscription):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E8=AE=A2=E9=98=85=E5=A5=97=E9=A4=90=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 TenantSubscription 实体中新增 packageName 字段
- 更新 SubscriptionOrderController 类名为 TenantSubscriptionOrderController
- 修改微信支付通知地址为新域名 websoft.top
---
 ...rController.java => TenantSubscriptionOrderController.java} | 2 +-
 .../common/system/controller/WxNativePayController.java        | 2 +-
 .../com/gxwebsoft/common/system/entity/TenantSubscription.java | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)
 rename src/main/java/com/gxwebsoft/common/system/controller/{SubscriptionOrderController.java => TenantSubscriptionOrderController.java} (99%)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/SubscriptionOrderController.java b/src/main/java/com/gxwebsoft/common/system/controller/TenantSubscriptionOrderController.java
similarity index 99%
rename from src/main/java/com/gxwebsoft/common/system/controller/SubscriptionOrderController.java
rename to src/main/java/com/gxwebsoft/common/system/controller/TenantSubscriptionOrderController.java
index 06849ed..11ab86c 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/SubscriptionOrderController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/TenantSubscriptionOrderController.java
@@ -32,7 +32,7 @@ import java.util.List;
 @Tag(name = "订阅订单")
 @RestController
 @RequestMapping("/api/system/subscription-order")
-public class SubscriptionOrderController extends BaseController {
+public class TenantSubscriptionOrderController extends BaseController {
 
   @Resource
   private SettingService settingService;
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/WxNativePayController.java b/src/main/java/com/gxwebsoft/common/system/controller/WxNativePayController.java
index 60c7337..b8d0092 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/WxNativePayController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/WxNativePayController.java
@@ -97,7 +97,7 @@ public class WxNativePayController extends BaseController {
     request.setAppid(appId);
     request.setMchid(payment.getMchId());
     request.setDescription(order.getComments());
-    request.setNotifyUrl("https://server.gxwebsoft.com/api/system/wx-native-pay/notify/" + getTenantId());
+    request.setNotifyUrl("https://server.websoft.top/api/system/wx-native-pay/notify/" + getTenantId());
     request.setOutTradeNo(order.getOrderNo());
     // 调用下单方法，得到应答
     PrepayResponse response = service.prepay(request);
diff --git a/src/main/java/com/gxwebsoft/common/system/entity/TenantSubscription.java b/src/main/java/com/gxwebsoft/common/system/entity/TenantSubscription.java
index 028624a..682fabf 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/TenantSubscription.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/TenantSubscription.java
@@ -32,6 +32,9 @@ public class TenantSubscription implements Serializable {
     @Schema(description = "当前套餐ID")
     private Integer packageId;
 
+    @Schema(description = "套餐名称")
+    private String packageName;
+
     @Schema(description = "当前版本")
     private Integer version;