调整物流跟踪

GeliBusinessPlatform/Model/Logistics/LogisticsModel.swift

@@ -515,6 +515,7 @@ class LogisticsTrackingDataModel: Mappable {
     var order_sn:String?
     var jd_tracking:Array<LogisticsJdTrackingModel>?
     var sf_tracking:LogisticsSFTrackingModel?
+    var xy_tracking:LogisticsXYTrackingModel?
 
     
     required init?( map: Map) {
@@ -573,6 +574,35 @@ class LogisticsSFTrackingModel: Mappable {
         
     }
 }
+class LogisticsXYTrackingModel: Mappable {
+    var result:Int? //接口状态 1 成功 其他异常
+    var msg :Array<LogisticsXYTrackingDataModel>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        result <- map["result"]
+        msg <- map["msg"]
+ 
+    }
+}
+class LogisticsXYTrackingDataModel: Mappable {
+    var id:Int?
+    var billdate:String?
+    var content:String?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        id <- map["id"]
+        billdate <- map["billdate"]
+        content <- map["content"]
+
+    }
+}
+
 class LogisticsSFTrackingDataModel: Mappable {
     var routeId:String? //流水号
     var barScanTm : String?//巴枪扫描时间

GeliBusinessPlatform/ViewController/代客下单（货运）/运单详情/YunDanXiangQingViewController.swift

@@ -272,7 +272,7 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
     }
     let p2Arr = ["关联平台：","关联订单号：","运单号：","运费：","运费支付方式："]
     let p3Arr = ["寄托物","寄托物包装","温类","总重量","件数","体积","寄件方式","派件方式","付款方式"]
-    let p4Arr = ["额外服务","声明服务","保费","备注"]
+    let p4Arr = ["额外服务","声明价值","保费","备注"]
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if indexPath.section == 0 {
             switch indexPath.row {
@@ -341,9 +341,17 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
             let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
             cell.nameLbl.text = p4Arr[indexPath.row]
             var arrStr:[String] = []
-            arrStr.append("--额外服务")
-            arrStr.append("--声明服务")
-            arrStr.append(String(format: "%.2f", (dataModel?.guarantee_fee)!))
+            var other = "-"
+            if dataModel?.zcservice == 1 && dataModel?.xcservice == 1 {
+                other = "装车,卸车"
+            }else if dataModel?.zcservice == 0 && dataModel?.xcservice == 1 {
+                other = "卸车"
+            }else if dataModel?.zcservice == 1 && dataModel?.xcservice == 0 {
+                other = "装车"
+            }
+            arrStr.append(other)
+            arrStr.append("￥" + String(format: "%.2f", (dataModel?.guarantee_value)!))
+            arrStr.append("￥" + String(format: "%.2f", (dataModel?.guarantee_fee)!))
             arrStr.append((dataModel?.remark)!)
             var str = arrStr[indexPath.row]
             if str == "" {

GeliBusinessPlatform/ViewController/物流跟踪/WuLiuGenZongViewController.swift

@@ -34,7 +34,7 @@ class WuLiuGenZongViewController: BaseViewController,UITableViewDelegate,UITable
     var dataModel:LogisticsTrackingDataModel? = nil
     func loadData() {
         
-        HUD.flash(.progress)
+        HUD.show(.progress)
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
 
         LogisticsTracking(["user_token":UserToken as Any,"id":orderId as Any], success: { (data) in
@@ -47,6 +47,10 @@ class WuLiuGenZongViewController: BaseViewController,UITableViewDelegate,UITable
                 if self.dataModel?.sf_tracking?.code == 200 {
                     self.dataArr = self.dataModel?.sf_tracking?.model! as! Array<Any>
                 }
+            }else if self.dataModel?.lc_name == "鑫源物流" {
+                if self.dataModel?.xy_tracking?.result == 200 {
+                    self.dataArr = self.dataModel?.xy_tracking?.msg! as! Array<Any>
+                }
             }
             self.listView.reloadData()
             HUD.hide()
@@ -125,6 +129,15 @@ class WuLiuGenZongViewController: BaseViewController,UITableViewDelegate,UITable
                 cell.contentLbl.text = rowModel.owsRemark
                 cell.dateLbl.text = rowModel.barScanTm
                 
+            }
+        }else if self.dataModel?.lc_name == "鑫源物流" {
+            if self.dataModel?.xy_tracking?.result == 1 {
+                
+                let rowModel = self.dataArr[indexPath.row] as! LogisticsXYTrackingDataModel
+
+                cell.contentLbl.text = rowModel.content
+                cell.dateLbl.text = rowModel.billdate
+                
             }
         }
         return cell