完善支付流程

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -252,5 +252,9 @@
 	<string>Lalamove/orderCancel</string>
 	<key>查看货拉拉运单详情</key>
 	<string>Lalamove/getHllOrderDetails</string>
+	<key>货拉拉二次支付</key>
+	<string>Lalamove/payHllOrder</string>
+	<key>货拉拉格利支付</key>
+	<string>Lalamove/payHllDelivery</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/LalamoveInterface.swift

@@ -172,3 +172,23 @@ func getHllOrderDetails(_ params:[String:Any],success:@escaping (_ res:Any)->(),
         failture(error)
     }
 }
+//MARK:--货拉拉二次支付
+//params-key(user_token  nonce_str，lwb_no    )
+func payHllOrder(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("货拉拉二次支付", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:--货拉拉格利支付
+//params-key(user_token  pwd，wb_no        )
+func payHllDelivery(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("货拉拉格利支付", params, { (rep:DataResponse<UpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}

GeliBusinessPlatform/Model/LalamoveInterface/LalamoveModel.swift

@@ -551,7 +551,8 @@ class getHllOrderDetailsDataModel: Mappable {
 class getHllOrderDetailsSalePlatDataModel: Mappable {
     var sale_plat : String?
     var order_sn : String?
- 
+    var hll_pay_status_two : Int?
+    var wb_no : String?
 
     required init?( map: Map) {
         
@@ -559,6 +560,8 @@ class getHllOrderDetailsSalePlatDataModel: Mappable {
     func mapping(map: Map) {
         sale_plat <- map["sale_plat"]
         order_sn <- map["order_sn"]
+        hll_pay_status_two <- map["hll_pay_status_two"]
+        wb_no <- map["wb_no"]
 
     }
 }

GeliBusinessPlatform/Model/UpDataModel.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 import ObjectMapper
-//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,取消采购单,修改采购订单,新增品牌,拒绝退款,确认用户退款到账,拒绝接单,审核同意退货退款,取消订单审核,确认收到退货,审核同意退货或退款,订单确认收货,取消运单,支付运费,选定地址添加收发货历史,取消货拉拉订单
+//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,取消采购单,修改采购订单,新增品牌,拒绝退款,确认用户退款到账,拒绝接单,审核同意退货退款,取消订单审核,确认收到退货,审核同意退货或退款,订单确认收货,取消运单,支付运费,选定地址添加收发货历史,取消货拉拉订单，货拉拉二次支付，货拉拉格利支付
 
 
 class UpDataModel: Mappable {

GeliBusinessPlatform/ViewController/货拉拉/运单详情/WaybillDetailViewController.swift

@@ -9,7 +9,7 @@
 import UIKit
 import LGButton
 
-class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITableViewDataSource,BtmBtnCellDelegate{
+class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITableViewDataSource,BtmBtnCellDelegate,PaymentViewDelegate{
   
     
     @IBOutlet weak var bottomLheight: NSLayoutConstraint!
@@ -50,6 +50,8 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
     @objc func getNoti(noti:Notification){
         notiObj = noti.object as! String
         print("abc == ",notiObj)
+        NotificationCenter.default.post(name: NSNotification.Name(rawValue: "logistDetail"), object: nil, userInfo: nil)
+
         loadData()
     }
     @objc func loadData(){
@@ -87,9 +89,10 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
                         self.bottomLbl.isHidden = false
                         self.bottomBtn.isHidden = false
                         self.bottomLbl.text = "取消订单"
-                    case 2:
+                    case 13,2:
                         print("已完成")
-                        if self.dataModel?.order_detail_item?.order_item?.pay_status == 0 {
+                        if self.dataModel?.delivery?.hll_pay_status_two == 1 {
+
                             self.bottomLheight.constant = 49
                             self.bottomLbl.isHidden = false
                             self.bottomBtn.isHidden = false
@@ -116,13 +119,32 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
 
         }
     }
+    var ispayHllOrder = false
+    
     @IBAction func bottomAction(_ sender: LGButton) {
         if bottomLbl.text == "取消订单" {
             let vc = HuolalaCancelViewController()
             vc.lwbno = lwb_no
             self.navigationController?.pushViewController(vc, animated: true)
         }else if (bottomLbl.text?.contains("立即支付"))!{
+            if dataModel?.delivery?.hll_pay_status_two == 1 {
+                if !ispayHllOrder {
+                    let UserToken = UserDefaults.standard.value(forKey: "user_token")
+
+                    payHllOrder(["user_token":UserToken as Any,"lwb_no":lwb_no as Any,"nonce_str":String.randomStr(len:30) as Any], success: { (data) in
+                        self.ispayHllOrder = true
+                        self.setPaymentUI(data:self.orderPriceArrName)
+                    }) { (error) in
+
+                    }
+                }else{
+                    self.setPaymentUI(data:self.orderPriceArrName)
+                }
+
+            }else{
                 setPaymentUI(data:orderPriceArrName)
+            }
+
             
         }
     }
@@ -697,12 +719,43 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
         cBtn?.isHidden = false
         pView?.isHidden = false
     }
+    var paymentView:PaymentView?
 
     @objc func payAc(){
         print("payAc")
+        if paymentView == nil{
+            paymentView = PaymentView(frame: view.bounds)
+            paymentView?.delegate = self
+            paymentView?.price = ((dataModel?.order_detail_item?.order_item?.price_fen!)!/100.0)
+            view.addSubview(paymentView!)
+        }
+        
+
     }
     @objc func closeAc(){
         cBtn?.isHidden = true
         pView?.isHidden = true
     }
+    func PaymentViewPassInputFinish(fullpass: String) {
+        HUD.flash(.progress)
+
+        let UserToken = UserDefaults.standard.value(forKey: "user_token")
+        
+        payHllDelivery(["user_token":UserToken as Any,"wb_no":dataModel?.delivery?.wb_no as Any, "pwd":fullpass as Any], success: { (data) in
+            HUD.hide()
+            self.loadData()
+            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "logistDetail"), object: nil, userInfo: nil)
+            self.closeAc()
+        }) { (error) in
+            HUD.hide()
+
+        }
+        paymentView?.removeFromSuperview()
+        paymentView = nil
+    }
+    func PaymentViewClose() {
+        paymentView?.removeFromSuperview()
+        paymentView = nil
+        
+    }
 }

GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/WayBillStautsTableViewCell.swift

@@ -14,7 +14,7 @@ class WayBillStautsTableViewCell: UITableViewCell {
     @IBOutlet weak var statusLbl: UILabel!
     override func awakeFromNib() {
         super.awakeFromNib()
-        // Initialization code
+        self.selectionStyle = .none
     }
 
     override func setSelected(_ selected: Bool, animated: Bool) {