xuguohong

haibao udapte

No preview for this file type
No preview for this file type
No preview for this file type
...@@ -226,22 +226,16 @@ int mExchange; ...@@ -226,22 +226,16 @@ int mExchange;
226 [self handlerLeakOrder]; 226 [self handlerLeakOrder];
227 }); 227 });
228 228
229 - NSString *isOpenThirdPay = [payInfo isOpenThirdPay]; 229 + //NSString *isOpenThirdPay = [payInfo isOpenThirdPay];
230 - NSLog(@"custom%@",[payInfo custom]); 230 +
231 - if([isOpenThirdPay isEqualToString:@"false"]){ 231 + NSString *other = [payInfo other];
232 - NSString* products = [payInfo products]; 232 +
233 - //NSLog(@"products:%@",products); 233 + if (other && [other length] > 0) {
234 - [[YouaiSDKMgr getInstance] openApplePay:self.controller products:products amount:[payInfo postAmount] queryId:queryId];
235 - }else{
236 [[YouaiSDKMgr getInstance] openPay:serverId :roleName :amount :[payInfo queryId] :self.controller]; 234 [[YouaiSDKMgr getInstance] openPay:serverId :roleName :amount :[payInfo queryId] :self.controller];
235 + }else{
236 + NSString* products = [payInfo products];
237 + [[YouaiSDKMgr getInstance] openApplePay:self.controller products:products amount:[payInfo postAmount] productName:[payInfo productName] queryId:queryId];
237 } 238 }
238 -
239 - int64_t delayInSeconds = 5.0; // 延迟的时间
240 - dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, delayInSeconds * NSEC_PER_SEC);
241 - dispatch_after(popTime, dispatch_get_main_queue(), ^(void){
242 - NSLog(@"chage state");
243 - [[PoolChecker getInstance] setOnlyOneTimePay:false];
244 - });
245 } 239 }
246 240
247 -(void)paymentSuccess:(NSString *)accountId orderId:(NSString *)orderId currencyAmount:(double)amount currencyType:(NSString *)currencyType payType:(NSString *)payType custom:(NSArray *)customArray 241 -(void)paymentSuccess:(NSString *)accountId orderId:(NSString *)orderId currencyAmount:(double)amount currencyType:(NSString *)currencyType payType:(NSString *)payType custom:(NSArray *)customArray
......
...@@ -226,22 +226,16 @@ int mExchange; ...@@ -226,22 +226,16 @@ int mExchange;
226 [self handlerLeakOrder]; 226 [self handlerLeakOrder];
227 }); 227 });
228 228
229 - NSString *isOpenThirdPay = [payInfo isOpenThirdPay]; 229 + //NSString *isOpenThirdPay = [payInfo isOpenThirdPay];
230 - NSLog(@"custom%@",[payInfo custom]); 230 +
231 - if([isOpenThirdPay isEqualToString:@"false"]){ 231 + NSString *other = [payInfo other];
232 - NSString* products = [payInfo products]; 232 +
233 - //NSLog(@"products:%@",products); 233 + if (other && [other length] > 0) {
234 - [[YouaiSDKMgr getInstance] openApplePay:self.controller products:products amount:[payInfo postAmount] queryId:queryId];
235 - }else{
236 [[YouaiSDKMgr getInstance] openPay:serverId :roleName :amount :[payInfo queryId] :self.controller]; 234 [[YouaiSDKMgr getInstance] openPay:serverId :roleName :amount :[payInfo queryId] :self.controller];
235 + }else{
236 + NSString* products = [payInfo products];
237 + [[YouaiSDKMgr getInstance] openApplePay:self.controller products:products amount:[payInfo postAmount] productName:[payInfo productName] queryId:queryId];
237 } 238 }
238 -
239 - int64_t delayInSeconds = 5.0; // 延迟的时间
240 - dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, delayInSeconds * NSEC_PER_SEC);
241 - dispatch_after(popTime, dispatch_get_main_queue(), ^(void){
242 - NSLog(@"chage state");
243 - [[PoolChecker getInstance] setOnlyOneTimePay:false];
244 - });
245 } 239 }
246 240
247 -(void)paymentSuccess:(NSString *)accountId orderId:(NSString *)orderId currencyAmount:(double)amount currencyType:(NSString *)currencyType payType:(NSString *)payType custom:(NSArray *)customArray 241 -(void)paymentSuccess:(NSString *)accountId orderId:(NSString *)orderId currencyAmount:(double)amount currencyType:(NSString *)currencyType payType:(NSString *)payType custom:(NSArray *)customArray
......