货拉拉model完成

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -240,5 +240,17 @@
 	<string>Lalamove/citySearch</string>
 	<key>货拉拉下单</key>
 	<string>Lalamove/submitOrder</string>
+	<key>选定地址收发货历史</key>
+	<string>Lalamove/setSearchLog</string>
+	<key>查看收发货历史</key>
+	<string>Lalamove/getSearchLogList</string>
+	<key>获取货拉拉预约时间</key>
+	<string>Lalamove/getHllTime</string>
+	<key>获取取消订单原因</key>
+	<string>Lalamove/orderCancelReason</string>
+	<key>取消货拉拉订单</key>
+	<string>Lalamove/orderCancel</string>
+	<key>查看货拉拉运单详情</key>
+	<string>Lalamove/getHllOrderDetails</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/LalamoveInterface.swift

@@ -41,3 +41,134 @@ func citySearch(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture
         failture(error)
     }
 }
+//MARK:--货拉拉下单
+//params-key
+//{收件信息多个的话r_city、r_area、r_address、r_consignee、r_mobile则取最后一个
+//  "user_token": 'SIIDsq213kl',
+//  "nonce_str": "213223211",
+//s_city    是    string    发件城市
+//s_area    是    string    发件区
+//s_address    否    string    详细地址
+//s_consignee    否    string    联系人
+//s_mobile    否    string    联系人电话
+//r_city    是    int    收件城市
+//r_area    是    string    收件区
+//r_address    否    string    详细地址
+//r_consignee    否    string    联系人
+//r_mobile    否    string    联系人电话
+//  "city_id": "1006",下单城市ID
+//  "city_info_revision": "1156",下单城市版本号
+//  "order_vehicle_id": "10",车型ID
+//  "std_tag_arr": [ing    车型附加要求， 字符串数组；格式如：”[\”带尾板\”]”;值可取“获取城市可选车型信息”接口返回值中data.vehicle_arr[0].vehicle_std_arr.name的值作为成员
+//    "带尾板",
+//  ],
+//  "spec_req_arr": [    订单额外服务， 整型数组；格式如：”[2, 3, 5]”；值可取“获取城市可选车型信息”接口返回值中data.spec_req_arr.type的值作为成员；1搬运 2小推车 3回单 4尾板 5返程 6回单拍照 7海外入仓 8代收货款；示例：2
+//    "2",
+//    "5"
+//  ],
+//  "addr_info": [    发/收货地poi数据列表。 可参考“根据关键字检索地址poi”接口返回值；array内容为地址信息数组
+//    {
+//      "lat_lon": {
+//        "lat": "31.196027516575054",
+//        "lon": "121.31625670047288"
+//      },
+//      "addr": "闵行区申贵路1500号",
+//      "name": "申贵路1500号",
+//      "city_id": "1006",
+//      "district_name": "闵行区",
+//      "house_number": "",
+//      "contact_name": "",
+//      "contact_phone_no": ""
+//    },
+//    {
+//      "lat_lon": {
+//        "lat": "31.202375193368646",
+//        "lon": "121.32264161728554"
+//      },
+//      "addr": "长宁区人民医院",
+//      "name": "人民医院",
+//      "city_id": "1006",
+//      "district_name": "长宁区",
+//      "house_number": "",
+//      "contact_name": "",
+//      "contact_phone_no": ""
+//    }
+//  ],
+//  "order_time": "1596167602",需用车时间
+//  "total_price_fen": "    订单总金额(分)；示例：1800; 值来源:”计价”接口返回值data.total_price_fen",
+//  "contact_name": "下单联系人",
+//  "contact_phone_no": "下单联系人手机",
+//  "pay_type": "支付方式(3 余额支付，8 账期额度支付)",
+//  "order_reason": "用车原因",
+//  "remark": "备注"
+//  "sale_plat": "关联平台"
+//  "remark": "关联订单号"
+//}
+func shopsAuthList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("货拉拉下单", params, { (rep:DataResponse<shopsAuthListModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:--选定地址添加收发货历史
+//params-key(user_token poi货拉拉历史记录的坐标json信息，house_number    楼层及门牌号，contact_name联系人，contact_phone_no联系人手机 ，sr_type收发货类型：1发货 2收货)
+func setSearchLog(_ 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 ，sr_type收发货类型：1发货 2收货)
+func getSearchLogList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("查看收发货历史", params, { (rep:DataResponse<getSearchLogListModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:--获取货拉拉预约时间
+//params-key(user_token  )
+func getHllTime(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("获取货拉拉预约时间", params, { (rep:DataResponse<orderCancelReasonModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:--获取取消订单原因
+//params-key(user_token  lwb_no)
+func orderCancelReason(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("获取取消订单原因", params, { (rep:DataResponse<orderCancelReasonModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:--取消货拉拉订单
+//params-key(user_token  lwb_no，reason_id    取消订单原因，reason取消原因说明)
+func orderLalamoveCancel(_ 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  lwb_no )
+func getHllOrderDetails(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("查看货拉拉运单详情", params, { (rep:DataResponse<getHllOrderDetailsModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}

GeliBusinessPlatform/Model/LalamoveInterface/LalamoveModel.swift

@@ -355,3 +355,422 @@ class citySearchDataPoiChildrenModel: Mappable {
 
     }
 }
+//MARK: - 货拉拉下单
+class shopsAuthListModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data :shopsAuthListDataModel?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class shopsAuthListDataModel: Mappable {
+    var order_display_id:String? //订单号
+ 
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        order_display_id <- map["order_display_id"]
+ 
+    }
+}
+//MARK: - 查看收发货历史
+class getSearchLogListModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data :Array<getSearchLogListDataModel>?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class getSearchLogListDataModel: Mappable {
+    var id:Int?
+    var poi : String?
+    var house_number :String?
+    var contact_name :String?
+    var contact_phone_no :String?
+    var sr_type :Int?
+    var shop_id :Int?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        id <- map["id"]
+        poi <- map["poi"]
+        house_number <- map["house_number"]
+        contact_name <- map["contact_name"]
+        contact_phone_no <- map["contact_phone_no"]
+        sr_type <- map["sr_type"]
+        shop_id <- map["shop_id"]
+ 
+    }
+}
+//MARK: - 获取货拉拉预约时间
+class getHllTimeModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data :Array<getHllTimeDataModel>?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class getHllTimeDataModel: Mappable {
+    var day0:Array<getHllTimeDayDataModel>?
+    var day1:Array<getHllTimeDayDataModel>?
+    var day2:Array<getHllTimeDayDataModel>?
+    var day3:Array<getHllTimeDayDataModel>?
+    var day4:Array<getHllTimeDayDataModel>?
+ 
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        day0 <- map["day0"]
+        day1 <- map["day1"]
+        day2 <- map["day2"]
+        day3 <- map["day3"]
+        day4 <- map["day4"]
+   
+    }
+}
+class getHllTimeDayDataModel: Mappable {
+    var date:String?
+    var date2:String?
+    var h:Array<getHllTimeDayValDataModel>?
+    var i:Array<getHllTimeDayValDataModel>?
+ 
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        date <- map["date"]
+        date2 <- map["date2"]
+        h <- map["h"]
+        i <- map["i"]
+ 
+    }
+}
+class getHllTimeDayValDataModel: Mappable {
+    var val:String?
+ 
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        val <- map["val"]
+ 
+    }
+}
+ 
+//MARK: - 获取取消订单原因
+class orderCancelReasonModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data :Array<orderCancelReasonDataModel>?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class orderCancelReasonDataModel: Mappable {
+    var id:Int?
+    var category:String? //分类名称；示例：自己原因
+    var sub_cat:Array<orderCancelReasonSubCatDataModel>?
+  
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        id <- map["id"]
+        category <- map["category"]
+        sub_cat <- map["sub_cat"]
+ 
+   
+    }
+}
+class orderCancelReasonSubCatDataModel: Mappable {
+    var sub_id:Int?
+    var sub_name:String? //子分类原因名称；示例：计划有变，暂时不需要用车
+    var ep_model:Int?
+ 
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        sub_id <- map["sub_id"]
+        sub_name <- map["sub_name"]
+        ep_model <- map["ep_model"]
+ 
+   
+    }
+}
+//MARK: - 查看货拉拉运单详情
+class getHllOrderDetailsModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data :getHllOrderDetailsDataModel?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class getHllOrderDetailsDataModel: Mappable {
+
+    var order_detail_item :getHllOrderDetailsOrderDetailItemDataModel?//订单明细信息
+    var driver_info :getHllOrderDetailsdriverInfoDataModel?//接单司机信息
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        order_detail_item <- map["order_detail_item"]
+        driver_info <- map["driver_info"]
+     }
+}
+class getHllOrderDetailsdriverInfoDataModel: Mappable {
+    var name : String?
+    var phone_no : String?
+    var license_plate : String?
+    var lat_lon : citySearchDataPoiLocationModel?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        name <- map["name"]
+        phone_no <- map["phone_no"]
+        license_plate <- map["license_plate"]
+        lat_lon <- map["lat_lon"]
+    }
+}
+class getHllOrderDetailsOrderDetailItemDataModel: Mappable {//订单明细信息
+    var order_item : orderDetailItemDataModel?
+    var spec_req_price_arr : Array<specReqPriceArrDataModel>?
+    var bill_price_arr : Array<billPricearrDataModel>?
+ 
+    var contact_name : String? //下单联系人 示例：罗瑞
+    var contact_phone_no : String? //下单联系人手机
+    var total_distance : Int? //总里数(KM)
+    var exceed_distance : Int?//超里数(KM)
+    var driver_id : Int?//接单司机ID
+    var vehicle_std_price_arr : Array<Any>?//车型附加要求项及费用信息
+    var progress_str : String?//
+//    订单跟踪信息， 示例：订单已提交|2019-12-25 12:47,司机已接单|2019-12-25 12:48,货物已装车|2019-12-25 12:48,订单已完成|2019-12-25 12:48,账单已发送|2019-12-25 12:53
+    var complete_time : String?//订单完成时间 示例：2019-12-25 12:48:35
+    var vehicle_id : Int?//下单车型ID
+    var pickup_ts : String?//司机接单时间戳
+    var loaded_ts : String?//司机装货时间戳
+    var driver_amount_fen : Int?
+    var amount_fen : Int?
+    var brokerage_fen : Int?//平台信息费
+    var goods_type_id : Int?
+    var person_insurance_fen : Int?//保险费用
+    var virtual_bind_status : Int?//虚拟号绑定状态
+    var use_virtual_phone : Int?
+    var last_bind_phone_no : Int?
+    var virtual_phone_info : Array<Any>?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        order_item <- map["order_item"]
+        spec_req_price_arr <- map["spec_req_price_arr"]
+        bill_price_arr <- map["bill_price_arr"]
+        contact_name <- map["contact_name"]
+        contact_phone_no <- map["contact_phone_no"]
+        total_distance <- map["total_distance"]
+        exceed_distance <- map["exceed_distance"]
+        driver_id <- map["driver_id"]
+        vehicle_std_price_arr <- map["vehicle_std_price_arr"]
+        progress_str <- map["progress_str"]
+        complete_time <- map["complete_time"]
+        vehicle_id <- map["vehicle_id"]
+        pickup_ts <- map["pickup_ts"]
+        loaded_ts <- map["loaded_ts"]
+        driver_amount_fen <- map["driver_amount_fen"]
+        amount_fen <- map["amount_fen"]
+        brokerage_fen <- map["brokerage_fen"]
+        goods_type_id <- map["goods_type_id"]
+        person_insurance_fen <- map["person_insurance_fen"]
+        virtual_bind_status <- map["virtual_bind_status"]
+        use_virtual_phone <- map["use_virtual_phone"]
+        last_bind_phone_no <- map["last_bind_phone_no"]
+        virtual_phone_info <- map["virtual_phone_info"]
+     }
+}
+class specReqPriceArrDataModel: Mappable { //订单额外服务项及费用信息
+    var type : Int?//
+    var name : String?//例：拍照回单
+    var price_fen : Int?//费用
+    var price_type : Int?//费用
+    var price_value_fen : Int?
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        type <- map["type"]
+        name <- map["name"]
+        price_fen <- map["price_fen"]
+        price_type <- map["price_type"]
+        price_value_fen <- map["price_value_fen"]
+    }
+}
+class billPricearrDataModel: Mappable { //司机添加的额外费用信息
+    
+    var bill_type : Int?//费用类型ID,1过桥费，2停车费，3搬运费，5逾时等候费
+    var name : String?//费用类型名称 示例：高速路桥费
+    var price_fen : Int?//费用金额(分) 示例：0
+    var img_url : String?//票据凭证图片链接 示例：
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        bill_type <- map["bill_type"]
+        name <- map["name"]
+        price_fen <- map["price_fen"]
+        img_url <- map["img_url"]
+    }
+}
+
+class orderDetailItemDataModel: Mappable { //订单信息
+    var order_display_id : String?//货拉拉订单号(对外)
+    var order_id : Int?//货拉拉订单号(对内
+    var order_uuid : String?//
+    var order_status : Int?//订单当前状态
+    var pay_status : Int?//订单总支付状态1已支付，0未支付
+    var order_vehicle_id : Int?//订单车型ID
+    var vehicle_type_name : String?//订单车型名称， 示例：小型厢货
+    var order_time : String?//需用车时间 示例：2019-12-25 12:57:04
+    var create_time : String?// 订单创建时间， 示例：2019-12-25 12:47:14
+    var order_reason : String?//员工用车原因
+    var remark : String?//订单备注
+    var price_fen : Int?//订单总价格
+    var user_id : Int?//下单用户ID
+    var city_id : Int?//下单城市ID
+    var ep_id : Int?//下单用户企业账号ID
+    var driver_id : Int?//接单司机ID
+    var send_bill_time : String?//司机账单发送时间， 示例：2019-12-25 12:53:40
+    var send_bill_price_fen : Int?//司机账单发送金额(分)
+    var update_bill_time : String?//账单更新时间 示例:2019-12-25 12:53:40
+    var is_complain_order : Int?//用户是否申诉账单
+    var complain_bill_time : String?//账单申诉时间， 示例:2019-12-25 12:53:40
+    var abnormal_bill_time : String?//账单异常完成时间， 示例:2019-12-25 12:53:40
+    var pay_type : Int?//支付方式(3企业账户余额支付,8账期支付)
+    var order_type : Int?//订单类型
+ 
+    var addr_info_arr : Array<orderDetailItemAddrInfoArrDataModel>?//订单地址信息
+    var order_price_arr : Array<orderDetailItemOrderPriceArrDataModel>?//订单计价明细数组
+
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        order_display_id <- map["order_display_id"]
+        order_id <- map["order_id"]
+        order_uuid <- map["order_uuid"]
+        order_status <- map["order_status"]
+        pay_status <- map["pay_status"]
+        order_vehicle_id <- map["order_vehicle_id"]
+        vehicle_type_name <- map["vehicle_type_name"]
+        order_time <- map["order_time"]
+        create_time <- map["create_time"]
+        order_reason <- map["order_reason"]
+        remark <- map["remark"]
+        price_fen <- map["price_fen"]
+        user_id <- map["user_id"]
+        city_id <- map["city_id"]
+        ep_id <- map["ep_id"]
+        driver_id <- map["driver_id"]
+        send_bill_time <- map["send_bill_time"]
+        send_bill_price_fen <- map["send_bill_price_fen"]
+        update_bill_time <- map["update_bill_time"]
+        is_complain_order <- map["is_complain_order"]
+        complain_bill_time <- map["complain_bill_time"]
+        abnormal_bill_time <- map["abnormal_bill_time"]
+        pay_type <- map["pay_type"]
+        order_type <- map["order_type"]
+        addr_info_arr <- map["addr_info_arr"]
+        order_price_arr <- map["order_price_arr"]
+
+    }
+}
+
+
+class orderDetailItemAddrInfoArrDataModel: Mappable { //订单地址信息
+    var name : String?//地址名称 示例：卓悦汇购物中心
+    var addr : String?//地址详情 示例：深圳市-福田区-中康路126号
+    var city_id : Int?//地址所属城市ID
+    var district_name : String?//地址所属区(县) 示例：福田区
+    var house_number : String?// 楼层及门牌号 示例：4楼403
+    var contact_name : String?//地址联系人 示例：roly
+    var contact_phone_no : String?//地址联系人手机 示例：18825162021
+    var lat_lon_item : citySearchDataPoiLocationModel?//经纬度(wgs84坐标系)
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        name <- map["name"]
+        addr <- map["addr"]
+        city_id <- map["city_id"]
+        district_name <- map["district_name"]
+        house_number <- map["house_number"]
+        contact_name <- map["contact_name"]
+        contact_phone_no <- map["contact_phone_no"]
+        lat_lon_item <- map["lat_lon_item"]
+
+    }
+}
+
+class orderDetailItemOrderPriceArrDataModel: Mappable { //订单计价明细数组
+    
+    var type : Int?//
+//    计价类型 1-起步价,2-超里程价,3-拉拉券扣减,4-额外需求产生的费用,5-小费,6-规格,7-平台订单补贴,8-司机添加的额外费用,15-货物保险费用,21-高速费,22-停车费,23-搬运费,24-其他,25-逾时等候费
+    var price_fen : Int?//费用金额(分) 示例：0
+    var pay_status : Int?//支付状态 1已支付, 0未支付
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        type <- map["bill_type"]
+        price_fen <- map["price_fen"]
+        pay_status <- map["pay_status"]
+    }
+}

GeliBusinessPlatform/Model/UpDataModel.swift

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