新增支付流程,新增支付页面等待倒计时,自动检查订单状态等

This commit is contained in:
Rust 2025-10-22 17:47:07 +08:00
parent 15d2e1047b
commit 2e7e85fb27
8 changed files with 432 additions and 67 deletions

View File

@ -43,6 +43,8 @@ abstract class EntityFromJsonUtil {
return KRPurchaseOrderNo.fromJson(json) as T;
case "KRPurchaseOrderUrl":
return KRPurchaseOrderUrl.fromJson(json) as T;
case "KRCheckoutResponse":
return KRCheckoutResponse.fromJson(json) as T;
case "KROrderStatus":
return KROrderStatus.fromJson(json) as T;
case "KRAlreadySubscribeList":

View File

@ -18,4 +18,48 @@ class KRPurchaseOrderUrl {
factory KRPurchaseOrderUrl.fromJson(Map<String, dynamic> json) {
return KRPurchaseOrderUrl(url: json['checkout_url'] ?? '');
}
}
/// Checkout Tauri
class KRCheckoutResponse {
final String type; // "url" | "qr" | "stripe"
final String? checkoutUrl;
final KRStripePayment? stripe;
KRCheckoutResponse({
required this.type,
this.checkoutUrl,
this.stripe,
});
factory KRCheckoutResponse.fromJson(Map<String, dynamic> json) {
return KRCheckoutResponse(
type: json['type'] ?? 'url',
checkoutUrl: json['checkout_url'],
stripe: json['stripe'] != null
? KRStripePayment.fromJson(json['stripe'])
: null,
);
}
}
/// Stripe
class KRStripePayment {
final String method;
final String clientSecret;
final String publishableKey;
KRStripePayment({
required this.method,
required this.clientSecret,
required this.publishableKey,
});
factory KRStripePayment.fromJson(Map<String, dynamic> json) {
return KRStripePayment(
method: json['method'] ?? '',
clientSecret: json['client_secret'] ?? '',
publishableKey: json['publishable_key'] ?? '',
);
}
}

View File

@ -11,7 +11,7 @@ import '../../../utils/kr_common_util.dart';
import '../../../localization/app_translations.dart';
import '../../../utils/kr_log_util.dart';
///
/// Tauri
class KROrderStatusController extends GetxController {
/// API服务
final KRSubscribeApi kr_subscribeApi = KRSubscribeApi();
@ -23,7 +23,7 @@ class KROrderStatusController extends GetxController {
final RxBool kr_isLoading = true.obs;
/// URL
final String kr_paymentUrl = Get.arguments['url'] as String;
final String kr_paymentUrl = Get.arguments['url'] as String? ?? '';
///
final String kr_order = Get.arguments['order'];
@ -31,9 +31,27 @@ class KROrderStatusController extends GetxController {
///
final String kr_paymentType = Get.arguments['payment_type'] as String;
/// Checkout url, qr, stripe
final String kr_checkoutType = Get.arguments['checkout_type'] as String? ?? 'url';
///
Timer? kr_timer;
///
Timer? kr_countdownTimer;
/// 15
final RxInt kr_countdown = (15 * 60 * 1000).obs;
///
final RxString kr_formattedCountdown = '15:00'.obs;
///
DateTime? kr_orderCreatedAt;
///
int kr_lastRefreshTime = 0;
///
static const int kr_statusPending = 1; //
static const int kr_statusPaid = 2; //
@ -53,129 +71,221 @@ class KROrderStatusController extends GetxController {
@override
void onInit() {
super.onInit();
print('═══════════════════════════════════════');
print('📊 订单状态页面初始化');
print(' 订单号: $kr_order');
print(' 支付方式: $kr_paymentType');
print(' Checkout类型: $kr_checkoutType');
print('═══════════════════════════════════════');
//
kr_checkPaymentStatus();
//
kr_startCheckingPaymentStatus();
}
@override
void onReady() {
super.onReady();
// URL时才处理支付跳转
if (kr_paymentUrl.isNotEmpty && kr_paymentType != 'balance') {
if (Platform.isAndroid || Platform.isIOS) {
// 使 WebView
Get.toNamed(
Routes.KR_WEBVIEW,
arguments: {
'url': kr_paymentUrl,
'order': kr_order,
},
);
} else {
// 使
final Uri uri = Uri.parse(kr_paymentUrl);
launchUrl(uri, mode: LaunchMode.externalApplication);
}
}
//
}
@override
void onClose() {
print('🔚 订单状态页面关闭,清理定时器');
kr_timer?.cancel();
kr_countdownTimer?.cancel();
super.onClose();
}
///
/// Tauri 5
void kr_startCheckingPaymentStatus() {
//
final Duration interval = kr_paymentType == 'balance'
? const Duration(seconds: 2) // 2
: const Duration(seconds: 5); // 5
kr_timer = Timer.periodic(interval, (timer) {
print('🔄 启动支付状态轮询每5秒检查一次');
// 5
kr_timer = Timer.periodic(const Duration(seconds: 5), (timer) {
kr_checkPaymentStatus();
});
// 1UI显示
kr_countdownTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
kr_updateCountdown();
});
}
///
/// Tauri
void kr_updateCountdown() {
if (kr_orderCreatedAt == null) {
//
kr_formattedCountdown.value = '15:00';
print('⏱️ 倒计时更新: 等待订单创建时间...');
return;
}
final now = DateTime.now().millisecondsSinceEpoch;
final createdAt = kr_orderCreatedAt!.millisecondsSinceEpoch;
final targetTime = createdAt + (15 * 60 * 1000); // 15
final timeLeft = targetTime - now;
print('⏱️ 倒计时调试信息:');
print(' 当前时间(ms): $now');
print(' 创建时间(ms): $createdAt');
print(' 目标时间(ms): $targetTime');
print(' 剩余时间(ms): $timeLeft');
print(' 剩余时间(秒): ${(timeLeft / 1000).floor()}');
if (timeLeft > 0) {
kr_countdown.value = timeLeft;
// MM:SS
final minutes = (timeLeft / 60000).floor();
final seconds = ((timeLeft % 60000) / 1000).floor();
kr_formattedCountdown.value = '${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}';
print(' 格式化倒计时: ${kr_formattedCountdown.value}');
} else {
//
kr_countdown.value = 0;
kr_formattedCountdown.value = '00:00';
kr_countdownTimer?.cancel();
kr_timer?.cancel();
print('⏱️ 订单支付超时15分钟');
kr_statusTitle.value = AppTranslations.kr_orderStatus.closedTitle;
kr_statusDescription.value = '订单已超时,请重新下单';
kr_isLoading.value = false;
}
}
/// 使 Tauri
Future<void> kr_checkPaymentStatus() async {
final now = DateTime.now().millisecondsSinceEpoch;
try {
final result = await kr_subscribeApi.kr_orderDetail(kr_order);
print('🔍 检查订单状态 [${kr_order}]');
// 使
final result = await kr_subscribeApi.kr_queryOrderStatus(kr_order);
result.fold(
(error) {
KRLogUtil.kr_e('检查支付状态失败: $error', tag: 'OrderStatusController');
print('❌ 查询失败: ${error.msg}');
KRLogUtil.kr_e('检查支付状态失败: ${error.msg}', tag: 'OrderStatusController');
kr_isLoading.value = false;
kr_statusTitle.value = AppTranslations.kr_orderStatus.checkFailedTitle;
kr_statusDescription.value = AppTranslations.kr_orderStatus.checkFailedDescription;
kr_statusIcon.value = 'payment_success';
},
(kr_orderStatus) {
KRLogUtil.kr_i('检查支付状态: ${kr_orderStatus.toJson()}', tag: 'OrderStatusController');
//
if (kr_orderCreatedAt == null && kr_orderStatus.kr_createdAt > 0) {
//
// 10
final timestamp = kr_orderStatus.kr_createdAt;
final isMilliseconds = timestamp > 10000000000; // 10
kr_orderCreatedAt = DateTime.fromMillisecondsSinceEpoch(
isMilliseconds ? timestamp : timestamp * 1000
);
print('📅 订单创建时间: ${kr_orderCreatedAt}');
print('📅 原始时间戳: $timestamp');
print('📅 时间戳类型: ${isMilliseconds ? "毫秒级" : "秒级"}');
print('📅 转换后时间戳(ms): ${kr_orderCreatedAt!.millisecondsSinceEpoch}');
}
print('📊 订单状态: ${kr_orderStatus.kr_status} (${_getStatusName(kr_orderStatus.kr_status)})');
switch (kr_orderStatus.kr_status) {
case kr_statusPending:
//
kr_statusTitle.value = AppTranslations.kr_orderStatus.pendingTitle;
kr_statusDescription.value = AppTranslations.kr_orderStatus.pendingDescription;
kr_statusDescription.value = '${AppTranslations.kr_orderStatus.pendingDescription}\n剩余时间: ${kr_formattedCountdown.value}';
kr_statusIcon.value = 'payment_success';
break;
case kr_statusPaid:
//
print('✅ 订单已支付,等待确认...');
kr_statusTitle.value = AppTranslations.kr_orderStatus.paidTitle;
kr_statusDescription.value = AppTranslations.kr_orderStatus.paidDescription;
kr_statusIcon.value = 'payment_success';
break;
case kr_statusFinished:
//
print('🎉 订单完成!停止轮询');
kr_isPaymentSuccess.value = true;
kr_isLoading.value = false;
kr_timer?.cancel();
kr_countdownTimer?.cancel();
kr_statusTitle.value = AppTranslations.kr_orderStatus.successTitle;
kr_statusDescription.value = AppTranslations.kr_orderStatus.successDescription;
kr_statusIcon.value = 'payment_success';
//
KREventBus().kr_sendMessage(KRMessageType.kr_payment);
break;
case kr_statusClose:
//
print('❌ 订单已关闭');
kr_isLoading.value = false;
kr_timer?.cancel();
kr_countdownTimer?.cancel();
kr_statusTitle.value = AppTranslations.kr_orderStatus.closedTitle;
kr_statusDescription.value = AppTranslations.kr_orderStatus.closedDescription;
kr_statusIcon.value = 'payment_success';
break;
case kr_statusFailed:
//
print('❌ 支付失败');
kr_isLoading.value = false;
kr_timer?.cancel();
kr_countdownTimer?.cancel();
kr_statusTitle.value = AppTranslations.kr_orderStatus.failedTitle;
kr_statusDescription.value = AppTranslations.kr_orderStatus.failedDescription;
kr_statusIcon.value = 'payment_success';
break;
default:
//
print('⚠️ 未知状态: ${kr_orderStatus.kr_status}');
kr_isLoading.value = false;
kr_timer?.cancel();
kr_countdownTimer?.cancel();
kr_statusTitle.value = AppTranslations.kr_orderStatus.unknownTitle;
kr_statusDescription.value = AppTranslations.kr_orderStatus.unknownDescription;
kr_statusIcon.value = 'payment_success';
break;
}
kr_lastRefreshTime = now;
},
);
} catch (error) {
print('❌ 异常: $error');
KRLogUtil.kr_e('检查支付状态失败: $error', tag: 'OrderStatusController');
kr_isLoading.value = false;
kr_statusTitle.value = AppTranslations.kr_orderStatus.checkFailedTitle;
kr_statusDescription.value = AppTranslations.kr_orderStatus.checkFailedDescription;
kr_statusIcon.value = 'payment_success';
}
}
///
Future<void> kr_checkPaymentStatusWithRetry() async {
try {
// ... ...
} catch (err) {
KRLogUtil.kr_e('检查支付状态失败: $err', tag: 'OrderStatusController');
///
String _getStatusName(int status) {
switch (status) {
case kr_statusPending:
return '待支付';
case kr_statusPaid:
return '已支付';
case kr_statusClose:
return '已关闭';
case kr_statusFailed:
return '支付失败';
case kr_statusFinished:
return '已完成';
default:
return '未知';
}
}
}

View File

@ -4,6 +4,7 @@ import 'package:kaer_with_panels/app/model/response/kr_package_list.dart';
import 'package:kaer_with_panels/app/utils/kr_common_util.dart';
import 'package:kaer_with_panels/app/localization/app_translations.dart';
import 'package:kaer_with_panels/app/utils/kr_log_util.dart';
import 'package:url_launcher/url_launcher.dart';
import '../../../common/app_run_data.dart';
import '../../../common/app_config.dart';
@ -399,22 +400,31 @@ class KRPurchaseMembershipController extends GetxController {
'',
);
//
print('═══════════════════════════════════════');
print('🔗 下单接口: /v1/public/order/purchase');
print('📤 请求参数:');
print(' subscribe_id: ${selectedPlan.kr_id}');
print(' quantity: $quantity');
print(' payment: $paymentMethodId');
print(' coupon: ""');
print('');
purchaseEither.fold(
(error) => KRCommonUtil.kr_showToast(error.msg),
(error) {
print('❌ 请求失败:');
print(' 错误码: ${error.code}');
print(' 错误信息: ${error.msg}');
print('═══════════════════════════════════════');
KRCommonUtil.kr_showToast(error.msg);
},
(order) async {
// checkout
final checkoutEither = await _kr_subscribeApi.kr_checkout(order);
checkoutEither.fold(
(error) => KRCommonUtil.kr_showToast(error.msg),
(uri) => Get.toNamed(
Routes.KR_ORDER_STATUS,
arguments: {
'url': uri,
'order': order,
'payment_type': paymentPlatform,
},
),
);
print('✅ 请求成功:');
print(' 订单号: $order');
print('═══════════════════════════════════════');
// checkout
await _kr_handleCheckout(order, paymentPlatform);
},
);
}
@ -597,4 +607,102 @@ class KRPurchaseMembershipController extends GetxController {
return AppTranslations.kr_purchaseMembership
.devices(plan.kr_deviceLimit.toString());
}
/// checkout Tauri
Future<void> _kr_handleCheckout(String orderNo, String paymentPlatform) async {
print('');
print('═══════════════════════════════════════');
print('🔗 调用 Checkout 接口');
print('📤 请求参数:');
print(' orderNo: $orderNo');
print(' returnUrl: ${AppConfig.getInstance().baseUrl}');
print('');
final checkoutEither = await _kr_subscribeApi.kr_checkout(orderNo);
checkoutEither.fold(
(error) {
print('❌ Checkout 失败:');
print(' 错误码: ${error.code}');
print(' 错误信息: ${error.msg}');
print('═══════════════════════════════════════');
KRCommonUtil.kr_showToast(error.msg);
},
(checkoutResponse) async {
print('✅ Checkout 成功:');
print(' 支付类型: ${checkoutResponse.type}');
if (checkoutResponse.type == 'url') {
// URL
if (checkoutResponse.checkoutUrl != null && checkoutResponse.checkoutUrl!.isNotEmpty) {
print(' 支付链接: ${checkoutResponse.checkoutUrl}');
print('🌐 正在用外部浏览器打开支付链接...');
print('═══════════════════════════════════════');
final url = Uri.parse(checkoutResponse.checkoutUrl!);
if (await canLaunchUrl(url)) {
//
await launchUrl(
url,
mode: LaunchMode.externalApplication,
);
//
Get.toNamed(
Routes.KR_ORDER_STATUS,
arguments: {
'url': checkoutResponse.checkoutUrl,
'order': orderNo,
'payment_type': paymentPlatform,
'checkout_type': 'url',
},
);
} else {
print('❌ 无法打开URL: ${checkoutResponse.checkoutUrl}');
KRCommonUtil.kr_showToast('无法打开支付链接');
}
} else {
print('⚠️ 支付链接为空');
print('═══════════════════════════════════════');
KRCommonUtil.kr_showToast('支付链接为空');
}
} else if (checkoutResponse.type == 'qr') {
// QR
print(' 二维码内容: ${checkoutResponse.checkoutUrl}');
print('📱 显示二维码支付...');
print('═══════════════════════════════════════');
Get.toNamed(
Routes.KR_ORDER_STATUS,
arguments: {
'url': checkoutResponse.checkoutUrl,
'order': orderNo,
'payment_type': paymentPlatform,
'checkout_type': 'qr',
},
);
} else if (checkoutResponse.type == 'stripe') {
// Stripe Stripe
print(' Stripe Method: ${checkoutResponse.stripe?.method}');
print(' Stripe Client Secret: ${checkoutResponse.stripe?.clientSecret}');
print('💳 显示 Stripe 支付表单...');
print('═══════════════════════════════════════');
Get.toNamed(
Routes.KR_ORDER_STATUS,
arguments: {
'order': orderNo,
'payment_type': paymentPlatform,
'checkout_type': 'stripe',
'stripe': checkoutResponse.stripe,
},
);
} else {
print('⚠️ 未知的支付类型: ${checkoutResponse.type}');
print('═══════════════════════════════════════');
KRCommonUtil.kr_showToast('不支持的支付类型: ${checkoutResponse.type}');
}
},
);
}
}

View File

@ -30,16 +30,28 @@ class BaseResponse<T> {
if (shouldDecrypt && cipherText.isNotEmpty && nonce.isNotEmpty) {
try {
KRLogUtil.kr_i('🔓 开始解密响应数据', tag: 'BaseResponse');
print('═══════════════════════════════════════');
print('🔐 检测到加密响应,开始解密...');
print('📥 加密数据长度: ${cipherText.length} 字符');
print('⏰ 时间戳: $nonce');
final decrypted = KRAesUtil.decryptData(cipherText, nonce, AppConfig.kr_encryptionKey);
body = jsonDecode(decrypted);
KRLogUtil.kr_i('✅ 解密成功', tag: 'BaseResponse');
// 便
final bodyStr = jsonEncode(body);
KRLogUtil.kr_i('📦 解密后数据(完整): $bodyStr', tag: 'BaseResponse');
print('✅ 解密成功');
print('');
print('📦 解密后的完整数据:');
// JSON便
final bodyStr = JsonEncoder.withIndent(' ').convert(body);
print(bodyStr);
print('═══════════════════════════════════════');
KRLogUtil.kr_i('🔓 解密成功', tag: 'BaseResponse');
} catch (e) {
KRLogUtil.kr_e('❌ 解密失败: $e,使用原始数据', tag: 'BaseResponse');
print('❌ 解密失败: $e');
print('⚠️ 将使用原始数据');
print('═══════════════════════════════════════');
KRLogUtil.kr_e('❌ 解密失败: $e', tag: 'BaseResponse');
body = dataMap;
}
}

View File

@ -282,6 +282,36 @@ class _KRSimpleHttpInterceptor extends Interceptor {
print('>>> Request │ ${options.method}${options.uri}');
if (options.data != null) {
print('Body: ${options.data}');
// data time
if (options.data is Map<String, dynamic>) {
final data = options.data as Map<String, dynamic>;
if (data.containsKey('data') && data.containsKey('time')) {
try {
print('');
print('🔐 检测到加密请求,正在解密...');
//
final encryptedData = data['data'] as String;
final nonce = data['time'] as String;
final decrypted = KRAesUtil.decryptData(
encryptedData,
nonce,
AppConfig.kr_encryptionKey,
);
print('🔓 解密后的原始请求数据:');
// JSON
try {
final jsonData = jsonDecode(decrypted);
final prettyJson = JsonEncoder.withIndent(' ').convert(jsonData);
print(prettyJson);
} catch (_) {
print(decrypted);
}
} catch (e) {
print('⚠️ 请求解密失败: $e');
}
}
}
}
handler.next(options);
}
@ -291,6 +321,41 @@ class _KRSimpleHttpInterceptor extends Interceptor {
print('<<< Response │ ${response.requestOptions.method}${response.statusCode} ${response.statusMessage}${response.requestOptions.uri}');
if (response.data != null) {
print('Body: ${response.data}');
// data time
if (response.data is Map<String, dynamic>) {
final dataMap = response.data as Map<String, dynamic>;
// data
final nestedData = dataMap['data'];
if (nestedData is Map<String, dynamic> &&
nestedData.containsKey('data') &&
nestedData.containsKey('time')) {
try {
print('');
print('🔐 检测到加密响应,正在解密...');
//
final encryptedData = nestedData['data'] as String;
final nonce = nestedData['time'] as String;
final decrypted = KRAesUtil.decryptData(
encryptedData,
nonce,
AppConfig.kr_encryptionKey,
);
print('🔓 解密后的原始响应数据:');
// JSON
try {
final jsonData = jsonDecode(decrypted);
final prettyJson = JsonEncoder.withIndent(' ').convert(jsonData);
print(prettyJson);
} catch (_) {
print(decrypted);
}
} catch (e) {
print('⚠️ 响应解密失败: $e');
}
}
}
}
handler.next(response);
}

View File

@ -38,10 +38,10 @@ abstract class Api {
static const String kr_getPaymentMethods = "/v1/app/payment/methods";
///
static const String kr_purchase = "/v1/app/order/purchase";
static const String kr_purchase = "/v1/public/order/purchase";
/// ,
static const String kr_checkout = "/v1/app/order/checkout";
/// , Tauri
static const String kr_checkout = "/v1/public/portal/order/checkout";
///
static const String kr_getPackageList = "/v1/public/subscribe/list";
@ -61,6 +61,9 @@ abstract class Api {
///
static const String kr_orderDetail = "/v1/app/order/detail";
/// Tauri
static const String kr_queryOrderStatus = "/v1/public/order/detail";
///
static const String kr_getMessageList = "/v1/public/announcement/list";

View File

@ -120,6 +120,27 @@ class KRSubscribeApi {
return right(baseResponse.model);
}
///
Future<Either<HttpError, KROrderStatus>> kr_queryOrderStatus(
String orderNo) async {
final Map<String, dynamic> data = <String, dynamic>{};
data['order_no'] = orderNo;
BaseResponse<KROrderStatus> baseResponse =
await HttpUtil.getInstance().request<KROrderStatus>(
Api.kr_queryOrderStatus,
data,
method: HttpMethod.GET,
isShowLoading: false,
);
if (!baseResponse.isSuccess) {
return left(
HttpError(msg: baseResponse.retMsg, code: baseResponse.retCode));
}
return right(baseResponse.model);
}
///
Future<Either<HttpError, List<KRPaymentMethod>>>
kr_getPaymentMethods() async {
@ -231,14 +252,14 @@ class KRSubscribeApi {
return right(baseResponse.model.orderNo);
}
/// ,
Future<Either<HttpError, String>> kr_checkout(String orderId) async {
/// ,
Future<Either<HttpError, KRCheckoutResponse>> kr_checkout(String orderId) async {
final Map<String, dynamic> data = <String, dynamic>{};
data['orderNo'] = orderId;
data['returnUrl'] = AppConfig.getInstance().baseUrl;
BaseResponse<KRPurchaseOrderUrl> baseResponse =
await HttpUtil.getInstance().request<KRPurchaseOrderUrl>(
BaseResponse<KRCheckoutResponse> baseResponse =
await HttpUtil.getInstance().request<KRCheckoutResponse>(
Api.kr_checkout,
data,
method: HttpMethod.POST,
@ -249,7 +270,7 @@ class KRSubscribeApi {
HttpError(msg: baseResponse.retMsg, code: baseResponse.retCode));
}
return right(baseResponse.model.url);
return right(baseResponse.model);
}
///