电商h5调通微信支付和支付宝支付

“张旭”
1 parent c8cb138c
Showing 5 changed files with 51 additions and 29 deletions
metaCode/Classes/Config/CNLiveConfigManager.swift
metaCode/Classes/Main/HomePage/Controller/ShopPayController/CNLiveShopPayController.swift
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebView.swift
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebViewController.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/UpSlide/CNUpSlideView.swift
@@ -95,4 +95,9 @@ extension Notification.Name {
         //认证页垂直方向是哪个页面的通知 1上面页 2中间页 3下面页
         public static let kAuthVNumPageChangedNotification = Notification.Name("kAuthVNumPageChangedNotification")
     }
+    struct ShopOrderManage{
+        //电商h5订单支付成功通知
+        public static let kDSSuccessPayOrderNotification = Notification.Name("kDSSuccessPayOrderNotification")
+    }
+    
 }
@@ -197,7 +197,9 @@ class CNLiveShopPayController:CNLiveBaseViewController,UITableViewDelegate,UITab
             hiddenLoading()
             if status == .success{
                 self.finishPayCallBack?(self.orderInfoModel!, self.payType!, .success)
-//                NotificationCenter.default.post(name: <#T##NSNotification.Name#>, object: <#T##Any?#>)//kDSSuccessPayOrderNotification
+//                NotificationCenter.default.post(name: Notification.Name.ShopOrderManage.kDSSuccessPayOrderNotification, object: nil)
+                self.navigationController?.popViewController(animated: true)
+                
             }else{
                 if lastCount > 0{
                     DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
@@ -123,25 +123,20 @@ class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler{
                     print("json 字典是空的")
                     return
                 }
-                // 获取所有键
-                let allKeys = json.keys
                 // 使用可选链获取 orderNumber，如果不存在则返回空字符串
                 let orderNumber = json["orderNumber"] as? String ?? ""
-                // 获取 payModel，如果不存在或者不是字符串类型，则使用默认值 "2"
-//                let payModel = (json["payModel"] as? String) ?? "2"
-                // 现在你可以使用 orderNumber 和 payModel 进行后续操作
                 let vc = CNLiveShopPayController(orderNumber: orderNumber)
                 vc.finishPayCallBack = { [weak self]  orderInfoModel ,payType ,payResult in
-                    let params = NSDictionary()
-                    params.setValue(orderInfoModel.toJSONString() ?? "", forKey: "orderInfo")
+                    let params = NSMutableDictionary()
+                    let jsonStr = orderInfoModel.toJSONString() ?? ""
+                    params.setValue(jsonStr, forKey: "orderInfo")
                     params.setValue(payType.hashValue, forKey: "payType")
                     params.setValue(payResult.hashValue, forKey: "payResult")
-                    let sparams = params.jsonString()
+                    let sparams = self!.stringByJson(params as? [String : Any])
                     let appPaymentCallbackJS = String(format: "appPaymentCallback('%@')", sparams ?? "")
-
                     self?.cnWebView.evaluateJavaScript(appPaymentCallbackJS, completionHandler: { result, error in
-                        print("22222222appPaymentCallbackJS:\(result)")
+//                        print("error \(error)")
                     })
                 }
                 // 跳转支付页面
@@ -162,17 +157,11 @@ class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler{
                     print("json 字典是空的")
                     return
                 }
-                // 获取所有键
-                let allKeys = json.keys
                 // 使用可选链和条件绑定获取 type，如果不存在或不是数字，则使用默认值 0
                 let type: UInt = (json["type"] as? NSNumber)?.uintValue ?? 0
                 // 使用可选链获取 id 和 ext，如果不存在则返回空字符串
                 let targetId = json["id"] as? String ?? ""
                 let ext = json["ext"] as? String ?? ""
-                // 现在你可以使用 type, idStr 和 ext 进行后续操作
-                print("type: \(type)")
-                print("id: \(targetId)")
-                print("ext: \(ext)")
                 //请求分享参数
                 showLoading(message: "")
                 CNLiveShoph5ViewModel.postGetShareDataWithType(type: NSInteger(type), targetId: targetId, ext: ext) { result, status in
@@ -195,7 +184,35 @@ class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler{
             }
         }
     }
-    
+    // MARK: - 字典转字符串
+    func stringByJson(_ json: [String: Any]?) -> String? {
+        guard let json = json else {
+            return nil
+        }
+          
+        do {
+            let data = try JSONSerialization.data(withJSONObject: json, options: .prettyPrinted)
+            if let string = String(data: data, encoding: .utf8) {
+                // 去掉字符串中的空格
+                let stringWithoutSpaces = string.replacingOccurrences(of: " ", with: "", options: .literal, range: nil)
+                  
+                // 去掉字符串中的换行符
+                let stringWithoutNewlines = stringWithoutSpaces.replacingOccurrences(of: "\n", with: "", options: .literal, range: nil)
+                  
+                // 去掉字符串中的转义字符 "\"
+                // 注意：在标准的JSON字符串中，转义字符 "\" 是必要的，因此通常不会移除它们。
+                // 如果你确实需要移除它们，请确保这样做不会导致JSON字符串格式错误。
+                let stringWithoutEscapes = stringWithoutNewlines.replacingOccurrences(of: "\\", with: "", options: .literal, range: nil)
+                  
+                return stringWithoutEscapes
+            }
+        } catch {
+            // 处理JSONSerialization的错误
+            return nil
+        }
+          
+        return nil
+    }
     // MARK: - wjjh5的交互回调调用
     func configBridge(){
         WKWebViewJavascriptBridge.enableLogging()
@@ -224,7 +241,7 @@ class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler{
             let dic = data as! Dictionary<String, Any>
             let index = (dic["index"] as! NSString).integerValue
             let imageArray = dic["imgArr"] as! NSArray
-            var imgArray = NSMutableArray()
+            let imgArray = NSMutableArray()
             for dict in imageArray {
                 var imgUrl = ""
                 if let dictemp = dict as? String{
@@ -261,14 +278,14 @@ class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler{
         //h5拉起原生跳转苹果内购
         self.bridge?.registerHandler("wjjHtmlPullApplePay", handler: { data, responseCallback in
-            print("js call oc\(data)")
-            let dataDic = data as! Dictionary<String, Any>
-            let body = dataDic["body"] as? String
-            let notify_url = dataDic["notify_url"] as? String
-            let orderId = dataDic["orderId"] as? String
-            let prdId = dataDic["prdId"] as? String
-            let total_fee = dataDic["total_fee"] as? Int
-            print("拉起苹果内购")
+//            print("js call oc\(data)")
+//            let dataDic = data as! Dictionary<String, Any>
+//            let body = dataDic["body"] as? String
+//            let notify_url = dataDic["notify_url"] as? String
+//            let orderId = dataDic["orderId"] as? String
+//            let prdId = dataDic["prdId"] as? String
+//            let total_fee = dataDic["total_fee"] as? Int
+//            print("拉起苹果内购")
         })
@@ -47,7 +47,6 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
         moreNavBtn.addTarget(self, action: #selector(moreNavBtnAction), for: .touchUpInside)
         return moreNavBtn
     }()
-
     var _url:URL?
     var url:URL? {
@@ -78,7 +78,6 @@ class CNUpSlideView:UIView{
                 view.removeFromSuperview()
             }
             if(type == UpDownTypeH5){
-//                _downPath = "https://manageshop.cnlive.com/html/mall/1/#/pages/main/detail/detail?id=9526907&share_mold=shop&share_uid=c7KtcyWyXy7yMGCUPWuaUQ%3D%3D&shop_type=f8Ug%2BT1YxNKjy5QcYX4XlQ%3D%3D&shop_to=HNWMXVEMCtRetyucYELQtqg80ZoCVAAx%2B2jJIJuozJLTuJhb2vXeootObdZsz43yjHZNxKqF0WsT9mICYb0zHjo4STMRuQrSWYMkFzT4EQlgQS1%2BX%2FeCQ0jmkT2n4aZ9bShTP%2BB3nLDm%2BfHeBnfRpIEuEl3l9sXHnXc4p%2BcxciI%3D&shop_shop_type=f8Ug%2BT1YxNKjy5QcYX4XlQ%3D%3D&mall_share_type=2&price=0.01&originalPrice=0.00&shopShareType=1&wjjshopType=cnliveShopCar"
                 if _downPath?.count ?? 0 > 0{
                     self.addSubview(self.webView)
                     if self.webView.cnWebView.url?.absoluteString.contains(_downPath) == false && self.webView.cnWebView.url != nil{