Bladeren bron

微信,支付宝接口的接入

15555599100 6 jaren geleden
bovenliggende
commit
799b3fb12f

+ 18 - 0
HappyJob/HappyJob.xcodeproj/project.pbxproj

@@ -82,6 +82,9 @@
 		713D344423066D43007DCBB6 /* HJFullTimeDetailHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713D344323066D43007DCBB6 /* HJFullTimeDetailHeaderView.m */; };
 		713D344723066DC6007DCBB6 /* HJPartTimeDetailHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 713D344623066DC6007DCBB6 /* HJPartTimeDetailHeaderView.m */; };
 		713D344A2306F16D007DCBB6 /* BMessageDataBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 713D34492306F16D007DCBB6 /* BMessageDataBox.m */; };
+		713E8DB32372B5A800EE66DC /* HJMyIntegralGetOrderAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 713E8DB22372B5A800EE66DC /* HJMyIntegralGetOrderAPI.m */; };
+		713E8DB62372B8F600EE66DC /* HJMyIntegralWechatPayAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 713E8DB52372B8F600EE66DC /* HJMyIntegralWechatPayAPI.m */; };
+		713E8DB92372C30C00EE66DC /* HJMyIntegralAlipayPayAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 713E8DB82372C30C00EE66DC /* HJMyIntegralAlipayPayAPI.m */; };
 		714396AE236A6A5C00EA1789 /* WechatPay.m in Sources */ = {isa = PBXBuildFile; fileRef = 714396AD236A6A5C00EA1789 /* WechatPay.m */; };
 		714396B1236A6BDA00EA1789 /* AlipayPay.m in Sources */ = {isa = PBXBuildFile; fileRef = 714396B0236A6BDA00EA1789 /* AlipayPay.m */; };
 		714A00CE2356D97A0090EBB6 /* HJMyWalletAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = 714A00CD2356D97A0090EBB6 /* HJMyWalletAPI.m */; };
@@ -595,6 +598,12 @@
 		713D344623066DC6007DCBB6 /* HJPartTimeDetailHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJPartTimeDetailHeaderView.m; sourceTree = "<group>"; };
 		713D34482306F16D007DCBB6 /* BMessageDataBox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BMessageDataBox.h; sourceTree = "<group>"; };
 		713D34492306F16D007DCBB6 /* BMessageDataBox.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BMessageDataBox.m; sourceTree = "<group>"; };
+		713E8DB12372B5A800EE66DC /* HJMyIntegralGetOrderAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJMyIntegralGetOrderAPI.h; sourceTree = "<group>"; };
+		713E8DB22372B5A800EE66DC /* HJMyIntegralGetOrderAPI.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJMyIntegralGetOrderAPI.m; sourceTree = "<group>"; };
+		713E8DB42372B8F600EE66DC /* HJMyIntegralWechatPayAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJMyIntegralWechatPayAPI.h; sourceTree = "<group>"; };
+		713E8DB52372B8F600EE66DC /* HJMyIntegralWechatPayAPI.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJMyIntegralWechatPayAPI.m; sourceTree = "<group>"; };
+		713E8DB72372C30C00EE66DC /* HJMyIntegralAlipayPayAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HJMyIntegralAlipayPayAPI.h; sourceTree = "<group>"; };
+		713E8DB82372C30C00EE66DC /* HJMyIntegralAlipayPayAPI.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HJMyIntegralAlipayPayAPI.m; sourceTree = "<group>"; };
 		714396AC236A6A5C00EA1789 /* WechatPay.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WechatPay.h; sourceTree = "<group>"; };
 		714396AD236A6A5C00EA1789 /* WechatPay.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WechatPay.m; sourceTree = "<group>"; };
 		714396AF236A6BDA00EA1789 /* AlipayPay.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AlipayPay.h; sourceTree = "<group>"; };
@@ -2126,6 +2135,12 @@
 				714A01262358099B0090EBB6 /* HJMyIntegralExchangeGiftRecordListAPI.m */,
 				714A0128235809C70090EBB6 /* HJMyIntegralExchangeActivityRecordListAPI.h */,
 				714A0129235809C70090EBB6 /* HJMyIntegralExchangeActivityRecordListAPI.m */,
+				713E8DB12372B5A800EE66DC /* HJMyIntegralGetOrderAPI.h */,
+				713E8DB22372B5A800EE66DC /* HJMyIntegralGetOrderAPI.m */,
+				713E8DB42372B8F600EE66DC /* HJMyIntegralWechatPayAPI.h */,
+				713E8DB52372B8F600EE66DC /* HJMyIntegralWechatPayAPI.m */,
+				713E8DB72372C30C00EE66DC /* HJMyIntegralAlipayPayAPI.h */,
+				713E8DB82372C30C00EE66DC /* HJMyIntegralAlipayPayAPI.m */,
 				714A012B23580A0F0090EBB6 /* HJMyIntegralExchangeRecordDataBox.h */,
 				714A012C23580A0F0090EBB6 /* HJMyIntegralExchangeRecordDataBox.m */,
 			);
@@ -4141,6 +4156,7 @@
 				714A00FB23574F9C0090EBB6 /* HJMyIntegralExchangeActivityVC.m in Sources */,
 				C40AEC6222424A2800A9EA23 /* HJMenuFilterPopButton.m in Sources */,
 				7132694D22CAEF9E00DEB10B /* BCheckPeopleViewController.m in Sources */,
+				713E8DB62372B8F600EE66DC /* HJMyIntegralWechatPayAPI.m in Sources */,
 				7135959B22FD2F3100B579DD /* HJSalaryEmptyView.m in Sources */,
 				713329662313BBEA002CF6DB /* BReleaseAddAddressView.m in Sources */,
 				714A00F223574E070090EBB6 /* HJMyIntegralExchangeGiftListAPI.m in Sources */,
@@ -4305,6 +4321,7 @@
 				714A00E423570B640090EBB6 /* HJTodaySigninRepairAPI.m in Sources */,
 				C4129F16224B5ADA00E762D5 /* HJCityPickerHotCell.m in Sources */,
 				71590CE92355517B00F3C099 /* HJMyIntegralExchangeGiftDetailHeaderView.m in Sources */,
+				713E8DB92372C30C00EE66DC /* HJMyIntegralAlipayPayAPI.m in Sources */,
 				C4113AF022A8BB040015DCF3 /* HJCheckVersionAPIManager.m in Sources */,
 				C410EB372282D20500DF55B7 /* HJMessageModel.m in Sources */,
 				C40FF1F0223F828E008868BF /* main.m in Sources */,
@@ -4528,6 +4545,7 @@
 				713269FE22CDBF3F00DEB10B /* CalendarHeaderView.m in Sources */,
 				C41222DB2293A6F80060F1E1 /* HJBlankView.m in Sources */,
 				C414D8982267070F00719CE0 /* HJMessageTableViewCell.m in Sources */,
+				713E8DB32372B5A800EE66DC /* HJMyIntegralGetOrderAPI.m in Sources */,
 				C40FA7132275CC8700EB2371 /* NSDate+FBBetweenDate.m in Sources */,
 				C4158F4C225B42FF00A7B1E5 /* HJJoinApplyViewController.m in Sources */,
 				C41907D7227ED36300E1F482 /* UIViewController+HJNavBar.m in Sources */,

+ 10 - 2
HappyJob/HappyJob/API/FBNetworking/FBBaseAPIManager.m

@@ -60,7 +60,7 @@
 
 - (void)requestFinished:(__kindof YTKBaseRequest *)request {
     DDLogDebug(@"[%@: %@] = %@", [self requestUrl], [self requestArgument], request.responseObject);
-    
+
     [self callingSuccessWithResponseObject:request.responseObject];
 }
 
@@ -106,6 +106,10 @@
     return [self.child methodName];
 }
 
+- (NSArray *)requestAuthorizationHeaderFieldArray {
+    
+    return @[@"text/plain", @"text/javascript", @"text/json",@"application/json"];
+}
 - (id)requestArgument {
     
     if ([self.child respondsToSelector:@selector(parameters)])
@@ -132,6 +136,10 @@
     
     return YTKRequestSerializerTypeJSON;
 }
+//- (YTKResponseSerializerType)responseSerializerType {
+//    
+//    return YTKResponseSerializerTypeHTTP | YTKResponseSerializerTypeJSON;
+//}
 
 - (NSTimeInterval)requestTimeoutInterval {
     
@@ -192,7 +200,7 @@
 - (void)callingSuccessWithResponseObject:(id)responseObject {
     
     self.fetchedRawData = [responseObject copy];
-    
+//    NSLog(@"responseObject:::::%@",responseObject);
     FBAPIManagerErrorType errorType = [self.child manager:self validWithCallBackData:responseObject];//错误类型
     if (errorType == FBAPIManagerErrorTypeNoError)
     {

+ 1 - 3
HappyJob/HappyJob/BClass/BHome_首页/ViewController/BHomeViewController.m

@@ -70,13 +70,12 @@ UIGestureRecognizerDelegate
 - (void)refreshEnterpriseAuthResult:(NSNotificationCenter *)noti {
     
     [self.authAPI start];
-    
 }
+
 /* 错误页面刷新事件 */
 - (void)refreshButtonClicked:(UIButton *)btn {
     
     [self.authAPI start];
-    
 }
 
 #pragma mark - UITextFieldDelegate
@@ -184,7 +183,6 @@ UIGestureRecognizerDelegate
         
         make.left.right.offset(0);
         make.centerY.equalTo(weakSelf.view);
-        
     }];
    
     _certificationView.certificationBlock = ^{

+ 2 - 0
HappyJob/HappyJob/Base/BasePageable_分页列表/HJPageListView.m

@@ -83,10 +83,12 @@
     if (self.APIManager.isLastPage)
     {
         [self.refreshFooter endRefreshingWithNoMoreData];
+//        NSLog(@"----------结束了------------");
     }
     else
     {
         [self.refreshFooter endRefreshing];
+//        NSLog(@"----------没有结束了------------");
     }
 }
 

+ 13 - 13
HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑好礼/ViewComtroller/HJMyIntegralExchangeGiftDetailVC.m

@@ -184,21 +184,21 @@ FBAPIManagerInterceptor
     
     HJMyIntergralExchangeGiftListModel *model = [HJMyIntergralExchangeGiftListModel yy_modelWithDictionary:self.detailDict[@"data"][@"mpCompaignsRewardSettingAPI"]];
     
-//    if ([model.money integerValue] == 0)
-//    {//不需要支付的
-//        self.inputPhoneView = [[HJConfirmPanelInputView alloc]init];
-//        self.inputPhoneView.titleLabel.text = @"请留下您的联系方式";
-//        self.inputPhoneView.inputTF.keyboardType = UIKeyboardTypeNumberPad;
-//        [self.inputPhoneView.confirmButton setTitle:@"好的" forState:UIControlStateNormal];
-//        [self.inputPhoneView.confirmButton addTarget:self action:@selector(confirmButtonClick:) forControlEvents:UIControlEventTouchUpInside];
-//        [self.inputPhoneView ShowConfirmPanelInputView];
-//        self.exchangeGiftAPI.mpCompaignsRewardSettingId = model.ID;
-//    }
-//    else
-//    {
+    if ([model.money floatValue] == 0)
+    {//不需要支付的
+        self.inputPhoneView = [[HJConfirmPanelInputView alloc]init];
+        self.inputPhoneView.titleLabel.text = @"请留下您的联系方式";
+        self.inputPhoneView.inputTF.keyboardType = UIKeyboardTypeNumberPad;
+        [self.inputPhoneView.confirmButton setTitle:@"好的" forState:UIControlStateNormal];
+        [self.inputPhoneView.confirmButton addTarget:self action:@selector(confirmButtonClick:) forControlEvents:UIControlEventTouchUpInside];
+        [self.inputPhoneView ShowConfirmPanelInputView];
+        self.exchangeGiftAPI.mpCompaignsRewardSettingId = model.ID;
+    }
+    else
+    {
         HJMyIntegralExchangePayViewController *vc = [[HJMyIntegralExchangePayViewController alloc]init];
         [self.navigationController pushViewController:vc animated:YES];
-//    }
+    }
 
 //    HJConfirmPanelSingleView *vc = [[HJConfirmPanelSingleView alloc]init];
 //    vc.titleLabel.text = @"兑换失败: 您慢了一步,已经被抢完了";

+ 19 - 0
HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑换记录支付/APIManager/HJMyIntegralAlipayPayAPI.h

@@ -0,0 +1,19 @@
+//
+//  HJMyIntegralAlipayPayAPI.h
+//  HappyJob
+//
+//  Created by 张晓光 on 2019/11/6.
+//  Copyright © 2019 Bob. All rights reserved.
+//
+
+#import "FBBaseAPIManager.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface HJMyIntegralAlipayPayAPI : FBBaseAPIManager
+
+@property (nonatomic, copy) NSString *orderId;
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 60 - 0
HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑换记录支付/APIManager/HJMyIntegralAlipayPayAPI.m

@@ -0,0 +1,60 @@
+//
+//  HJMyIntegralAlipayPayAPI.m
+//  HappyJob
+//
+//  Created by 张晓光 on 2019/11/6.
+//  Copyright © 2019 Bob. All rights reserved.
+//
+
+#import "HJMyIntegralAlipayPayAPI.h"
+
+@interface HJMyIntegralAlipayPayAPI () <FBAPIManagerProtocol, FBAPIManagerValidator>
+
+
+@end
+
+@implementation HJMyIntegralAlipayPayAPI
+
+#pragma mark - FBAPIManagerValidator(参数校验)
+
+- (FBAPIManagerErrorType)manager:(FBBaseAPIManager *)manager validWithCallParamsData:(NSDictionary *)data {
+    
+    return FBAPIManagerErrorTypeNoError;
+}
+
+- (FBAPIManagerErrorType)manager:(FBBaseAPIManager *)manager validWithCallBackData:(NSDictionary *)data {
+    
+    if ([[data objectForKey:@"errcode"] integerValue] == 0)
+    {
+        return FBAPIManagerErrorTypeNoError;
+    }
+    else
+    {
+        return FBAPIManagerErrorTypeNoContent;
+    }
+}
+
+#pragma mark - FBAPIManagerProtocol
+
+- (NSString *)methodName {
+    
+    return @"sys/aliPay/aliPayOrder.do";
+}
+
+- (FBAPIManagerRequestType)requestType {
+    
+    return FBAPIManagerRequestTypePost;
+}
+- (NSDictionary *)parameters {
+    
+    return @{
+             @"user_id": [HJUserInfoModel userInfo].userID,
+             @"user_token":[HJUserInfoModel userInfo].userToken,
+             @"member_id":[HJMemberInfoModel memberInfo].memberId,
+             @"orderId":self.orderId,
+             };
+    
+}
+
+
+@end

+ 19 - 0
HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑换记录支付/APIManager/HJMyIntegralGetOrderAPI.h

@@ -0,0 +1,19 @@
+//
+//  HJMyIntegralGetOrder.h
+//  HappyJob
+//
+//  Created by 张晓光 on 2019/11/6.
+//  Copyright © 2019 Bob. All rights reserved.
+//
+
+#import "FBBaseAPIManager.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface HJMyIntegralGetOrderAPI : FBBaseAPIManager
+
+@property (nonatomic, copy) NSString *pay_type;
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 60 - 0
HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑换记录支付/APIManager/HJMyIntegralGetOrderAPI.m

@@ -0,0 +1,60 @@
+//
+//  HJMyIntegralGetOrder.m
+//  HappyJob
+//
+//  Created by 张晓光 on 2019/11/6.
+//  Copyright © 2019 Bob. All rights reserved.
+//
+
+#import "HJMyIntegralGetOrderAPI.h"
+
+@interface HJMyIntegralGetOrderAPI () <FBAPIManagerProtocol, FBAPIManagerValidator>
+
+
+@end
+
+@implementation HJMyIntegralGetOrderAPI
+
+#pragma mark - FBAPIManagerValidator(参数校验)
+
+- (FBAPIManagerErrorType)manager:(FBBaseAPIManager *)manager validWithCallParamsData:(NSDictionary *)data {
+    
+    return FBAPIManagerErrorTypeNoError;
+}
+
+- (FBAPIManagerErrorType)manager:(FBBaseAPIManager *)manager validWithCallBackData:(NSDictionary *)data {
+    
+    if ([[data objectForKey:@"errcode"] integerValue] == 0)
+    {
+        return FBAPIManagerErrorTypeNoError;
+    }
+    else
+    {
+        return FBAPIManagerErrorTypeNoContent;
+    }
+}
+
+#pragma mark - FBAPIManagerProtocol
+
+- (NSString *)methodName {
+    
+    return @"order/saveMpOrder";
+}
+
+- (FBAPIManagerRequestType)requestType {
+    
+    return FBAPIManagerRequestTypePost;
+}
+- (NSDictionary *)parameters {
+    
+    return @{
+             @"user_id": [HJUserInfoModel userInfo].userID,
+             @"user_token":[HJUserInfoModel userInfo].userToken,
+             @"member_id":[HJMemberInfoModel memberInfo].memberId,
+             @"actuallyMoney":@"0.01",
+             @"pay_type":self.pay_type,
+             };
+    
+}
+
+@end

+ 19 - 0
HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑换记录支付/APIManager/HJMyIntegralWechatPayAPI.h

@@ -0,0 +1,19 @@
+//
+//  HJMyIntegralWechatPayAPI.h
+//  HappyJob
+//
+//  Created by 张晓光 on 2019/11/6.
+//  Copyright © 2019 Bob. All rights reserved.
+//
+
+#import "FBBaseAPIManager.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface HJMyIntegralWechatPayAPI : FBBaseAPIManager
+
+@property (nonatomic, copy) NSString *orderId;
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 60 - 0
HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑换记录支付/APIManager/HJMyIntegralWechatPayAPI.m

@@ -0,0 +1,60 @@
+//
+//  HJMyIntegralWechatPayAPI.m
+//  HappyJob
+//
+//  Created by 张晓光 on 2019/11/6.
+//  Copyright © 2019 Bob. All rights reserved.
+//
+
+#import "HJMyIntegralWechatPayAPI.h"
+
+@interface HJMyIntegralWechatPayAPI () <FBAPIManagerProtocol, FBAPIManagerValidator>
+
+
+@end
+
+@implementation HJMyIntegralWechatPayAPI
+
+#pragma mark - FBAPIManagerValidator(参数校验)
+
+- (FBAPIManagerErrorType)manager:(FBBaseAPIManager *)manager validWithCallParamsData:(NSDictionary *)data {
+    
+    return FBAPIManagerErrorTypeNoError;
+}
+
+- (FBAPIManagerErrorType)manager:(FBBaseAPIManager *)manager validWithCallBackData:(NSDictionary *)data {
+    
+    if ([[data objectForKey:@"errcode"] integerValue] == 0)
+    {
+        return FBAPIManagerErrorTypeNoError;
+    }
+    else
+    {
+        return FBAPIManagerErrorTypeNoContent;
+    }
+}
+
+#pragma mark - FBAPIManagerProtocol
+
+- (NSString *)methodName {
+    
+    return @"sys/pay/wxPayOrder.do";
+}
+
+- (FBAPIManagerRequestType)requestType {
+    
+    return FBAPIManagerRequestTypePost;
+}
+- (NSDictionary *)parameters {
+    
+    return @{
+             @"user_id": [HJUserInfoModel userInfo].userID,
+             @"user_token":[HJUserInfoModel userInfo].userToken,
+             @"member_id":[HJMemberInfoModel memberInfo].memberId,
+             @"orderId":self.orderId,
+             };
+    
+}
+
+
+@end

+ 178 - 9
HappyJob/HappyJob/CClass/Me_我/integral_我的积分/兑换记录支付/ViewController/HJMyIntegralExchangePayViewController.m

@@ -9,18 +9,33 @@
 #import "HJMyIntegralExchangePayViewController.h"
 #import "HJMyIntegralExchangePayHeaderView.h"
 #import "HJMyIntegralExchangePayTypeView.h"
+#import "HJMyIntegralGetOrderAPI.h"
+#import "HJMyIntegralWechatPayAPI.h"
+#import "HJMyIntegralAlipayPayAPI.h"
 #import "WechatPay.h"
 #import "AlipayPay.h"
 
-@interface HJMyIntegralExchangePayViewController ()<FBScrollLayoutViewDelegate,UIGestureRecognizerDelegate>
+@interface HJMyIntegralExchangePayViewController ()
+<
+FBScrollLayoutViewDelegate,
+UIGestureRecognizerDelegate,
+FBAPIManagerDelegate,
+FBAPIManagerInterceptor
+>
 
 @property (nonatomic, strong) FBScrollLayoutView                *scrollLayoutView;
 @property (nonatomic, strong) HJMyIntegralExchangePayHeaderView *headerView;
 @property (nonatomic, strong) HJMyIntegralExchangePayTypeView *walletPayView;
 @property (nonatomic, strong) HJMyIntegralExchangePayTypeView *WeChatPayView;
 @property (nonatomic, strong) HJMyIntegralExchangePayTypeView *AliPayView;
+
 @property (nonatomic, strong) UIButton *makeSureBtn;
 
+@property (nonatomic, strong) HJMyIntegralGetOrderAPI  *getOrderAPI;
+@property (nonatomic, strong) HJMyIntegralWechatPayAPI *WechatPayAPI;
+@property (nonatomic, strong) HJMyIntegralAlipayPayAPI *AlipayPayAPI;
+
+
 
 @end
 
@@ -46,6 +61,68 @@
 
 }
 
+#pragma mark - FBAPIManagerInterceptor
+
+- (BOOL)manager:(FBBaseAPIManager *)manager shouldStartCallAPIWithParams:(NSDictionary *)params {
+    
+    [self.view fb_showLoading];
+    return YES;
+}
+
+- (void)managerShouldFinishCallAPI:(FBBaseAPIManager *)manager {
+    
+    [self.view fb_dismiss];
+}
+
+#pragma mark - FBAPIManagerDelegate
+
+- (void)managerCallAPIDidSuccess:(FBBaseAPIManager *)manager {
+    
+    if (manager == self.getOrderAPI)
+    {
+        id orderData = [manager fetchDataWithBox:nil];
+        if (self.WeChatPayView.selectBtn.selected)
+        {
+            self.WechatPayAPI.orderId = orderData[@"data"][@"mpMemberOrder"][@"id"];
+            [self.WechatPayAPI start];
+        }
+        if (self.AliPayView.selectBtn.selected)
+        {
+            self.AlipayPayAPI.orderId = orderData[@"data"][@"mpMemberOrder"][@"id"];
+            [self.AlipayPayAPI start];
+        }
+    }
+    if (manager == self.WechatPayAPI)
+    {
+        id WechatPayData = [manager fetchDataWithBox:nil];
+        NSLog(@"%@",WechatPayData);
+        
+    }
+    if (manager == self.AlipayPayAPI)
+    {
+        id AlipayPayData = [manager fetchDataWithBox:nil];
+        [self AlipayPay:AlipayPayData[@"data"][@"resultStr"]];
+    }
+}
+
+- (void)managerCallAPIDidFailed:(FBBaseAPIManager *)manager {
+    
+    FBAPIManagerErrorType type = manager.errorType;
+    
+    if (type == FBAPIManagerErrorTypeNoContent)
+    {
+        id fetchData = [manager fetchDataWithBox:nil];
+        
+        if ([fetchData isKindOfClass:[NSDictionary class]])
+        {
+            [self.view fb_showFailureWithStatus:fetchData[@"errmsg"]];
+        }
+    }
+    else
+    {
+        [self.view fb_showFailureWithStatus:manager.errorMessage];
+    }
+}
 #pragma mark - FBScrollLayoutViewDelegate
 
 - (void)scrollLayoutViewMakeConstraints:(FBScrollLayoutView *)scrollLayoutView {
@@ -94,6 +171,7 @@
 }
 
 #pragma mark - setter and getter
+
 - (void)backButtonClick:(UIButton *)btn {
     
     [self.navigationController popViewControllerAnimated:YES];
@@ -124,20 +202,80 @@
     
     if (self.WeChatPayView.selectBtn.selected)
     {
-        [[WechatPay shareWeChatPay] weixinPayOrderDict:@{} andPayResult:^(PayReultType reslutType) {
-           
-            
-        }];
-        
+        self.getOrderAPI.pay_type = @"0";
+        [self.getOrderAPI start];
     }
     else if (self.AliPayView.selectBtn.selected)
     {
-        [[AlipayPay shareAliPay] aliProductInfo:@"xjixsijjijijxsijisaija" andPayResult:^(PayReultType reslutType) {
-            
-        }];
+        self.getOrderAPI.pay_type = @"1";
+               
+        [self.getOrderAPI start];
     }
 }
 
+#pragma mark - private metnod
+/* 微信支付 */
+- (void)WechatPay:(NSDictionary *)dict{
+    
+    [[WechatPay shareWeChatPay] weixinPayOrderDict:@{} andPayResult:^(PayReultType reslutType) {
+
+        switch (reslutType)
+        {
+            case Pay_result_type_failed:
+            {
+                NSLog(@"失败");
+            }
+                break;
+            case Pay_result_type_cancel:
+            {
+                NSLog(@"取消");
+            }
+                break;
+            case Pay_result_type_succeed:
+            {
+                NSLog(@"成功");
+            }
+                break;
+            default:
+                break;
+        }
+
+    }];
+    
+}
+/* 支付宝支付 */
+- (void)AlipayPay:(NSString *)alipay {
+    
+    NSLog(@"alipay::::1%@",alipay);
+    [[AlipayPay shareAliPay] aliProductInfo:alipay andPayResult:^(PayReultType reslutType) {
+        
+    }];
+    [AlipayPay shareAliPay].resultBlock = ^(PayReultType reslutType) {
+        
+        switch (reslutType)
+        {
+            case Pay_result_type_failed:
+            {
+                NSLog(@"失败");
+            }
+                break;
+            case Pay_result_type_cancel:
+            {
+                NSLog(@"取消");
+            }
+                break;
+            case Pay_result_type_succeed:
+            {
+                NSLog(@"成功");
+            }
+                break;
+            default:
+                break;
+        }
+
+    };
+}
+
 #pragma mark - setter and getter
 
 - (FBScrollLayoutView *)scrollLayoutView {
@@ -218,6 +356,37 @@
     }
     return _makeSureBtn;
 }
+
+- (HJMyIntegralGetOrderAPI *)getOrderAPI {
+    
+    if (_getOrderAPI == nil)
+    {
+        _getOrderAPI = [[HJMyIntegralGetOrderAPI alloc]init];
+        _getOrderAPI.APIManagerDelegate = self;
+        _getOrderAPI.APIManagerInterceptor = self;
+    }
+    return _getOrderAPI;
+}
+- (HJMyIntegralWechatPayAPI *)WechatPayAPI {
+    
+    if (_WechatPayAPI == nil)
+    {
+        _WechatPayAPI = [[HJMyIntegralWechatPayAPI alloc]init];
+        _WechatPayAPI.APIManagerDelegate = self;
+        _WechatPayAPI.APIManagerInterceptor = self;
+    }
+    return _WechatPayAPI;
+}
+- (HJMyIntegralAlipayPayAPI *)AlipayPayAPI {
+    
+    if (_AlipayPayAPI == nil)
+    {
+        _AlipayPayAPI = [[HJMyIntegralAlipayPayAPI alloc]init];
+        _AlipayPayAPI.APIManagerDelegate = self;
+        _AlipayPayAPI.APIManagerInterceptor = self;
+    }
+    return _AlipayPayAPI;
+}
 /*
 #pragma mark - Navigation
 

+ 15 - 2
HappyJob/HappyJob/Custom/Components/CustomControl/UIView/Refresh_上拉下拉刷新/HJRefreshFooterView.m

@@ -10,23 +10,36 @@
 
 @implementation HJRefreshFooterView
 
+
 - (void)setState:(MJRefreshState)state {
     
-    MJRefreshCheckState;
+//    MJRefreshCheckState;
     
+    [super setState:state];
     switch (state) {
         case MJRefreshStateIdle:
+        {
             self.stateLabel.text = nil;
             break;
+        }
         case MJRefreshStatePulling:
-            self.stateLabel.text = @"松开立即加載更多";
+        {
+           self.stateLabel.text = @"松开立即加載更多";
             break;
+        }
         case MJRefreshStateRefreshing:
+        {
             self.stateLabel.text = @"数据加载中...";
             break;
+        }
         case MJRefreshStateNoMoreData:
+        {
+//            NSLog(@"----------------------------------------------------");
             // 第一次加载的时候没有数据,不显示更多文体提示
             self.stateLabel.text = (self.scrollView.mj_totalDataCount > 0) ? @"没有更多信息了" : nil;
+            break;
+        }
+            
         default:
             break;
     }