完善分销订单详情

GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift

@@ -27,6 +27,7 @@ class OrderDetailDataModel: Mappable {
     var order_res : OrderDetailResModel?  //订单信息
     var order_goods : Array<OrderDetailGoodsModel>?  //订单商品
     var receiving :OrderDetailReceivingModel?  //收货信息
+    var dbt_info : OrderDetailDbtInfoDataModel?  //分销信息
 
     required init?( map: Map) {
         
@@ -35,6 +36,30 @@ class OrderDetailDataModel: Mappable {
         order_res <- map["order_res"]
         order_goods <- map["order_goods"]
         receiving <- map["receiving"]
+        dbt_info <- map["dbt_info"]
+     }
+    
+}
+class OrderDetailDbtInfoDataModel: Mappable {
+    var dbt_target : Int?   //分销对象 1供应商 2分销商 3分销员
+    var target_id : Int?   //分销对象id
+    var target_name :String?   //分销对象名称
+    var dbt_type : Int?   //分销分账方式 1人工结算 2自动结算
+    var commission_time : String?   //佣金结算时间
+    var sum_commission_val : String?   //总佣金
+    var commission_type : String?      //佣金方式
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        dbt_target <- map["dbt_target"]
+        target_id <- map["target_id"]
+        target_name <- map["target_name"]
+        dbt_type <- map["dbt_type"]
+        commission_time <- map["commission_time"]
+        sum_commission_val <- map["sum_commission_val"]
+        commission_type <- map["commission_type"]
      }
     
 }

GeliBusinessPlatform/ViewController/分销订单管理/RetailManageDetailViewController.swift

@@ -117,13 +117,21 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
                     cell.textTF.text = "-"
                 }
             case 1:
-                cell.textTF.text = "结算方式"
+                if self.dataMdoel?.dbt_info?.dbt_type == 1 {
+                    cell.textTF.text = "人工结算"
+
+                }else if self.dataMdoel?.dbt_info?.dbt_type == 2{
+                    cell.textTF.text = "自动结算"
+
+                }else{
+                    cell.textTF.text = "-"
+                }
             case 2:
-                cell.textTF.text = "佣金方式"
+                cell.textTF.text = self.dataMdoel?.dbt_info?.commission_type
             case 3:
-                cell.textTF.text = "佣金结算时间"
+                cell.textTF.text = self.dataMdoel?.dbt_info?.commission_time
             case 4:
-                cell.textTF.text = "佣金分销结算"
+                cell.textTF.text = "￥" + (self.dataMdoel?.order_res!.sum_commission_val)!
             default:
                 cell.textTF.text = ""
                 break