10

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -372,5 +372,7 @@
 	<string>Distribution/setGoodsAttr</string>
 	<key>供应商取消商品分销</key>
 	<string>Distribution/delDbtInfo</string>
+	<key>供应商分销订单管理</key>
+	<string>Distribution/supDbtOrderLis</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/agentList_interface.swift

@@ -132,3 +132,22 @@ func delDbtInfo(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture
         failture(error)
     }
 }
+//MARK:-- 供应商分销订单管理
+/*
+ user_token : 验证token
+ price_type : 0为分销价商品订单，1为供货价商品订单
+ order_status : 订单状态：1为待付款、7为待收货、10为已收货、2为交易关闭、100为全部（默认100）
+ keyword : 模糊搜索订单编号、商品名称
+ start_time       开始时间(时间戳)    非必填
+ end_time       结束时间(时间戳)    非必填
+ dbt_type      0全部 1人工结算 2自动结算(3待自动结算、4已自动结算)(5待人工结算6已人工结算)    非必填
+ page      分页    非必填
+ */
+func supDbtOrderLis(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("供应商分销订单管理", params, { (rep:DataResponse<supDbtOrderLis_model>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}

GeliBusinessPlatform/Model/agentList_model/agentList_model.swift

@@ -8,7 +8,69 @@
 
 import Foundation
 import ObjectMapper
-
+//MARK: - 供应商分销订单管理
+class supDbtOrderLis_model: Mappable {
+    var code:Int?
+    var message : String?
+    var data :Array<supDbtOrderLis_Data_model>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class supDbtOrderLis_list_Data_model: Mappable {
+    var goods_name:String?
+    var goods_number : Int?//商品数量
+    var amount :String?//单类总价
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        goods_name <- map["goods_name"]
+        goods_number <- map["goods_number"]
+        amount <- map["amount"]
+    }
+}
+class supDbtOrderLis_Data_model: Mappable {
+    var order_id:Int?
+    var order_sn : String?
+    var pay_status :Int?//订单状态：1为待付款、7为待收货、10为已收货、2为交易关闭、100为全部（默认100）
+    
+    var dbt_type:Int? //分销分账方式 1人工结算 2自动结算
+    var sum_commission_val : String?//总佣金
+    var sum_amount :String?//总价
+    
+    var commission_status:Int?//佣金结算 1已结算 0 未结算 2处理中 3结算失败 4已退还佣金
+    var shop_id : Int?
+    var price_type :Int? //分销订单类型：0普通分销价 1供货价
+    
+    var order_goods:Array<supDbtOrderLis_list_Data_model>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        order_id <- map["order_id"]
+        order_sn <- map["order_sn"]
+        pay_status <- map["pay_status"]
+        
+        dbt_type <- map["dbt_type"]
+        sum_commission_val <- map["sum_commission_val"]
+        sum_amount <- map["sum_amount"]
+        
+        commission_status <- map["commission_status"]
+        shop_id <- map["shop_id"]
+        price_type <- map["price_type"]
+        
+        order_goods <- map["order_goods"]
+    }
+}
 //MARK: - 设置下游代理商品信息查询
 class queryAgentGoods_model: Mappable {
     var code:Int?

GeliBusinessPlatform/ViewController/分销商品管理/FX_Product_GuanLiVC.swift

@@ -127,7 +127,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
                 if cell.btn2.titleLabel?.text?.contains("上") == true {
                     action = 1
                 }
-                print("action == ",action)
                 let model = dbt_datas[cell.tag]
                 let dict = ["user_token":UserToken as Any,
                             "action":action as Any,

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

@@ -32,7 +32,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
         navbar.lineView.isHidden = true
         self.view.addSubview(navbar)
         SetTopFrameView(view: contentV, btmView: self.view)
-        if titleStr == "代理订单管理" {
+        if titleStr != "分销订单管理" {
             if list_view == nil {
                 list_view = UITableView()
                 list_view?.delegate = self
@@ -48,6 +48,7 @@ class RetailListMgVC: BaseViewController,PagingViewControllerDelegate, UISearchB
                 list_view?.mj_header?.beginRefreshing()
             }
         }else{
+            print("abcdddd")
             let pagingViewController = PagingViewController(viewControllers: viewControllers)
             pagingViewController.indicatorColor = UIColor.init(named: "蓝色字体颜色")!
             pagingViewController.menuItemSize = .fixed(width: 0, height: 44*glscale)

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

@@ -10,7 +10,30 @@ import UIKit
 
 class RetailManageViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,RetailManageFooterViewDelagte, GeliAlertViewDelegate{
     
-    var order_status = 0
+    var order_status = 100 {
+        didSet{
+            switch order_status {
+            case 0:
+                order_status = 100
+                break
+            case 1:
+                order_status = 1
+                break
+            case 2:
+                order_status = 7
+                break
+            case 3:
+                order_status = 10
+                break
+            case 4:
+                order_status = 2
+                break
+            default:
+                break
+            }
+        }
+    }
+    var price_type = 1
     var page : Int = 0
     let UserToken = UserDefaults.standard.value(forKey: "user_token")
     var startTime :Int? = 0
@@ -38,9 +61,12 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
     init(title: String, content: String) {
         super.init(nibName: nil, bundle: nil)
         self.title = title
-        if self.title == "代销订单" {
-            dbt_people = 2
+        if title.contains("分销"){
+            price_type = 0
         }
+//        if self.title == "代销订单" {
+//            dbt_people = 2
+//        }
     }
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
@@ -59,57 +85,53 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
     }
     //MARK:--loadData
     //MARK:--列表数据源
-    var dataArr:Array<dbtOrderLisDataModel> = []
+    var dataArr:Array<supDbtOrderLis_Data_model> = []
 //    var dataArr2:Array<dbtOrderLisDataModel> = []
     @objc func loadData(){
         isUpData = true
         //结算方式（0全部1人工结算 2自动结算(3待自动结算、4已自动结算)(5待人工结算6已人工结算)）
         page = 1
-        let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"dbt_type":dbt_type,"dbt_people":dbt_people,"start_time":startTime as Any,"end_time":endTime as Any]
-        
-//        dbtOrderLis(dic) { (data) in
-//            let dataM = data as! dbtOrderLisModel
-//            
-//            self.dataArr.removeAll()
-//            dataM.data?.forEach({ (model) in
-//                self.dataArr.append(model)
-//            })
-//            self.listView.mj_header?.endRefreshing()
-//
-//            self.listView.reloadData()
-//             if dataM.data?.count == 0 {
-//                self.listView.mj_footer?.endRefreshingWithNoMoreData()
-//            }else{
-//                self.listView.mj_footer?.endRefreshing()
-//            }
-//            self.page = 2
-//   
-//        } failture: { (error) in
-//            self.listView.mj_header?.endRefreshing()
-//        }
+        let dic = ["user_token":UserToken as Any,"keyword":keyword,"order_status":order_status as Any,"page":page,"dbt_type":dbt_type,"start_time":startTime as Any,"end_time":endTime as Any,"price_type":price_type as Any]
+        supDbtOrderLis(dic) { (data) in
+            let dataM = data as! supDbtOrderLis_model
+            
+                        self.dataArr.removeAll()
+                        dataM.data?.forEach({ (model) in
+                            self.dataArr.append(model)
+                        })
+                        self.listView.mj_header?.endRefreshing()
+            
+                        self.listView.reloadData()
+                         if dataM.data?.count == 0 {
+                            self.listView.mj_footer?.endRefreshingWithNoMoreData()
+                        }else{
+                            self.listView.mj_footer?.endRefreshing()
+                        }
+                        self.page = 2
+        } failture: { (err) in
+            self.listView.mj_header?.endRefreshing()
+        }
+
     }
     @objc func loadMoreData(){
-        let dic = ["user_token":UserToken as Any,"keyword":keyword,"page":page,"dbt_type":dbt_type,"dbt_people":dbt_people,"start_time":startTime as Any,"end_time":endTime as Any]
-//        dbtOrderLis(dic) { (data) in
-//            let dataM = data as! dbtOrderLisModel
-//            if dataM.data?.count == 0 {
-//                self.listView.mj_footer?.endRefreshingWithNoMoreData()
-//            }else{
-//                self.page += 1
-//                dataM.data?.forEach({ (model) in
-//                    self.dataArr.append(model)
-//                })
-//                self.listView.reloadData()
-//                self.listView.mj_footer?.endRefreshing()
-//            }
-//            
-//            
-//
-//        } failture: { (error) in
-//            self.listView.mj_footer?.endRefreshing()
-//
-//        }
+        let dic = ["user_token":UserToken as Any,"keyword":keyword,"order_status":order_status as Any,"page":page,"dbt_type":dbt_type,"start_time":startTime as Any,"end_time":endTime as Any,"price_type":price_type as Any]
+        supDbtOrderLis(dic) { (data) in
+            let dataM = data as! supDbtOrderLis_model
+                        if dataM.data?.count == 0 {
+                            self.listView.mj_footer?.endRefreshingWithNoMoreData()
+                        }else{
+                            self.page += 1
+                            dataM.data?.forEach({ (model) in
+                                self.dataArr.append(model)
+                            })
+                            self.listView.reloadData()
+                            self.listView.mj_footer?.endRefreshing()
+                        }
+        } failture: { (err) in
+            self.listView.mj_footer?.endRefreshing()
+        }
     }
+    
     func numberOfSections(in tableView: UITableView) -> Int {
     
         return self.dataArr.count