增加接口测试替换mock

VirtualPayment/VirtualPayment/QGClasses/Card/Function/QGDeposit/PwdView/QGDepositPwdManager.m

@@ -200,9 +200,11 @@
     [param setObject:self.card.billNumber forKey:@"billNumber"];
     [param setObject:@(self.card.isLowestRepay) forKey:@"isLowestRepay"];
     [param setObject:@(self.card.isPreRepay) forKey:@"isPreRepay"];
+    [param setObject:self.card.tailCardNo forKey:@"bankCardNo"];
     
    // [QGRepaymentReuestApi urlWithIndex:QGRepaymentRequestServerMethodRepay]
-    [networking POST:@"http://yapi.quantgroups.com/mock/305/vcc/encrypt_repay" parameters:param success:^(id  _Nonnull responseObject) {
+    //@"http://yapi.quantgroups.com/mock/305/vcc/encrypt_repay"
+    [networking POST:[QGRepaymentReuestApi urlWithIndex:QGRepaymentRequestServerMethodEncryptRepay] parameters:param success:^(id  _Nonnull responseObject) {
         [QGHUDManager hideHud];
         if ([QGTalosNetwork checkBusinessCodeAndCodeWithResponseObjectObject:responseObject]) {
             if (self.tradeResultBlock) {

VirtualPayment/VirtualPayment/QGClasses/Card/Function/QGRepayment/Controller/QGRepayment/Controller/QGRepayResultViewController.m

@@ -82,6 +82,7 @@
         make.centerX.centerY.equalTo(self.imageView);
         make.height.width.mas_equalTo(40);
     }];
+    timeLab.hidden = YES;
     self.timeLab  = timeLab;
     /// 正在转入/出
     NSString *title = @"还款中,请稍后…";

VirtualPayment/VirtualPayment/QGClasses/Card/Function/QGRepayment/Controller/QGRepayment/Controller/QGRepaymentCommitViewController.m

@@ -32,6 +32,8 @@
 @property (nonatomic, copy) NSString *bankName ;
 /// 银行尾号
 @property (nonatomic, copy) NSString *bankCardTailNo ;
+/// 银行编码
+@property (nonatomic, copy) NSString *bankCode ;
 /// 每单限额
 @property (nonatomic, assign) CGFloat bankLimitAmtPerDay;
 /// 每日限额
@@ -148,19 +150,24 @@
         [param setObject:self.billNumber forKey:@"billNumber"];
     }
    // [QGRepaymentReuestApi urlWithIndex:QGRepaymentRequestServerMethodRepayInfo];
-    [networking GET:@"http://yapi.quantgroups.com/mock/305/vcc/repay/page" parameters:nil success:^(id  _Nonnull responseObject) {
+    //@"http://yapi.quantgroups.com/mock/305/vcc/repay/page"
+    [networking GET:[QGRepaymentReuestApi urlWithIndex:QGRepaymentRequestServerMethodRepayInfo] parameters:nil success:^(id  _Nonnull responseObject) {
         [QGHUDManager hideHud];
         if ([QGTalosNetwork checkBusinessCodeAndCodeWithResponseObjectObject:responseObject]) {
-            self.payNameLab.text = responseObject[@"data"][@"repayContent"];
-            self.amountLab.text =  [NSString stringWithFormat:@"%.2f", [responseObject[@"data"][@"repayAmt"] floatValue]];
-            self.payDesLab.text = responseObject[@"data"][@"billTotalAmtContent"];
-            self.bankName = responseObject[@"data"][@"bankName"];
-            self.bankCardTailNo = responseObject[@"data"][@"bankCardTailNo"];
-            self.bankLimitAmtPerDay = [responseObject[@"data"][@"bankLimitAmtPerDay"] floatValue];
-            self.bankLimitAmtPerTrade = [responseObject[@"data"][@"bankLimitAmtPerTrade"] floatValue];
-            self.bankCardListH5Url = responseObject[@"data"][@"bankCardListH5Url"];
-            self.repayType = [responseObject[@"data"][@"repayType"] integerValue];
-            self.cardId = [NSString stringWithFormat:@"%@",responseObject[@"data"][@"bankCardId"]];
+            NSDictionary *data = responseObject[@"data"];
+            
+            self.payNameLab.text = data[@"repayContent"];
+            self.amountLab.text =  [NSString stringWithFormat:@"%.2f", [data[@"repayAmt"] floatValue]];
+            self.payDesLab.text = data[@"billTotalAmtContent"];
+            self.bankName = data[@"bankName"];
+            self.bankCardTailNo = data[@"bankCardTailNo"];
+            self.bankCode = data[@"bankCode"];
+            self.bankLimitAmtPerDay = [data[@"bankLimitAmtPerDay"] floatValue];
+            self.bankLimitAmtPerTrade = [data[@"bankLimitAmtPerTrade"] floatValue];
+            self.bankCardListH5Url = data[@"bankCardListH5Url"];
+            self.repayType = [data[@"repayType"] integerValue];
+            self.cardId = [NSString stringWithFormat:@"%@",data[@"bankCardId"]];
+            self.repayAmt =[data[@"repayAmt"] floatValue];
             [self.tableView reloadData];
         }
     } failure:^(NSURLSessionDataTask * _Nonnull task, NSError * _Nonnull error) {
@@ -200,7 +207,7 @@
 {
     QGPayCardViewCell *cell = (QGPayCardViewCell *)[self getCellFromClassName:NSStringFromClass([QGPayCardViewCell class]) dequeueTableView:tableView];
     if (self.bankName.length) {
-         cell.bankName  = self.bankName;
+        cell.bankName  = [NSString stringWithFormat:@"%@(%@)",self.bankName,self.bankCardTailNo ? self.bankCardTailNo :@""];
     }else{
         cell.bankName = @"请添加银行卡";
     }
@@ -214,17 +221,18 @@
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
     if (self.bankCardListH5Url) {
         QGBaseWebViewController *webVC = [[QGBaseWebViewController alloc]init];
-        webVC.urlString = self.bankCardListH5Url;
+        NSString *appendString = [NSString stringWithFormat:@"&bankCode=%@&cardLast=%@",self.bankCode,self.bankCardTailNo];
+        webVC.urlString = [self.bankCardListH5Url stringByAppendingString:appendString];
         webVC.callBackBlock = ^(NSString *tag, NSDictionary *params) {
             /// H5选择的银行卡列表
             if ([tag isEqualToString:kWebView_selectBankCardInfoKey]) {
-                NSDictionary *dic = params[kWebView_selectBankCardInfoKey];
-                if (dic) {
-                    self.bankName = dic[@"bankName"];
-                    self.cardId = dic[@"cardId"];
-                    self.bankLimitAmtPerDay = [dic[@"dayLimit"] floatValue];
-                    self.bankLimitAmtPerTrade = [dic[@"tradeLimit"] floatValue];
-                    self.bankCardTailNo = dic[@"tailCardNo"];
+                if (params) {
+                    self.bankName = params[@"bankName"];
+                    self.cardId = params[@"cardId"];
+                    self.bankLimitAmtPerDay = [params[@"dayLimit"] floatValue];
+                    self.bankLimitAmtPerTrade = [params[@"tradeLimit"] floatValue];
+                    self.bankCardTailNo = params[@"tailCardNo"];
+                    self.bankCode = params[@"bankCode"];
                     [self.tableView reloadData];
                 }
             }
@@ -265,7 +273,9 @@
     @weakify(self);
     manager.tradeResultBlock = ^(BOOL success, NSString * _Nullable tradeNo, NSString * _Nullable message) {
         @strongify(self);
-        [self toReslut];
+        if (success) {
+            [self toReslut];
+        }
     };
     
 }

VirtualPayment/VirtualPayment/QGClasses/Card/Function/QGRepayment/Controller/QGRepaymentHome/QGRepaymentViewController.m

@@ -42,7 +42,7 @@
 
 #import "QGRepaymentCommitViewController.h"
 
-
+#import "QGApplicationOpenURL.h"
 
 @interface QGRepaymentViewController ()<UITableViewDelegate,UITableViewDataSource>
 
@@ -127,25 +127,7 @@
         @strongify(self);
     
         [self setupAnalyticsWith:isRight];
-        
-//        NSString *urlString = nil;
-//        if (self.bottomView.type ==  RepaymentBottomTypeSignle){
-//            urlString  = self.billHead.forwardUrl;
-//            urlString = [urlString filterURLParam:@"isBothBtn" value:@"false"];
-//        }else{
-//            urlString = isRight ? self.billHead.installmentUrl:self.billHead.forwardUrl;
-//            urlString = [urlString filterURLParam:@"isBothBtn" value:@"true"];
-//        }
-//
-//        urlString = [urlString filterURLParam:@"billNumber" value:self.billModel.billNo];
-//        urlString = [urlString filterURLParam:@"itemPrice" value:self.billModel.balanceAmount];
-//        urlString = [urlString filterURLParam:@"addPrice" value:self.shouldAmount == nil ? @"0":self.shouldAmount];
-//        urlString = [urlString filterURLParam:@"from" value:self.billModel.isShould ? @"should":@"await"];
-//        [self navigationToWeb:urlString];
-        
-        QGRepaymentCommitViewController *vc = [[QGRepaymentCommitViewController alloc]init];
-        [self.navigationController pushViewController:vc animated:YES];
-        
+        [QGApplicationOpenURL handleAllSupportUrl:isRight ? self.billHead.appPreRepayUrl : self.billHead.appRepayUrl];
     };
     /// 设置tableView
     [self.tableView mas_remakeConstraints:^(MASConstraintMaker *make) {

VirtualPayment/VirtualPayment/QGClasses/UserCenter/Function/SafeCenter/QGSafeBindSmsVerifyViewController.m

@@ -172,6 +172,8 @@
     if (!QGUserInfo.sharedUserInfo.isLogin) return;
     if (self.vCodeTF.text.length == 0) return;
     
+    [QGHUDManager showHud:nil];
+    
     [param setObject:QGUserInfo.sharedUserInfo.userName forKey:@"loginName"];
     [param setObject:self.vCodeTF.text forKey:@"smsCode"];
     [param setObject:self.wxModel.openid forKey:@"openId"];
@@ -182,8 +184,10 @@
     [param setObject:@"" forKey:@"userDesc"];
     
    // [QGLoginRequestApi urlWithQGLoginRequestServerMethod:QGLoginRequestServerMethodLoginWechat];
-    [networking POST:@"http://yapi.quantgroups.com/mock/305/vcc/external/login/weChat" parameters:param success:^(id  _Nonnull responseObject) {
+    //@"http://yapi.quantgroups.com/mock/305/vcc/external/login/weChat"
+    [networking POST:[QGLoginRequestApi urlWithQGLoginRequestServerMethod:QGLoginRequestServerMethodLoginWechat] parameters:param success:^(id  _Nonnull responseObject) {
         if ([QGTalosNetwork checkBusinessCodeAndCodeWithResponseObjectObject:responseObject]) {
+            [QGHUDManager hideHud];
             if (self.bindSuccessBlock) {
                 self.bindSuccessBlock(YES);
             }