支付流程pass

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCartPayOrder/ViewController/ShoppingCartPayOrderController.swift

@@ -74,11 +74,7 @@ class ShoppingCartPayOrderController: BaseViewController {
         orderPayView.totalProductPrice = self.totalProductPrice!
         orderPayView.commitOrderTransBlock = {
             [weak self] (paraMdl) in
-//            self?.orderCreateApi(paraMdl: paraMdl)
-            
-            // just test
-            let vc = ShoppingCartFinishPayController()
-            self?.navigationController?.pushViewController(vc, animated: true)
+            self?.orderCreateApi(paraMdl: paraMdl)
         }
         orderPayView.jumpNavBlock = {
             [weak self] (jumpType) in
@@ -135,16 +131,12 @@ class ShoppingCartPayOrderController: BaseViewController {
                     self?.payAlipayApi(orderPayModel: orderBackModel as! OrderCreateBackModel)
                 }
             })
-            
-            self.payWeixinpayApi(orderPayModel: orderBackModel as! OrderCreateBackModel)
         }
     }
     
     // 微信支付
     func payWeixinpayApi(orderPayModel: OrderCreateBackModel) {
-        SwiftMoyaNetWorkServicePay.shared().payWeixinpayApi(paraMdl: orderPayModel) { [weak self] (data) -> (Void) in
-            print(data)
-            
+        SwiftMoyaNetWorkServicePay.shared().payWeixinpayApi(paraMdl: orderPayModel) { [weak self] (data) -> (Void) in            
             let vc = ShoppingCartFinishPayController()
             vc.payStatus = true
             self?.navigationController?.pushViewController(vc, animated: true)
@@ -154,8 +146,6 @@ class ShoppingCartPayOrderController: BaseViewController {
     // 支付宝支付
     func payAlipayApi(orderPayModel: OrderCreateBackModel) {
         SwiftMoyaNetWorkServicePay.shared().payAlipayApi(paraMdl: orderPayModel) { [weak self] (data) -> (Void) in
-            print(data)
-            
             let vc = ShoppingCartFinishPayController()
             vc.payStatus = true
             self?.navigationController?.pushViewController(vc, animated: true)

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServicePay/SwiftMoyaNetWorkServicePay.swift

@@ -30,7 +30,7 @@ public class SwiftMoyaNetWorkServicePay: NSObject {
     func payAlipayApi(paraMdl:OrderCreateBackModel, completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(paraMdl.patchNum ?? 0, forKey: "patch_num")
-        parameters.updateValue(paraMdl.patchNum ?? 0, forKey: "money")
+        parameters.updateValue(paraMdl.money ?? 0, forKey: "money")
         
         SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServicePayApi.alipay(parameters: parameters))) { (rootModel) in
@@ -53,7 +53,7 @@ public class SwiftMoyaNetWorkServicePay: NSObject {
     func payWeixinpayApi(paraMdl:OrderCreateBackModel, completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(paraMdl.patchNum ?? 0, forKey: "patch_num")
-        parameters.updateValue(paraMdl.patchNum ?? 0, forKey: "money")
+        parameters.updateValue(paraMdl.money ?? 0, forKey: "money")
         
         SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkManager.shared().request(WeChatpayOrderModel.self, target: MultiTarget(SwiftMoyaServicePayApi.weixinpay(parameters: parameters))) { (weChatpayOrderModel) in

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServicePay/SwiftMoyaServicePayApi.swift

@@ -83,7 +83,7 @@ extension SwiftMoyaServicePayApi: TargetType {
         case .alipay,
              .weixinpay
             :
-            return (headerParameters(headerType: .defaultHeader) as! [String : String])
+            return (headerParameters(headerType: .tokenHeader) as! [String : String])
         }
     }
 }