对接 运单列表接口

GeliBusinessPlatform/Define/Define.swift

@@ -27,10 +27,10 @@ let systemVersion = (UIDevice.current.systemVersion as String)
 
 //接口地址
 //test
-//let SERVERCE_ImageHost = "https://z.gelifood.com/"
-//let SERVERCE_HOST = "https://z.gelifood.com/admin/"
-let SERVERCE_ImageHost = "https://zx.gelifood.com/"
-let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
+let SERVERCE_ImageHost = "https://z.gelifood.com/"
+let SERVERCE_HOST = "https://z.gelifood.com/admin/"
+//let SERVERCE_ImageHost = "https://zx.gelifood.com/"
+//let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
 ////online
 
 //视图常量

GeliBusinessPlatform/View/Cell/YunDanLieBiaoCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>

GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift

@@ -525,9 +525,9 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             HUD.flash(.label("敬请期待"),delay: 1.2)
             return
         case 88: //运单列表
-            HUD.flash(.label("敬请期待"),delay: 1.2)
-//            let vc = YDLBVc()
-//            self.navigationController?.pushViewController(vc, animated: true)
+//            HUD.flash(.label("敬请期待"),delay: 1.2)
+            let vc = YDLBVc()
+            self.navigationController?.pushViewController(vc, animated: true)
             return
         case 89: //物流公司列表
             HUD.flash(.label("敬请期待"),delay: 1.2)
@@ -535,10 +535,10 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
 //            self.navigationController?.pushViewController(vc, animated: true)
             return
         case 90: //下运单
-            HUD.flash(.label("敬请期待"),delay: 1.2)
+//            HUD.flash(.label("敬请期待"),delay: 1.2)
 
-//            let vc = XiaYunDanViewController()
-//            self.navigationController?.pushViewController(vc, animated: true)
+            let vc = XiaYunDanViewController()
+            self.navigationController?.pushViewController(vc, animated: true)
             return
         case 92: //采购订单管理
             //            HUD.flash(.label("敬请期待"),delay: 1.2)

GeliBusinessPlatform/ViewController/货拉拉/调整地址/ToFormChangeView.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>

GeliBusinessPlatform/ViewController/运单列表/YDLBVc.swift

@@ -39,7 +39,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
         blackBtn.isHidden = !blackBtn.isHidden
     }
     var searchV : SearchBarView? = nil
-    var datas:Array<Any> = [1,2]
+    var datas:Array<LogisticsDataModel> = []
     
     var keyWord = ""
     
@@ -405,6 +405,16 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
                     }
                 }
             }
+        
+            calendarV.clearTheSelect()
+            BeginDate = nil
+            EndDate = nil
+            lc_id = ""
+            pay_status = ""
+            delivery_status = ""
+            order_sn = ""
+            sale_plat = ""
+
             break
         case "确定":
             preView.isHidden = true
@@ -435,6 +445,45 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
                     ydztStr = item.titleLabel?.text as! String
                 }
             }
+            switch wlgsStr {
+            case "全部":
+                lc_id = ""
+            case "顺丰":
+                lc_id = "2"
+            case "京东":
+                lc_id = "1"
+            case "货拉拉":
+                lc_id = "3"
+            default:
+                lc_id = ""
+                break
+            }
+            switch zfztStr {
+            case "已付款":
+                pay_status = "2"
+            case "未付款":
+                pay_status = "1"
+            case "已退款":
+                pay_status = "3"
+            default:
+                pay_status = ""
+                break
+            }
+            switch ydztStr {
+            case "下单完成":
+                delivery_status = "1"
+            case "揽收成功":
+                delivery_status = "2"
+            case "运输中":
+                delivery_status = "3"
+            case "已签收":
+                delivery_status = "4"
+            case "已取消":
+                delivery_status = "5"
+            default:
+                delivery_status = ""
+                break
+            }
             print(wlgsStr,zfztStr,dyztStr,ydztStr)
             break
         default:
@@ -482,10 +531,44 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
 
     }
     //MARK: - 加载数据
+    var start_time = 0
+    var end_time = 0
+    var lc_id = "" //物流公司id    下单物流 1京东 2顺丰
+    var order_sn = ""
+    var sale_plat = "" //所属平台
+    var pay_status = "" //运单运费支付状态：1待支付 2已支付 3已退款
+    var delivery_status = "" //运单状态：1下单完成 2揽收成功 3运输中 4已签收 5已取消 6拒收 7再投
+
     @objc func loadData(){
         print("加载数据")
         removeBlackBtnView()
+        
+        if BeginDate == nil {
+            start_time = 0
+            end_time = 0
+        }else{
+            let timeInterval:TimeInterval = BeginDate!.timeIntervalSince1970
+            let timeIntervalEnd:TimeInterval = EndDate!.timeIntervalSince1970
+            start_time = Int(timeInterval)
+            end_time = Int(timeIntervalEnd)
+        }
+        
+        let UserToken = UserDefaults.standard.value(forKey: "user_token")
+
+        jdOrderList(["user_token":UserToken as Any,"keyWord":keyWord as Any,"start_time":start_time as Any,"end_time":end_time as Any,"lc_id":lc_id as Any,"order_sn":order_sn as Any,"sale_plat":sale_plat as Any,"pay_status":pay_status as Any,"delivery_status":delivery_status as Any], success: { (data) in
+            
+            self.datas.removeAll()
+            let dataModel = data as! LogisticsModel
+            if dataModel.code == 1 {
+                self.datas = dataModel.data!
+            }
+            self.listView.mj_header?.endRefreshing()
+            self.listView.reloadData()
+
+        }) { (error) in
             self.listView.mj_header?.endRefreshing()
+
+        }
     }
     //MARK:--搜索模块
     //MAKR:--调起搜索后添加个蒙版本
@@ -555,20 +638,44 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
         if cell.tag == 0 {
             cell.acButton.isHidden = false
         }
+        let rowModel = datas[indexPath.row]
+        cell.title1.text = "运单号：" + rowModel.lwb_no!
+        cell.title2.text = rowModel.lc_name!
+        cell.senderLbl.text = rowModel.s_city_name!
+        cell.receiverLbl.text = rowModel.r_city_name!
+        cell.statusLbl.text = rowModel.delivery_status_cn!
+
+        cell.productNameLbl.text = "寄托物：" + rowModel.express_item_name!
+        cell.signLbl.text = "签收状态：-"
+        cell.standerLbl.text = "订单平台：" + rowModel.sale_plat!
+
+        if rowModel.sale_plat?.count == 0 {
+            cell.standerLbl.text = "订单平台：-"
+        }
+        cell.timeLbl.text = "签收时间：" + dayByDouble(sender: rowModel.sign_time!)
+        if rowModel.sign_time! == 0 {
+             cell.timeLbl.text = "签收时间：-"
+        }
+        cell.orderNumLbl.text = "订单号：" + rowModel.order_sn!
+        if rowModel.order_sn?.count == 0 {
+            cell.orderNumLbl.text = "订单号：-"
+        }
         return cell
     }
     func textFieldDidBeginEditing(_ textField: UITextField) {
-        if textField.tag == 1 {
-            orderNumTF.text = "   "
-        }else{
-            standerTF.text = "   "
+        if (orderNumTF == textField) {
+            order_sn = orderNumTF.text!
+        }
+        if (standerTF == textField) {
+            sale_plat = standerTF.text!
         }
     }
     func textFieldDidEndEditing(_ textField: UITextField) {
-        if textField.tag == 1 {
-            orderNumTF.text = textField.text!
-        }else{
-            standerTF.text = textField.text!
+        if (orderNumTF == textField) {
+            order_sn = orderNumTF.text!
+        }
+        if (standerTF == textField) {
+            sale_plat = standerTF.text!
         }
     }