0.0.4

liushiyu
1 parent dfc22a0f
Showing 7 changed files with 44 additions and 18 deletions
CNLivePayCostModule.podspec
CNLivePayCostModule/Classes/Core/CNLivePayCostHeader.h
CNLivePayCostModule/Classes/Core/CNLivePayCostModule.m
CNLivePayCostModule/Classes/Core/CNLivePayCostNetwork.h
CNLivePayCostModule/Classes/Core/CNLivePayCostNetwork.m
CNLivePayCostModule/Classes/View/CNLivePayCostContentView.m
Example/CNLivePayCostModule/CNLIVEViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLivePayCostModule'
-  s.version          = '0.0.3'
+  s.version          = '0.0.4'
   s.summary          = 'A short description of CNLivePayCostModule.'
 # This description is used to generate tags and improve search results.
@@ -42,6 +42,8 @@ typedef enum {
     CNLivePayCostThreePayTypeScren    = 2, //扫码支付
     CNLivePayCostThreePayTypeTicke    = 4, //门票支付
     CNLivePayCostThreePayTypeSHSop    = 5, //上海电商支付(自定义回调地址属性)
+    CNLivePayCostThreePayTypeHTML     = 6, //网页支付
+    CNLivePayCostThreePayTypeShop     = 7, //电商支付(传参为全部自定义的)
 } CNLivePayCostThreePayType;
@@ -220,7 +220,7 @@
     NSString * p = [NSString stringWithFormat:@"%d",(NSInteger)([price floatValue]*100)];
-    [CNLivePayCostNetwork requestWithUMSPayForPrePayWithOrderId:orderId Body:body Price:p CouponFee:couponFee BalanceFee:balanceFee NotifyUrl:notifyUrl Type:payType FrmId:@"debug" PassWord:password CompleterBlcok:^(NSInteger statue) {
+    [CNLivePayCostNetwork requestWithUMSPayForPrePayWithOrderId:orderId Body:body Price:p CouponFee:couponFee BalanceFee:balanceFee NotifyUrl:notifyUrl Type:payType ThreePayType:CNLivePayCostThreePayTypeShop FrmId:@"debug" PassWord:password CompleterBlcok:^(NSInteger statue) {
         if (resultBlock) {
             if (statue == 0) resultBlock(statue == 0?CNLivePayCostTypeResultSucc:CNLivePayCostTypeResultFail);
         }
@@ -30,6 +30,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param balance_fee 余额金额
 /// @param notify_url 服务端回调地址
 /// @param type 支付方式 3：支付宝，4:余额，9：云闪付
+/// @param threeType 支付类型
 /// @param frmId 渠道id
 /// param completerBlock  返回
 +(void)requestWithUMSPayForPrePayWithOrderId:(NSString *)orderId
@@ -39,6 +40,7 @@ NS_ASSUME_NONNULL_BEGIN
                                   BalanceFee:(NSString *)balance_fee
                                    NotifyUrl:(NSString *)notify_url
                                         Type:(CNLivePayCostPayType)type
+                                ThreePayType:(CNLivePayCostThreePayType)threeType
                                        FrmId:(NSString *)frmId
                                     PassWord:(NSString *)password
                               CompleterBlcok:(void(^)(NSInteger statue))completerBlock;
@@ -77,6 +79,7 @@ NS_ASSUME_NONNULL_BEGIN
  @param desc 描述
  @param notifyUrl 回调地址
  @param password 支付密码
+ @param threeType 三方支付
  @param completerBlock 支付结果返回
  */
 -(void)requestActiveGroupWjjPayMentWithFromId:(NSString *)fromId
@@ -88,6 +91,7 @@ NS_ASSUME_NONNULL_BEGIN
                                          Desc:(NSString *)desc
                                     NotifyUrl:(NSString *)notifyUrl
                                      PassWord:(NSString *)password
+                                 ThreePayType:(CNLivePayCostThreePayType)threeType
                                CompleterBlock:(void (^)(NSInteger))completerBlock;
 /// 判断是否有支付密码
@@ -40,6 +40,7 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
 /// @param balance_fee 余额金额
 /// @param notify_url 服务端回调地址
 /// @param type 支付方式 3：支付宝，4:余额，9：云闪付
+/// @param threeType 支付类型
 /// @param frmId 渠道id
 /// @param completerBlock 返回
 +(void)requestWithUMSPayForPrePayWithOrderId:(NSString *)orderId
@@ -49,6 +50,7 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
                                   BalanceFee:(NSString *)balance_fee
                                    NotifyUrl:(NSString *)notify_url
                                         Type:(CNLivePayCostPayType)type
+                                ThreePayType:(CNLivePayCostThreePayType)threeType
                                        FrmId:(NSString *)frmId
                                     PassWord:(NSString *)password
                               CompleterBlcok:(void(^)(NSInteger statue))completerBlock
@@ -65,14 +67,22 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
         }];
     }else if (type == CNLivePayCostPayTypeWjjPay) {
+        NSString * notifyUrls = threeType == CNLivePayCostThreePayTypeTicke ? CNJSFYNotifyUrl: (type == CNLivePayCostPayTypeWeChatPay ? CNWeChatPayUrl : type == CNLivePayCostPayTypeAliPay ? CNAliPayUrl : CNUnionPayUrl);
+
+        //上海电商需要特殊的回调地址
+        if (!CNLiveStringIsEmpty(notify_url)
+            && threeType == CNLivePayCostThreePayTypeSHSop) notifyUrls = notify_url;
+        
+        NSString * desc = threeType == CNLivePayCostThreePayTypeScren?@"扫码支付":body;
+        
         NSDictionary * paramDict = @{
             @"appId":AppId,
             @"user_id":CNUserShareModel.uid?CNUserShareModel.uid:@"",
             @"out_trade_no":orderId,
-            @"body":body,
+            @"body":desc,
             @"coupon_fee":@"0",
             @"balance_fee":price,
-            @"notify_url":notify_url,
+            @"notify_url":notifyUrls,
             @"page_url":@"",
             @"type":@"4",
             @"password":[NSString md5String:password],
@@ -90,7 +100,8 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
                 [QMUITips showError:[errorMessage isNotBlank]?errorMessage:@"支付失败" inView:AppKeyWindow hideAfterDelay:1.5];
                 if (completerBlock) {
                     if (errorCode == 100011) completerBlock(2);
-                    if (errorCode != 100011) completerBlock(3);
+                    if (errorCode == 100010) completerBlock(1);
+                    if (errorCode != 100010 && errorCode != 100011) completerBlock(3);
                 }
             }
         }];
@@ -100,15 +111,24 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
         if (type == CNLivePayCostPayTypeAliPay) index = @"3";
         if (type == CNLivePayCostPayTypeUnionPay) index = @"9";
         if (type == CNLivePayCostPayTypeWjjPay) index = @"4";
+        
+        NSString * notifyUrls = threeType == CNLivePayCostThreePayTypeTicke ? CNJSFYNotifyUrl: (type == CNLivePayCostPayTypeWeChatPay ? CNWeChatPayUrl : type == CNLivePayCostPayTypeAliPay ? CNAliPayUrl : CNUnionPayUrl);
+
+        //上海电商需要特殊的回调地址
+        if (!CNLiveStringIsEmpty(notify_url)
+            && threeType == CNLivePayCostThreePayTypeSHSop) notifyUrls = notify_url;
+        
+        NSString * desc = threeType == CNLivePayCostThreePayTypeScren?@"扫码支付":body;
+        
         NSDictionary * paramDict = @{
                                      @"appId":AppId,
                                      @"user_id":CNUserShareModel.uid?CNUserShareModel.uid:@"",
                                      @"out_trade_no":orderId,
-                                     @"body":body,
+                                     @"body":desc,
                                      @"total_fee":price,
                                      @"coupon_fee":coupon_fee,
                                      @"balance_fee":balance_fee,
-                                     @"notify_url":notify_url,
+                                     @"notify_url":notifyUrls,
                                      @"page_url":@"",
                                      @"type":index,
                                      @"frmId":frmId
@@ -177,7 +197,7 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
             NSString * p = [NSString stringWithFormat:@"%d",(NSInteger)([price floatValue]*100)];
-            [CNLivePayCostNetwork requestWithUMSPayForPrePayWithOrderId:groupId Body:desc Price:p CouponFee:@"0" BalanceFee:@"0" NotifyUrl:notifyUrl Type:payType FrmId:@"ios" PassWord:@"" CompleterBlcok:^(NSInteger statue) {
+            [CNLivePayCostNetwork requestWithUMSPayForPrePayWithOrderId:groupId Body:desc Price:p CouponFee:@"0" BalanceFee:@"0" NotifyUrl:notifyUrl Type:payType ThreePayType:threeType FrmId:@"ios" PassWord:@"" CompleterBlcok:^(NSInteger statue) {
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                     if (completerBlock) completerBlock(statue);
                 });
@@ -245,7 +265,7 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
                     if (payType == CNLivePayCostPayTypeWjjPay) {
                         NSString * toid = threeType == CNLivePayCostTypeOrder ? fundsId : groupId;
-                        [self requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:toid Price:[price floatValue] Expand:expand SourceId:[responseObject objectForKey:@"payId"] PayId:responseObject[@"payId"] Desc:desc NotifyUrl:notifyUrl PassWord:password CompleterBlock:^(NSInteger statue) {
+                        [self requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:toid Price:[price floatValue] Expand:expand SourceId:[responseObject objectForKey:@"payId"] PayId:responseObject[@"payId"] Desc:desc NotifyUrl:notifyUrl PassWord:password ThreePayType:threeType CompleterBlock:^(NSInteger statue) {
                             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                                 if (completerBlock) completerBlock(statue);
                             });
@@ -301,6 +321,7 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
                                          Desc:(NSString *)desc
                                     NotifyUrl:(NSString *)notifyUrl
                                      PassWord:(NSString *)password
+                                 ThreePayType:(CNLivePayCostThreePayType)threeType
                                CompleterBlock:(void (^)(NSInteger))completerBlock
 {
@@ -308,7 +329,7 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
         NSString * p = [NSString stringWithFormat:@"%d",(NSInteger)(price*100)];
-        [CNLivePayCostNetwork requestWithUMSPayForPrePayWithOrderId:payId Body:desc Price:p CouponFee:@"0" BalanceFee:@"0" NotifyUrl:notifyUrl Type:CNLivePayCostPayTypeWjjPay FrmId:@"ios" PassWord:password CompleterBlcok:^(NSInteger statue) {
+        [CNLivePayCostNetwork requestWithUMSPayForPrePayWithOrderId:payId Body:desc Price:p CouponFee:@"0" BalanceFee:@"0" NotifyUrl:notifyUrl Type:CNLivePayCostPayTypeWjjPay ThreePayType:threeType FrmId:@"ios" PassWord:password CompleterBlcok:^(NSInteger statue) {
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 if (completerBlock) completerBlock(statue);
             });
@@ -288,27 +288,27 @@ static NSString *const CNActiveContentPayViewIdentifier = @&quot;CNActiveContentPayVi
     }
     if (self.payModel.payType == CNLivePayCostTypeOrder) {
-        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.userId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId Desc:self.payModel.descStr NotifyUrl:self.payModel.notifyUrl PassWord:password CompleterBlock:^(NSInteger statue) {
+        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.userId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId Desc:self.payModel.descStr NotifyUrl:self.payModel.notifyUrl PassWord:password ThreePayType:CNLivePayCostThreePayTypeOrder CompleterBlock:^(NSInteger statue) {
             [weakSelf showPayStatue:statue];
         }];
     }
     if (self.payModel.payType == CNLivePayCostTypeSweep) {
-        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.toId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId Desc:self.payModel.descStr NotifyUrl:self.payModel.notifyUrl PassWord:password CompleterBlock:^(NSInteger statue) {
+        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.toId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId Desc:self.payModel.descStr NotifyUrl:self.payModel.notifyUrl PassWord:password ThreePayType:CNLivePayCostThreePayTypeScren CompleterBlock:^(NSInteger statue) {
             [weakSelf showPayStatue:statue];
         }];
     }
     if (self.payModel.payType == CNLivePayCostTypeTicke) {
-        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.toId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId Desc:self.payModel.descStr NotifyUrl:self.payModel.notifyUrl PassWord:password CompleterBlock:^(NSInteger statue) {
+        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.toId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId Desc:self.payModel.descStr NotifyUrl:self.payModel.notifyUrl PassWord:password ThreePayType:CNLivePayCostThreePayTypeTicke CompleterBlock:^(NSInteger statue) {
             [weakSelf showPayStatue:statue];
         }];
     }
     if (self.payModel.payType == CNLivePayCostTypeSHShop) {
-        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.toId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId Desc:self.payModel.descStr NotifyUrl:self.payModel.notifyUrl PassWord:password CompleterBlock:^(NSInteger statue) {
+        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.toId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId Desc:self.payModel.descStr NotifyUrl:self.payModel.notifyUrl PassWord:password ThreePayType:CNLivePayCostThreePayTypeSHSop CompleterBlock:^(NSInteger statue) {
             [weakSelf showPayStatue:statue];
         }];
     }
     if (self.payModel.payType == CNLivePayCostTypeHtml) {
-        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.toId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId Desc:self.payModel.descStr NotifyUrl:self.payModel.notifyUrl PassWord:password CompleterBlock:^(NSInteger statue) {
+        [[CNLivePayCostNetwork sharePayCostNetWork] requestActiveGroupWjjPayMentWithFromId:CNUserShareModel.uid Toid:self.payModel.toId Price:self.payModel.price Expand:self.payModel.expand SourceId:self.payModel.orderId PayId:self.payModel.orderId Desc:self.payModel.descStr NotifyUrl:self.payModel.notifyUrl PassWord:password ThreePayType:CNLivePayCostThreePayTypeHTML CompleterBlock:^(NSInteger statue) {
             [weakSelf showPayStatue:statue];
         }];
     }
@@ -34,8 +34,8 @@
     UIButton * batchBtn = [UIButton buttonWithType:UIButtonTypeSystem];
     batchBtn.frame = CGRectMake(0, CGRectGetMaxY(requestBtn.frame)+5, kWidth, 70);
     batchBtn.backgroundColor = [UIColor cyanColor];
-    [batchBtn setTitle:@"支付宝支付" forState: UIControlStateNormal];
-    [batchBtn setTitle:@"支付宝支付" forState: UIControlStateHighlighted];
+    [batchBtn setTitle:@"电商支付" forState: UIControlStateNormal];
+    [batchBtn setTitle:@"电商支付" forState: UIControlStateHighlighted];
     [batchBtn addTarget:self action:@selector(batchRequestAction) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:batchBtn];
 }
@@ -48,7 +48,6 @@
         @"descStr":@"测试",
         @"price":@0.01,
         @"orderType":@"1",
-        @"notifyUrl":@"http://unifypay.cnlive.com/test/notify_url"
     };
     [CNLivePayCostModule showDefaultPayViwWithParamDict:paramDict PayCostType:CNLivePayCostTypeOrder FromVC:self ResultBlock:^(CNLivePayCostTypeResult resultType) {
         UIAlertView *alert = [[UIAlertView alloc] initWithTitle:resultType == CNLivePayCostTypeResultSucc?@"支付成功":@"支付失败" message:nil delegate:self cancelButtonTitle:@"确认" otherButtonTitles:nil, nil];