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;