From 437f796a0820b4299af0bff8825b8de0009f7090 Mon Sep 17 00:00:00 2001 From: CodeST <694468528@qq.com> Date: Fri, 12 Dec 2025 16:09:14 +0800 Subject: [PATCH] 1 --- Shared/KBBizCode.h | 3 +++ keyBoard.xcodeproj/xcshareddata/xcschemes/keyBoard.xcscheme | 2 +- keyBoard/Class/Network/KBNetworkManager.m | 2 +- keyBoard/Class/Pay/M/IAPVerifyTransactionObj.m | 5 +++-- keyBoard/Class/Pay/VM/PayVM.m | 4 ++-- keyBoard/KeyBoardPrefixHeader.pch | 3 ++- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Shared/KBBizCode.h b/Shared/KBBizCode.h index 988544d..f5873aa 100644 --- a/Shared/KBBizCode.h +++ b/Shared/KBBizCode.h @@ -73,6 +73,9 @@ typedef NS_ENUM(NSInteger, KBBizCode) { /// 操作失败:OPERATION_ERROR(50001, "操作失败") KBBizCodeOperationError = 50001, + + /// 特定收据无效 + KBBizCodeReceiptError = 50016, }; NS_ASSUME_NONNULL_BEGIN diff --git a/keyBoard.xcodeproj/xcshareddata/xcschemes/keyBoard.xcscheme b/keyBoard.xcodeproj/xcshareddata/xcschemes/keyBoard.xcscheme index a49a625..c1f01a8 100644 --- a/keyBoard.xcodeproj/xcshareddata/xcschemes/keyBoard.xcscheme +++ b/keyBoard.xcodeproj/xcshareddata/xcschemes/keyBoard.xcscheme @@ -65,7 +65,7 @@ + isEnabled = "YES"> diff --git a/keyBoard/Class/Network/KBNetworkManager.m b/keyBoard/Class/Network/KBNetworkManager.m index c1b58d3..e271253 100644 --- a/keyBoard/Class/Network/KBNetworkManager.m +++ b/keyBoard/Class/Network/KBNetworkManager.m @@ -458,7 +458,7 @@ autoShowBusinessError:YES NSLocalizedDescriptionKey : msg, @"code" : @(bizCode) }]; -// if (completion) completion(dict, response, bizErr); + if (completion) completion(dict, response, bizErr); return; } // code 缺失或为成功,按正常成功回调 diff --git a/keyBoard/Class/Pay/M/IAPVerifyTransactionObj.m b/keyBoard/Class/Pay/M/IAPVerifyTransactionObj.m index 3c57687..643d605 100644 --- a/keyBoard/Class/Pay/M/IAPVerifyTransactionObj.m +++ b/keyBoard/Class/Pay/M/IAPVerifyTransactionObj.m @@ -36,7 +36,6 @@ #else type = 1; #endif - // , @"type": @(type) NSDictionary *params = @{ @"receipt": receipt ?: @""}; __weak typeof(self) weakSelf = self; @@ -47,7 +46,9 @@ [[SKPaymentQueue defaultQueue] finishTransaction:transaction]; [KBHUD showSuccess:@"Success"]; if (handler) handler(KBLocalized(@"Success"), nil); - } else { + }else if(sta == KBBizCodeReceiptError){ + [[SKPaymentQueue defaultQueue] finishTransaction:transaction]; + }else { [KBHUD showError:@"Failed"]; if (handler) handler(KBLocalized(@"Failed"), nil); } diff --git a/keyBoard/Class/Pay/VM/PayVM.m b/keyBoard/Class/Pay/VM/PayVM.m index a277901..aaf55a1 100644 --- a/keyBoard/Class/Pay/VM/PayVM.m +++ b/keyBoard/Class/Pay/VM/PayVM.m @@ -16,11 +16,11 @@ completion:(KBPayCompletion)completion { if (needShow) { [KBHUD show]; } - [[KBNetworkManager shared] POST:API_VALIDATE_RECEIPT jsonBody:params headers:nil completion:^(NSDictionary * _Nullable json, NSURLResponse * _Nullable response, NSError * _Nullable error) { + [[KBNetworkManager shared] POST:API_VALIDATE_RECEIPT jsonBody:params headers:nil autoShowBusinessError:false completion:^(NSDictionary * _Nullable json, NSURLResponse * _Nullable response, NSError * _Nullable error) { if (needShow) { [KBHUD dismiss]; } if (error) { -// if (completion) completion(ERROR_CODE, error.localizedDescription ?: KBLocalized(@"Network error")); + if (completion) completion(ERROR_CODE, error.localizedDescription ?: KBLocalized(@"Network error")); return; } diff --git a/keyBoard/KeyBoardPrefixHeader.pch b/keyBoard/KeyBoardPrefixHeader.pch index b26c309..d19f83e 100644 --- a/keyBoard/KeyBoardPrefixHeader.pch +++ b/keyBoard/KeyBoardPrefixHeader.pch @@ -54,7 +54,8 @@ #if DEBUG #define KBLOG(fmt, ...) do { \ NSString *kb_msg__ = [NSString stringWithFormat:(fmt), ##__VA_ARGS__]; \ - NSLog(@"\n==============================[KB DEBUG]==============================\n[Function] %s\n[Line] %d\n%@\n=====================================================================\n", __PRETTY_FUNCTION__, __LINE__, kb_msg__); \ + NSString *kb_full_msg__ = [NSString stringWithFormat:@"\n==============================[KB DEBUG]==============================\n[Function] %s\n[Line] %d\n%@\n=====================================================================\n", __PRETTY_FUNCTION__, __LINE__, kb_msg__]; \ + fprintf(stderr, "%s", kb_full_msg__.UTF8String); \ } while(0) #else #define KBLOG(...)