feat(subscription): 添加租户订阅套餐名称字段

- 在 TenantSubscription 实体中新增 packageName 字段
- 更新 SubscriptionOrderController 类名为 TenantSubscriptionOrderController
- 修改微信支付通知地址为新域名 websoft.top
This commit is contained in:
2025-12-14 10:09:19 +08:00
parent 6674117ac9
commit 947ecf21aa
3 changed files with 5 additions and 2 deletions

View File

@@ -32,7 +32,7 @@ import java.util.List;
@Tag(name = "订阅订单") @Tag(name = "订阅订单")
@RestController @RestController
@RequestMapping("/api/system/subscription-order") @RequestMapping("/api/system/subscription-order")
public class SubscriptionOrderController extends BaseController { public class TenantSubscriptionOrderController extends BaseController {
@Resource @Resource
private SettingService settingService; private SettingService settingService;

View File

@@ -97,7 +97,7 @@ public class WxNativePayController extends BaseController {
request.setAppid(appId); request.setAppid(appId);
request.setMchid(payment.getMchId()); request.setMchid(payment.getMchId());
request.setDescription(order.getComments()); 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()); request.setOutTradeNo(order.getOrderNo());
// 调用下单方法,得到应答 // 调用下单方法,得到应答
PrepayResponse response = service.prepay(request); PrepayResponse response = service.prepay(request);

View File

@@ -32,6 +32,9 @@ public class TenantSubscription implements Serializable {
@Schema(description = "当前套餐ID") @Schema(description = "当前套餐ID")
private Integer packageId; private Integer packageId;
@Schema(description = "套餐名称")
private String packageName;
@Schema(description = "当前版本") @Schema(description = "当前版本")
private Integer version; private Integer version;