Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
GeliBusinessPlatform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ljy
GeliBusinessPlatform
Commits
dee0737a
Commit
dee0737a
authored
Jul 30, 2020
by
刘俊宏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加物流跟踪model
parent
af37e017
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
188 additions
and
61 deletions
+188
-61
GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
...ata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/Interface/Interface_Z.plist
GeliBusinessPlatform/Interface/Interface_Z.plist
+2
-0
GeliBusinessPlatform/Model/Logistics/LogisticsModel.swift
GeliBusinessPlatform/Model/Logistics/LogisticsModel.swift
+172
-61
GeliBusinessPlatform/Model/LogisticsInterface.swift
GeliBusinessPlatform/Model/LogisticsInterface.swift
+14
-0
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
View file @
dee0737a
No preview for this file type
GeliBusinessPlatform/Interface/Interface_Z.plist
View file @
dee0737a
...
...
@@ -226,5 +226,7 @@
<string>
Logistics/addLogisticsOrder
</string>
<key>
获取已开通城市列表
</key>
<string>
Lalamove/cityList
</string>
<key>
运单跟踪
</key>
<string>
Logistics/LogisticsTracking
</string>
</dict>
</plist>
GeliBusinessPlatform/Model/Logistics/LogisticsModel.swift
View file @
dee0737a
...
...
@@ -434,3 +434,114 @@ class AddLogisticsDataModel: Mappable {
id
<-
map
[
"id"
]
}
}
//MARK: - 运单跟踪
class
LogisticsTrackingModel
:
Mappable
{
var
code
:
Int
?
var
message
:
String
?
var
data
:
LogisticsTrackingDataModel
?
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
code
<-
map
[
"code"
]
message
<-
map
[
"message"
]
data
<-
map
[
"data"
]
}
}
class
LogisticsTrackingDataModel
:
Mappable
{
var
lwb_no
:
String
?
var
lc_name
:
String
?
var
s_city_name
:
String
?
var
delivery_status
:
String
?
// 运单状态:1下单完成 2揽收成功 3运输中 4已签收 5已取消 6拒收 7再投
var
r_city_name
:
String
?
var
express_item_name
:
String
?
var
sale_plat
:
String
?
var
sign_time
:
String
?
//签收时间
var
order_sn
:
String
?
var
jd_tracking
:
Array
<
LogisticsJdTrackingModel
>
?
var
sf_tracking
:
LogisticsSFTrackingModel
?
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
lwb_no
<-
map
[
"lwb_no"
]
lc_name
<-
map
[
"lc_name"
]
s_city_name
<-
map
[
"s_city_name"
]
delivery_status
<-
map
[
"delivery_status"
]
r_city_name
<-
map
[
"r_city_name"
]
express_item_name
<-
map
[
"express_item_name"
]
sale_plat
<-
map
[
"sale_plat"
]
sign_time
<-
map
[
"sign_time"
]
order_sn
<-
map
[
"order_sn"
]
}
}
class
LogisticsJdTrackingModel
:
Mappable
{
var
opeTitle
:
String
?
//快递签收 操作简要描述
var
opeRemark
:
String
?
//货物已交付京东物流 操作详情
var
opeName
:
String
?
//京东快递 操作人姓名
var
opeTime
:
String
?
//2019-01-24 16:48:55 操作时间 ;格式yyyy-MM-dd HH:mm:ss
var
waybillCode
:
String
?
//JDVC00000186621 青龙运单号
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
opeTitle
<-
map
[
"opeTitle"
]
opeRemark
<-
map
[
"opeRemark"
]
opeName
<-
map
[
"opeName"
]
opeTime
<-
map
[
"opeTime"
]
waybillCode
<-
map
[
"waybillCode"
]
}
}
class
LogisticsSFTrackingModel
:
Mappable
{
var
code
:
Int
?
//接口状态 200 成功 其他异常
var
message
:
String
?
//货物已交付京东物流 操作详情
var
model
:
Array
<
LogisticsSFTrackingDataModel
>
?
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
code
<-
map
[
"code"
]
message
<-
map
[
"message"
]
model
<-
map
[
"model"
]
}
}
class
LogisticsSFTrackingDataModel
:
Mappable
{
var
routeId
:
String
?
//流水号
var
barScanTm
:
String
?
//巴枪扫描时间
var
outsideName
:
String
?
//网点对外名称
var
distName
:
String
?
//所在城市
var
opCode
:
String
?
//操作类型
var
owsRemark
:
String
?
//官网备注描述
var
waybillNo
:
String
?
//运单号
var
sfOrderNo
:
String
?
//SF生成系统订单号
var
erpOrder
:
String
?
//客户erpOrder订单号
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
routeId
<-
map
[
"routeId"
]
barScanTm
<-
map
[
"barScanTm"
]
outsideName
<-
map
[
"outsideName"
]
distName
<-
map
[
"distName"
]
opCode
<-
map
[
"opCode"
]
owsRemark
<-
map
[
"owsRemark"
]
waybillNo
<-
map
[
"waybillNo"
]
sfOrderNo
<-
map
[
"sfOrderNo"
]
erpOrder
<-
map
[
"erpOrder"
]
}
}
GeliBusinessPlatform/Model/LogisticsInterface.swift
View file @
dee0737a
...
...
@@ -106,3 +106,17 @@ func addLogisticsOrder(_ params:[String:Any],success:@escaping (_ res:Any)->(),f
failture
(
error
)
}
}
//MARK:-- 运单跟踪
/*
user_token 验证token
id
*/
func
LogisticsTracking
(
_
params
:[
String
:
Any
],
success
:
@escaping
(
_
res
:
Any
)
->
(),
failture
:
@escaping
(
_
error
:
Error
)
->
())
{
NetworkRequest
.
sharedInstance
.
postRequest
(
"运单跟踪"
,
params
,
{
(
rep
:
DataResponse
<
LogisticsTrackingModel
>
)
in
},
success
:
{
(
data
)
in
success
(
data
)
})
{
(
error
)
in
failture
(
error
)
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment