0.0.5

liushiyu
1 parent ea59aec8
Showing 5 changed files with 52 additions and 29 deletions
CNLivePayCostModule.podspec
CNLivePayCostModule/Classes/Core/CNLivePayCostModule.h
CNLivePayCostModule/Classes/Core/CNLivePayCostModule.m
CNLivePayCostModule/Classes/Core/CNLivePayCostNetwork.m
Example/CNLivePayCostModule/CNLIVEViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLivePayCostModule'
-  s.version          = '0.0.4'
+  s.version          = '0.0.5'
   s.summary          = 'A short description of CNLivePayCostModule.'
 # This description is used to generate tags and improve search results.
@@ -39,7 +39,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param resultBlock 支付结果
 +(void)showShopPayViwWithParamDict:(NSDictionary *)paramDict
                            PayType:(CNLivePayCostPayType)payType
-                       ResultBlock:(void(^)(CNLivePayCostTypeResult resultType))resultBlock;
+                       ResultBlock:(void(^)(NSInteger resultCode))resultBlock;
 @end
@@ -208,7 +208,7 @@
 /// @param resultBlock 支付结果
 +(void)showShopPayViwWithParamDict:(NSDictionary *)paramDict
                            PayType:(CNLivePayCostPayType)payType
-                       ResultBlock:(void(^)(CNLivePayCostTypeResult resultType))resultBlock
+                       ResultBlock:(void(^)(NSInteger resultCode))resultBlock
 {
     NSString * orderId = [paramDict stringValueForKey:@"orderId" default:@""];
     NSString * body = [paramDict stringValueForKey:@"body" default:@""];
@@ -220,10 +220,8 @@
     NSString * p = [NSString stringWithFormat:@"%d",(NSInteger)([price floatValue]*100)];
-    [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);
-        }
+    [CNLivePayCostNetwork requestWithUMSPayForPrePayWithOrderId:orderId Body:body Price:p CouponFee:couponFee BalanceFee:balanceFee NotifyUrl:notifyUrl Type:payType ThreePayType:CNLivePayCostThreePayTypeShop FrmId:@"ios" PassWord:password CompleterBlcok:^(NSInteger statue) {
+        if (resultBlock) resultBlock(statue);
     }];
 }
 @end
@@ -55,8 +55,15 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
                                     PassWord:(NSString *)password
                               CompleterBlcok:(void(^)(NSInteger statue))completerBlock
 {
+    NSString * notifyUrls = threeType == CNLivePayCostThreePayTypeTicke ? CNJSFYNotifyUrl: (type == CNLivePayCostPayTypeWeChatPay ? CNWeChatPayUrl : type == CNLivePayCostPayTypeAliPay ? CNAliPayUrl : CNUnionPayUrl);
+
+    //上海电商 & 电商 需要特殊的回调地址
+    if (!CNLiveStringIsEmpty(notify_url)
+        && (threeType == CNLivePayCostThreePayTypeSHSop || threeType == CNLivePayCostThreePayTypeShop)) notifyUrls = notify_url;
+    
     if (type == CNLivePayCostPayTypeWeChatPay) {
-        NSString * path = [NSString stringWithFormat:@"pages/pays/pay/pay?appId=%@&body=%@&out_trade_no=%@&user_id=%@&total_fee=%@&notify_url=%@&type=1&&frmId=ios&&page_url=%@&&coupon_fee=0&&balance_fee=0",AppId,body,orderId,CNUserShareModel.uid?CNUserShareModel.uid:@"",price,notify_url,notify_url];
+        
+        NSString * path = [NSString stringWithFormat:@"pages/pays/pay/pay?appId=%@&body=%@&out_trade_no=%@&user_id=%@&total_fee=%@&notify_url=%@&type=1&&frmId=ios&&page_url=%@&&coupon_fee=0&&balance_fee=0",AppId,body,orderId,CNUserShareModel.uid?CNUserShareModel.uid:@"",price,notifyUrls,notify_url];
         NSLog(@"===>%@",path);
         WXLaunchMiniProgramReq *launchMiniProgramReq = [WXLaunchMiniProgramReq object];
         launchMiniProgramReq.userName = @"gh_061b347b32c1";  //拉起的小程序的username
@@ -67,12 +74,6 @@ 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 = @{
@@ -80,7 +81,7 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
             @"user_id":CNUserShareModel.uid?CNUserShareModel.uid:@"",
             @"out_trade_no":orderId,
             @"body":desc,
-            @"coupon_fee":@"0",
+            @"coupon_fee":coupon_fee,
             @"balance_fee":price,
             @"notify_url":notifyUrls,
             @"page_url":@"",
@@ -98,11 +99,13 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
                 if (completerBlock) completerBlock(0);
             }else{
                 [QMUITips showError:[errorMessage isNotBlank]?errorMessage:@"支付失败" inView:AppKeyWindow hideAfterDelay:1.5];
-                if (completerBlock) {
-                    if (errorCode == 100011) completerBlock(2);
-                    if (errorCode == 100010) completerBlock(1);
-                    if (errorCode != 100010 && errorCode != 100011) completerBlock(3);
-                }
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    if (completerBlock) {
+                        if (errorCode == 100011) completerBlock(2);
+                        if (errorCode == 100010) completerBlock(1);
+                        if (errorCode != 100010 && errorCode != 100011) completerBlock(3);
+                    }
+                });
             }
         }];
@@ -112,12 +115,6 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
         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 = @{
@@ -38,10 +38,12 @@
     [batchBtn setTitle:@"电商支付" forState: UIControlStateHighlighted];
     [batchBtn addTarget:self action:@selector(batchRequestAction) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:batchBtn];
+    
+    
+    
 }
 -(void)requestAction
 {
-//    [CNLivePayCostNetwork requestWithUMSPayForPrePayWithOrderId:[self generateTradeNO] Body:@"测试" Price:@"1" CouponFee:@"0" BalanceFee:@"0" NotifyUrl:@"http://unifypay.cnlive.com/test/notify_url" Type:CNLivePayCostPayTypeWeChatPay FrmId:@"debug"];
     NSDictionary * paramDict = @{
         @"orderId":[self generateTradeNO],
         @"userId":@"10458139",
@@ -70,14 +72,40 @@
         @"notifyUrl":@"http://unifypay.cnlive.com/test/notify_url",
         @"password":@"123456"
     };
-    [CNLivePayCostModule showShopPayViwWithParamDict:paramDict PayType:CNLivePayCostPayTypeWeChatPay ResultBlock:^(CNLivePayCostTypeResult resultType) {
-        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:resultType == CNLivePayCostTypeResultSucc?@"支付成功":@"支付失败" message:nil delegate:self cancelButtonTitle:@"确认" otherButtonTitles:nil, nil];
+    [CNLivePayCostModule showShopPayViwWithParamDict:paramDict PayType:CNLivePayCostPayTypeWeChatPay ResultBlock:^(NSInteger resultCode) {
+        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:resultCode == 0?@"支付成功":@"支付失败" message:nil delegate:self cancelButtonTitle:@"确认" otherButtonTitles:nil, nil];
         [alert show];
     }];
 }
 -(void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
 {
     [super touchesBegan:touches withEvent:event];
+    
+    // appId+渠道+年月日+毫秒数后10位+2位数的随机数
+    NSString *randomOrderId = @"";
+    //年月日
+    NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+    [formatter setDateFormat:@"yyyyMMdd"];
+    NSDate *currentDate = [NSDate date];
+    NSString *currentDateString = [formatter stringFromDate:currentDate];
+    
+    NSDateFormatter *formatters = [[NSDateFormatter alloc] init];
+    [formatters setDateStyle:NSDateFormatterMediumStyle];
+    [formatters setTimeStyle:NSDateFormatterShortStyle];
+    [formatters setDateFormat:@"YYYY-MM-dd HH:mm:ss"];
+    NSTimeZone* timeZone = [NSTimeZone timeZoneWithName:@"Asia/Beijing"];
+    [formatters setTimeZone:timeZone];
+    NSDate *datenow = [NSDate date];//现在时间
+    NSInteger timeSp = [[NSNumber numberWithDouble:[datenow timeIntervalSince1970]] integerValue];
+    //取毫秒时间戳
+    NSString *timestamp13 = [NSString stringWithFormat:@"%ld", (long)[NSString stringWithFormat:@"%ld",(long)timeSp]];
+    
+    //两位随机数
+    int x = arc4random() % 10;
+    //拼接
+    randomOrderId = [NSString stringWithFormat:@"%@%@%@%d",AppId,currentDateString,[timestamp13 substringFromIndex:timestamp13.length - 4],x];
+    
+    NSLog(@"%@",randomOrderId);
 //    if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"alipays://"]]) {
 //        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"alipays://"]];
 //    }