修改元码苹果内购功能

修改元码微信支付为微信小程序支付(新支付 )

修改元码苹果内购功能
修改元码微信支付为微信小程序支付(新支付 )
张旭
1 parent d7d83fa5
Showing 3 changed files with 30 additions and 22 deletions
CNLivePayCostModule.podspec
CNLivePayCostModule/Classes/Core/CNLivePayCostModule.m
CNLivePayCostModule/Classes/Core/CNLivePayCostNetwork.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLivePayCostModule'
-  s.version          = '0.1.8'
+  s.version          = '0.1.9'
   s.summary          = 'A short description of CNLivePayCostModule.'
 # This description is used to generate tags and improve search results.
@@ -34,7 +34,8 @@
     [UMSPPPayPluginSettings sharedInstance].umspEnviroment = UMSP_PROD;
     //注册微信支付
-    [UMSPPPayUnifyPayPlugin registerApp:wxAppId universalLink:[NSString stringWithFormat:@"%@/",hostURL]];
+    BOOL isSucc = [UMSPPPayUnifyPayPlugin registerApp:wxAppId universalLink:[NSString stringWithFormat:@"%@/",hostURL]];
+    NSLog(@"%d",isSucc);
 }
 /// 拉起网家家支付功能
@@ -180,17 +181,22 @@
     NSString * total_fee = [paramDict stringValueForKey:@"total_fee" default:@""];
     NSString * body = [paramDict stringValueForKey:@"body" default:@""];
     NSString * productId = [paramDict stringValueForKey:@"prdId" default:@""];
+    NSString * orderId = [paramDict stringValueForKey:@"orderId" default:@""];
+    
     int moneyInt = [total_fee intValue];
     if (((int)moneyInt/100)<=0) {
         [QMUITips showWithText:@"付款金额不正确" inView:formVC.view hideAfterDelay:1.5f];
         return;
     }
     NSString *appleProductId = [NSString stringWithFormat:@"%@%d",CNLiveWjjApplePayAVProductIdBase,(int)moneyInt/100];
+    if (((int)moneyInt/100) == 1 || ((int)moneyInt/100) == 3 || ((int)moneyInt/100) == 78){
+        appleProductId = [NSString stringWithFormat:@"%@new.%d",CNLiveWjjApplePayAVProductIdBase,(int)moneyInt/100];
+    }
     CNLivePayArg *arg = [[CNLivePayArg alloc] init];
     arg.account = @"";
     arg.type = CNLivePayTypeInAppPurchase;
-    arg.out_trade_no = [CNLivePayCostModel payCost_getRandomOrderId];
+    arg.out_trade_no = [CNLivePayCostModel payCost_getRandomOrderId];//orderId;//
     arg.total_fee = moneyInt;
     arg.notify_url = notify_url;
     arg.user_id = CNUserShareModel.uid?CNUserShareModel.uid:@"";
@@ -201,7 +207,8 @@
                    };
     arg.body = [body isNotBlank]?body:[NSString stringWithFormat:@"您购买了付费服务"];
     [QMUITips showLoadingInView:formVC.view];
-    [[CNLivePaySDK sharedCNLivePayManager] pay:arg isDebug:TestEnvironment productId:appleProductId completion:^(CNLivePayResult *cnlivePayResult) {
+    NSLog(@"%@,%@,%d,%@,%@,%@,%@,%@",arg.account,arg.out_trade_no,arg.total_fee,arg.notify_url,arg.user_id,arg.attach,arg.body,appleProductId);
+    [[CNLivePaySDK sharedCNLivePayManager] pay:arg isDebug:false productId:appleProductId completion:^(CNLivePayResult *cnlivePayResult) {
         dispatch_async(dispatch_get_main_queue(), ^{
             [QMUITips hideAllTipsInView:formVC.view];
             if ([cnlivePayResult.channelBackCode isEqualToString:@"0"]) {
@@ -65,26 +65,26 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
         && (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=%@&&balance_fee=%@",AppId,body,orderId,userId?userId:CNUserShareModel.uid,price,notifyUrls,notify_url,coupon_fee,balance_fee];
-//        WXLaunchMiniProgramReq *launchMiniProgramReq = [WXLaunchMiniProgramReq object];
-//        launchMiniProgramReq.userName = @"gh_061b347b32c1";  //拉起的小程序的username
-//        launchMiniProgramReq.path = path;
-//        launchMiniProgramReq.miniProgramType = [CNLiveEnvironmentManager manager].isTestEnvironment?WXMiniProgramTypePreview:WXMiniProgramTypeRelease;
-//        [WXApi sendReq:launchMiniProgramReq completion:^(BOOL success) {
-//
-//        }];
-        
-        
-        NSString * accountString = WXAccount;
-        float pri = [price floatValue];
-        // notifyUrls CNWeChatPayUrl
-        [[CNLivePayCostNetwork sharePayCostNetWork] requestPayFromWXAndAliPay:CNLivePayTypeWeChatPay OrderId:orderId Account:accountString PriceId:pri Desc:body Attach:@{@"plat":@"i"} CNLiveActiveGroupThreePayType:CNLivePayCostThreePayTypeShop NotifyUrl:notify_url NetAddUrlSchems:nil FormVC:nil CompleterBlock:^{
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                if (completerBlock) completerBlock(0);
-            });
+        ////新支付  微信小程序支付
+        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=%@&&balance_fee=%@",AppId,body,orderId,userId?userId:CNUserShareModel.uid,price,notifyUrls,notify_url,coupon_fee,balance_fee];
+        WXLaunchMiniProgramReq *launchMiniProgramReq = [WXLaunchMiniProgramReq object];
+        launchMiniProgramReq.userName = @"gh_061b347b32c1";  //拉起的小程序的username
+        launchMiniProgramReq.path = path;
+        launchMiniProgramReq.miniProgramType = [CNLiveEnvironmentManager manager].isTestEnvironment?WXMiniProgramTypePreview:WXMiniProgramTypeRelease;
+        [WXApi sendReq:launchMiniProgramReq completion:^(BOOL success) {
         }];
+        
+        
+        ////老支付  微信支付
+//        NSString * accountString = @"ym_app";//WXAccount;
+//        float pri = [price floatValue];
+//        // notifyUrls CNWeChatPayUrl
+//        [[CNLivePayCostNetwork sharePayCostNetWork] requestPayFromWXAndAliPay:CNLivePayTypeWeChatPay OrderId:orderId Account:accountString PriceId:pri Desc:body Attach:@{@"plat":@"i"} CNLiveActiveGroupThreePayType:CNLivePayCostThreePayTypeShop NotifyUrl:notify_url NetAddUrlSchems:nil FormVC:nil CompleterBlock:^{
+//            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//                if (completerBlock) completerBlock(0);
+//            });
+//        }];
     }else if (type == CNLivePayCostPayTypeWjjPay) {
         NSString * desc = threeType == CNLivePayCostThreePayTypeScren?@"扫码支付":body;
@@ -126,6 +126,7 @@ static NSString *const CNLiveWillBecomeActivePaycostForSHShopNotification = @&quot;CN
         NSString * accountString = @"ztsx";
         float pri = [price floatValue];
+//        NSString * notifyUrl = @"https://apiwjj.cnlive.com/Daren/pay/notifyAliPay.action";
         [[CNLivePayCostNetwork sharePayCostNetWork] requestPayFromWXAndAliPay:CNLivePayTypeAliPay OrderId:orderId Account:accountString PriceId:pri Desc:body Attach:@{@"plat":@"i"} CNLiveActiveGroupThreePayType:CNLivePayCostThreePayTypeShop NotifyUrl:notify_url NetAddUrlSchems:nil FormVC:nil CompleterBlock:^{
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{