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
864b04cd
Commit
864b04cd
authored
Jul 04, 2020
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.5 上架版本
parent
792c1697
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
548 additions
and
21 deletions
+548
-21
GeliBusinessPlatform.xcodeproj/project.pbxproj
GeliBusinessPlatform.xcodeproj/project.pbxproj
+16
-0
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/Define/Define.swift
GeliBusinessPlatform/Define/Define.swift
+4
-4
GeliBusinessPlatform/Interface/Interface_Z.plist
GeliBusinessPlatform/Interface/Interface_Z.plist
+10
-0
GeliBusinessPlatform/Model/Logistics/LogisticsModel.swift
GeliBusinessPlatform/Model/Logistics/LogisticsModel.swift
+410
-0
GeliBusinessPlatform/Model/LogisticsInterface.swift
GeliBusinessPlatform/Model/LogisticsInterface.swift
+83
-0
GeliBusinessPlatform/Model/pinPai/brandListModel.swift
GeliBusinessPlatform/Model/pinPai/brandListModel.swift
+6
-6
GeliBusinessPlatform/ViewController/应付账款/YingFuZhangKuanXQCell.swift
...sPlatform/ViewController/应付账款/YingFuZhangKuanXQCell.swift
+2
-2
GeliBusinessPlatform/ViewController/应付账款/YingFuZhangKuanXQViewController.swift
...ViewController/应付账款/YingFuZhangKuanXQViewController.swift
+17
-9
No files found.
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @
864b04cd
...
...
@@ -316,6 +316,8 @@
E0DDCB1E244AE81800DF54C7
/* GuanLianKeHuCell.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0DDCB1C244AE81800DF54C7
/* GuanLianKeHuCell.xib */
;
};
E0E341EA246E95EE0060AC20
/* PingLunCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0E341E8246E95EE0060AC20
/* PingLunCell.swift */
;
};
E0E341EB246E95EE0060AC20
/* PingLunCell.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0E341E9246E95EE0060AC20
/* PingLunCell.xib */
;
};
E0E4456924B00F7B00EF788E
/* LogisticsModel.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0E4456824B00F7B00EF788E
/* LogisticsModel.swift */
;
};
E0E4456B24B0221500EF788E
/* LogisticsInterface.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0E4456A24B0221500EF788E
/* LogisticsInterface.swift */
;
};
E0E8ABFD246E359700E3BB54
/* GuiGeModel.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0E8ABFC246E359700E3BB54
/* GuiGeModel.swift */
;
};
E0EABAE72487748500F6CA8D
/* NewSelectWarehouseVC.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0EABAE52487748500F6CA8D
/* NewSelectWarehouseVC.swift */
;
};
E0EABAE82487748500F6CA8D
/* NewSelectWarehouseVC.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0EABAE62487748500F6CA8D
/* NewSelectWarehouseVC.xib */
;
};
...
...
@@ -879,6 +881,8 @@
E0DDCB1C244AE81800DF54C7
/* GuanLianKeHuCell.xib */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
path
=
GuanLianKeHuCell.xib
;
sourceTree
=
"<group>"
;
};
E0E341E8246E95EE0060AC20
/* PingLunCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
PingLunCell.swift
;
sourceTree
=
"<group>"
;
};
E0E341E9246E95EE0060AC20
/* PingLunCell.xib */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
path
=
PingLunCell.xib
;
sourceTree
=
"<group>"
;
};
E0E4456824B00F7B00EF788E
/* LogisticsModel.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
LogisticsModel.swift
;
sourceTree
=
"<group>"
;
};
E0E4456A24B0221500EF788E
/* LogisticsInterface.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
LogisticsInterface.swift
;
sourceTree
=
"<group>"
;
};
E0E8ABFC246E359700E3BB54
/* GuiGeModel.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
GuiGeModel.swift
;
sourceTree
=
"<group>"
;
};
E0EABAE52487748500F6CA8D
/* NewSelectWarehouseVC.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
NewSelectWarehouseVC.swift
;
sourceTree
=
"<group>"
;
};
E0EABAE62487748500F6CA8D
/* NewSelectWarehouseVC.xib */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
path
=
NewSelectWarehouseVC.xib
;
sourceTree
=
"<group>"
;
};
...
...
@@ -1723,6 +1727,7 @@
E09B03A92445B09200211A51
/* Model */
=
{
isa
=
PBXGroup
;
children
=
(
E0E4456724B00F6400EF788E
/* Logistics */
,
E019E97F24A975710086C565
/* pinPai */
,
E05FAD282498A5E800D8C90D
/* yfzkModel */
,
F924B38E24971BB600A913CD
/* CustomerModel */
,
...
...
@@ -1737,6 +1742,7 @@
F956D5BD246A3629003FF510
/* PersonCenterModel */
,
F956D5BC246A35DB003FF510
/* GoodsManageMoel */
,
F9171EFB245128B200359C2B
/* Interface.swift */
,
E0E4456A24B0221500EF788E
/* LogisticsInterface.swift */
,
E019E98224A9763A0086C565
/* BrandListInterface.swift */
,
E05FAD262498A5E500D8C90D
/* accountsPayableInterface.swift */
,
E007B1DA248F8F57004D14CC
/* PurchaseInterface.swift */
,
...
...
@@ -2080,6 +2086,14 @@
path
=
"预售价格修改"
;
sourceTree
=
"<group>"
;
};
E0E4456724B00F6400EF788E
/* Logistics */
=
{
isa
=
PBXGroup
;
children
=
(
E0E4456824B00F7B00EF788E
/* LogisticsModel.swift */
,
);
path
=
Logistics
;
sourceTree
=
"<group>"
;
};
E0EFB9C324930BEE005FB0CD
/* 采购单列表 */
=
{
isa
=
PBXGroup
;
children
=
(
...
...
@@ -3177,9 +3191,11 @@
E07B1E5E24591AA50055BA3C
/* KeHuXQViewController.swift in Sources */
,
F9DDBE962457D3EC00A32CB2
/* WebViewController.swift in Sources */
,
F956D5AA246A2D9C003FF510
/* LMNBulletsLine.m in Sources */
,
E0E4456B24B0221500EF788E
/* LogisticsInterface.swift in Sources */
,
E06524F924581A7900CA22E2
/* ChuKuCell.swift in Sources */
,
E00ACBEB2490D6C800128052
/* YDLBVc.swift in Sources */
,
F9A0E1DD246D198B00D7F26F
/* CusListAllModel.swift in Sources */
,
E0E4456924B00F7B00EF788E
/* LogisticsModel.swift in Sources */
,
F9956B2524640D34001A617D
/* GoodsClassModel.swift in Sources */
,
F961D26B24500FF6007FBE70
/* HeaderSelectView.swift in Sources */
,
F9697244248F70C00010D39B
/* VendorInterface.swift in Sources */
,
...
...
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
864b04cd
No preview for this file type
GeliBusinessPlatform/Define/Define.swift
View file @
864b04cd
...
...
@@ -27,10 +27,10 @@ let systemVersion = (UIDevice.current.systemVersion as String)
//接口地址
//test
let
SERVERCE_ImageHost
=
"https://z.gelifood.com/"
let
SERVERCE_HOST
=
"https://z.gelifood.com/admin/"
//
let SERVERCE_ImageHost = "https://zx.gelifood.com/"
//
let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
//
let SERVERCE_ImageHost = "https://z.gelifood.com/"
//
let SERVERCE_HOST = "https://z.gelifood.com/admin/"
let
SERVERCE_ImageHost
=
"https://zx.gelifood.com/"
let
SERVERCE_HOST
=
"https://zx.gelifood.com/admin/"
//online
//视图常量
...
...
GeliBusinessPlatform/Interface/Interface_Z.plist
View file @
864b04cd
...
...
@@ -192,5 +192,15 @@
<string>
brand/brandList
</string>
<key>
新增品牌
</key>
<string>
Brand/brandAdd
</string>
<key>
运单列表
</key>
<string>
Logistics/jdOrderList
</string>
<key>
获取所有物流公司
</key>
<string>
Logistics/lcAll
</string>
<key>
下单期望上门时间
</key>
<string>
Logistics/appointmentTime
</string>
<key>
物流费用预估
</key>
<string>
register
</string>
<key>
运单详情
</key>
<string>
Logistics/logisticsOrderDetails
</string>
</dict>
</plist>
GeliBusinessPlatform/Model/Logistics/LogisticsModel.swift
0 → 100644
View file @
864b04cd
//
// LogisticsModel.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/7/4.
// Copyright © 2020 junye lu. All rights reserved.
//
import
Foundation
import
ObjectMapper
//MARK: - 运单列表
class
LogisticsModel
:
Mappable
{
var
code
:
Int
?
var
message
:
String
?
var
data
:
Array
<
LogisticsDataModel
>
?
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
code
<-
map
[
"code"
]
message
<-
map
[
"message"
]
data
<-
map
[
"data"
]
}
}
class
LogisticsDataModel
:
Mappable
{
var
id
:
Int
?
var
lwb_no
:
String
?
//运单号
var
delivery_status
:
String
?
//运单状态:1下单完成 2揽收成功 3运输中 4已签收 5已取消 6拒收 7再投
var
express_item_name
:
String
?
//托寄物名称
var
sale_plat
:
String
?
//所属平台
var
order_sn
:
String
?
//关联订单号
var
sign_time
:
Double
?
//签收时间
var
s_city_name
:
String
?
//寄件人城市名称
var
r_city_name
:
String
?
//收件人城市名称
var
lc_name
:
String
?
//物流公司
var
delivery_status_cn
:
String
?
//运单状态(中文)
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
id
<-
map
[
"id"
]
lwb_no
<-
map
[
"lwb_no"
]
delivery_status
<-
map
[
"delivery_status"
]
express_item_name
<-
map
[
"express_item_name"
]
sale_plat
<-
map
[
"sale_plat"
]
order_sn
<-
map
[
"order_sn"
]
sign_time
<-
map
[
"sign_time"
]
s_city_name
<-
map
[
"s_city_name"
]
r_city_name
<-
map
[
"r_city_name"
]
lc_name
<-
map
[
"lc_name"
]
delivery_status_cn
<-
map
[
"delivery_status_cn"
]
}
}
//MARK: - 获取所有物流公司
class
lcAllModel
:
Mappable
{
var
code
:
Int
?
var
message
:
String
?
var
data
:
Array
<
lcAllDataModel
>
?
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
code
<-
map
[
"code"
]
message
<-
map
[
"message"
]
data
<-
map
[
"data"
]
}
}
class
lcAllDataModel
:
Mappable
{
var
lc_id
:
Int
?
//物流公司id
var
lc_name
:
String
?
//物流公司名
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
lc_id
<-
map
[
"lc_id"
]
lc_name
<-
map
[
"lc_name"
]
}
}
//MARK: - 下单 - 期望上门时间
class
appointmentTimeModel
:
Mappable
{
var
code
:
Int
?
var
message
:
String
?
var
data
:
appointmentTimeDataModel
?
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
code
<-
map
[
"code"
]
message
<-
map
[
"message"
]
data
<-
map
[
"data"
]
}
}
class
appointmentTimeDataModel
:
Mappable
{
var
today
:
Dictionary
<
String
,
String
>
?
var
tomorrow
:
Dictionary
<
String
,
String
>
?
var
taftert
:
Dictionary
<
String
,
String
>
?
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
today
<-
map
[
"today"
]
tomorrow
<-
map
[
"tomorrow"
]
taftert
<-
map
[
"taftert"
]
}
}
//MARK: - 物流费用预估
class
registerModel
:
Mappable
{
var
code
:
Int
?
var
message
:
String
?
var
data
:
registerDataModel
?
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
code
<-
map
[
"code"
]
message
<-
map
[
"message"
]
data
<-
map
[
"data"
]
}
}
class
registerDataModel
:
Mappable
{
var
price_jd
:
Int
?
var
price_sf
:
String
?
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
price_jd
<-
map
[
"price_jd"
]
price_sf
<-
map
[
"price_sf"
]
}
}
//MARK: - 运单详情
class
addLogisticsOrderModel
:
Mappable
{
var
code
:
Int
?
var
message
:
String
?
var
data
:
addLogisticsOrderDataModel
?
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
code
<-
map
[
"code"
]
message
<-
map
[
"message"
]
data
<-
map
[
"data"
]
}
}
class
addLogisticsOrderDataModel
:
Mappable
{
var
id
:
Int
?
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
id
<-
map
[
"id"
]
}
}
//MARK: - 运单详情
class
logisticsOrderDetailsModel
:
Mappable
{
var
code
:
Int
?
var
message
:
String
?
var
data
:
logisticsOrderDetailsDataModel
?
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
code
<-
map
[
"code"
]
message
<-
map
[
"message"
]
data
<-
map
[
"data"
]
}
}
class
logisticsOrderDetailsDataModel
:
Mappable
{
var
id
:
Int
?
//运单id
var
user_id
:
Int
?
var
wb_no
:
String
?
var
lwb_no
:
String
?
//运单编号
var
sf_order_no
:
String
?
//顺丰专用订单号
var
order_id
:
Int
?
//关联的格利订单id
var
order_sn
:
String
?
//关联的格利订单sn
var
sale_plat
:
String
?
//关联销售平台(如:格利食品网)
var
delivery_type
:
Int
?
//产品类型;1:零担 2:整车 3:特惠送 4:特快送 5:特惠运 6:特准运 7航空代理 8航空直客9 铁路直客 10 特惠整车11特惠拼车12同城直配13:冷链卡班 14冷链专车15:冷链成配 16:送货到仓 17医药零担 18医药整车 25 特快重货
var
tempture_num
:
String
?
//温藏
var
home_delivery_on
:
Int
?
//上门提货,1是0非
var
sr_id
:
Int
?
//物流公司id
var
express_item_name
:
String
?
//寄托物
var
weight
:
CGFloat
?
//重量
var
volume
:
CGFloat
?
//体积
var
volume_long
:
CGFloat
?
var
volume_width
:
CGFloat
?
var
volume_height
:
CGFloat
?
var
express_item_qty
:
Int
?
//寄托物总件数
var
quarantine_cert
:
Int
?
//有无动物检疫证 0-无效,1-有,2-无;非冷链不需传值
var
freight_pre
:
CGFloat
?
//预估运费
var
freight
:
CGFloat
?
//真实运费
var
pickup_begin_time
:
Double
?
var
pickup_end_time
:
Double
?
var
fc_flag
:
Int
?
//运费结算方式; 0:月结 1:到付 2:现付
var
guarantee_value
:
CGFloat
?
//保价金额(保留小数点后两位)
var
guarantee_fee
:
CGFloat
?
//保费
var
remark
:
String
?
//特殊说明/备注
var
delivery_into_ws
:
Int
?
//是否送货入仓:1是 0否
var
qingzhen_on
:
Int
?
//是否清真:1是 0否
var
yiwuran_on
:
Int
?
//是否易污染:1是 0否
var
create_time
:
Double
?
var
delivery_status
:
Int
?
//运单状态:1下单完成 2揽收成功 3运输中 4已签收 5已取消 6拒收 7再投
var
pay_status
:
Int
?
//运单运费支付状态:1待支付 2已支付 3已退款
var
pay_type
:
Int
?
//支付类型:暂无
var
shop_id
:
Int
?
var
r_user_id
:
Int
?
var
sign_time
:
Double
?
//签收时间
var
lc_id
:
Int
?
var
site_delivery
:
CGFloat
?
//站点派送 0-无效,1-是京东派送,2-非京东派送;非冷链不需传值
var
ope_title
:
String
?
var
ope_time
:
String
?
var
ope_remark
:
String
?
var
is_delete
:
Int
?
var
cus_id
:
Int
?
var
receipt_flag
:
Int
?
var
producer
:
String
?
//制单人
var
r_consignee
:
String
?
//收件人名称
var
r_country
:
Int
?
var
r_province
:
Int
?
var
r_city
:
Int
?
var
r_district
:
Int
?
var
r_street
:
Int
?
var
r_address
:
String
?
//收件人详细地址
var
r_zipcode
:
String
?
var
r_tel
:
String
?
var
r_mobile
:
String
?
//收件人手机号码
var
s_consignee
:
String
?
//发件人名称
var
s_country
:
Int
?
var
s_province
:
Int
?
var
s_city
:
Int
?
var
s_district
:
Int
?
var
s_street
:
Int
?
var
s_address
:
String
?
var
s_zipcode
:
String
?
var
s_tel
:
String
?
var
s_mobile
:
String
?
//发件人手机号码
var
r_province_name
:
String
?
//收件人省
var
r_city_name
:
String
?
//收件人市
var
r_district_name
:
String
?
//收件人区
var
r_street_name
:
String
?
var
s_province_name
:
String
?
//发件人省
var
s_city_name
:
String
?
//发件人市
var
s_district_name
:
String
?
//发件人区
var
s_street_name
:
String
?
var
lc_create_time
:
Double
?
var
delivery_status_cn
:
String
?
//订单状态-中文
var
pay_status_cn
:
String
?
//支付状态-中文
var
home_delivery_on_cn
:
String
?
//寄件方式-中文
var
site_delivery_cn
:
String
?
//派件方式-中文
var
fc_flag_cn
:
String
?
//运费结算方式-中文
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
id
<-
map
[
"id"
]
user_id
<-
map
[
"user_id"
]
wb_no
<-
map
[
"wb_no"
]
lwb_no
<-
map
[
"lwb_no"
]
sf_order_no
<-
map
[
"sf_order_no"
]
order_id
<-
map
[
"order_id"
]
order_sn
<-
map
[
"order_sn"
]
sale_plat
<-
map
[
"sale_plat"
]
delivery_type
<-
map
[
"delivery_type"
]
tempture_num
<-
map
[
"tempture_num"
]
home_delivery_on
<-
map
[
"home_delivery_on"
]
sr_id
<-
map
[
"sr_id"
]
express_item_name
<-
map
[
"express_item_name"
]
weight
<-
map
[
"weight"
]
volume
<-
map
[
"volume"
]
volume_long
<-
map
[
"volume_long"
]
volume_width
<-
map
[
"volume_width"
]
volume_height
<-
map
[
"volume_height"
]
express_item_qty
<-
map
[
"express_item_qty"
]
quarantine_cert
<-
map
[
"quarantine_cert"
]
freight_pre
<-
map
[
"freight_pre"
]
freight
<-
map
[
"freight"
]
pickup_begin_time
<-
map
[
"pickup_begin_time"
]
pickup_end_time
<-
map
[
"pickup_end_time"
]
fc_flag
<-
map
[
"fc_flag"
]
guarantee_value
<-
map
[
"guarantee_value"
]
guarantee_fee
<-
map
[
"guarantee_fee"
]
remark
<-
map
[
"remark"
]
delivery_into_ws
<-
map
[
"delivery_into_ws"
]
qingzhen_on
<-
map
[
"qingzhen_on"
]
yiwuran_on
<-
map
[
"yiwuran_on"
]
create_time
<-
map
[
"create_time"
]
delivery_status
<-
map
[
"delivery_status"
]
pay_status
<-
map
[
"pay_status"
]
pay_type
<-
map
[
"pay_type"
]
shop_id
<-
map
[
"shop_id"
]
r_user_id
<-
map
[
"r_user_id"
]
sign_time
<-
map
[
"sign_time"
]
lc_id
<-
map
[
"lc_id"
]
site_delivery
<-
map
[
"site_delivery"
]
ope_title
<-
map
[
"ope_title"
]
ope_time
<-
map
[
"ope_time"
]
ope_remark
<-
map
[
"ope_remark"
]
is_delete
<-
map
[
"is_delete"
]
cus_id
<-
map
[
"cus_id"
]
receipt_flag
<-
map
[
"receipt_flag"
]
producer
<-
map
[
"producer"
]
r_consignee
<-
map
[
"r_consignee"
]
r_country
<-
map
[
"r_country"
]
r_province
<-
map
[
"r_province"
]
r_city
<-
map
[
"r_city"
]
r_district
<-
map
[
"r_district"
]
r_street
<-
map
[
"r_street"
]
r_address
<-
map
[
"r_address"
]
r_zipcode
<-
map
[
"r_zipcode"
]
r_tel
<-
map
[
"r_tel"
]
r_mobile
<-
map
[
"r_mobilev"
]
s_consignee
<-
map
[
"s_consignee"
]
s_country
<-
map
[
"s_country"
]
s_province
<-
map
[
"s_province"
]
s_city
<-
map
[
"s_city"
]
s_district
<-
map
[
"s_district"
]
s_street
<-
map
[
"s_street"
]
s_address
<-
map
[
"s_address"
]
s_zipcode
<-
map
[
"s_zipcode"
]
s_tel
<-
map
[
"s_tel"
]
s_mobile
<-
map
[
"s_mobile"
]
r_province_name
<-
map
[
"r_province_name"
]
r_city_name
<-
map
[
"r_city_name"
]
r_district_name
<-
map
[
"r_district_name"
]
r_street_name
<-
map
[
"r_street_name"
]
s_province_name
<-
map
[
"s_province_name"
]
s_city_name
<-
map
[
"s_city_name"
]
s_district_name
<-
map
[
"s_district_name"
]
s_street_name
<-
map
[
"s_street_name"
]
lc_create_time
<-
map
[
"lc_create_time"
]
delivery_status_cn
<-
map
[
"delivery_status_cn"
]
pay_status_cn
<-
map
[
"pay_status_cn"
]
home_delivery_on_cn
<-
map
[
"home_delivery_on_cn"
]
site_delivery_cn
<-
map
[
"site_delivery_cn"
]
fc_flag_cn
<-
map
[
"fc_flag_cn"
]
}
}
GeliBusinessPlatform/Model/LogisticsInterface.swift
0 → 100644
View file @
864b04cd
//
// LogisticsInterface.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/7/4.
// Copyright © 2020 junye lu. All rights reserved.
//
import
Foundation
import
Alamofire
import
SwiftyJSON
import
ObjectMapper
//MARK:--运单列表
/*
user_token 验证token
keyword 搜索关键词
start_time 开始时间
end_time 结束时间
lc_id 物流公司id
order_sn 关联订单号(也是食品网订单号)
sale_plat 所属平台
pay_status 运单运费支付状态:1待支付 2已支付 3已退款
delivery_status 运单状态:1下单完成 2揽收成功 3运输中 4已签收 5已取消 6拒收 7再投
*/
func
jdOrderList
(
_
params
:[
String
:
Any
],
success
:
@escaping
(
_
res
:
Any
)
->
(),
failture
:
@escaping
(
_
error
:
Error
)
->
())
{
NetworkRequest
.
sharedInstance
.
postRequest
(
"运单列表"
,
params
,
{
(
rep
:
DataResponse
<
LogisticsModel
>
)
in
},
success
:
{
(
data
)
in
success
(
data
)
})
{
(
error
)
in
failture
(
error
)
}
}
//MARK:--获取所有物流公司
/*
user_token 验证token
*/
func
lcAll
(
_
params
:[
String
:
Any
],
success
:
@escaping
(
_
res
:
Any
)
->
(),
failture
:
@escaping
(
_
error
:
Error
)
->
())
{
NetworkRequest
.
sharedInstance
.
postRequest
(
"获取所有物流公司"
,
params
,
{
(
rep
:
DataResponse
<
lcAllModel
>
)
in
},
success
:
{
(
data
)
in
success
(
data
)
})
{
(
error
)
in
failture
(
error
)
}
}
//MARK:-- 下单期望上门时间
/*
user_token 验证token
*/
func
appointmentTime
(
_
params
:[
String
:
Any
],
success
:
@escaping
(
_
res
:
Any
)
->
(),
failture
:
@escaping
(
_
error
:
Error
)
->
())
{
NetworkRequest
.
sharedInstance
.
postRequest
(
"下单期望上门时间"
,
params
,
{
(
rep
:
DataResponse
<
appointmentTimeModel
>
)
in
},
success
:
{
(
data
)
in
success
(
data
)
})
{
(
error
)
in
failture
(
error
)
}
}
//MARK:-- 物流费用预估
/*
user_token 验证token
*/
func
register
(
_
params
:[
String
:
Any
],
success
:
@escaping
(
_
res
:
Any
)
->
(),
failture
:
@escaping
(
_
error
:
Error
)
->
())
{
NetworkRequest
.
sharedInstance
.
postRequest
(
"物流费用预估"
,
params
,
{
(
rep
:
DataResponse
<
registerModel
>
)
in
},
success
:
{
(
data
)
in
success
(
data
)
})
{
(
error
)
in
failture
(
error
)
}
}
//MARK:-- 运单详情
/*
user_token 验证token
*/
func
logisticsOrderDetails
(
_
params
:[
String
:
Any
],
success
:
@escaping
(
_
res
:
Any
)
->
(),
failture
:
@escaping
(
_
error
:
Error
)
->
())
{
NetworkRequest
.
sharedInstance
.
postRequest
(
"运单详情"
,
params
,
{
(
rep
:
DataResponse
<
logisticsOrderDetailsModel
>
)
in
},
success
:
{
(
data
)
in
success
(
data
)
})
{
(
error
)
in
failture
(
error
)
}
}
GeliBusinessPlatform/Model/pinPai/brandListModel.swift
View file @
864b04cd
...
...
@@ -24,13 +24,13 @@ class brandListModel: Mappable {
}
}
class
brandListDataModel
:
Mappable
{
var
brand_id
:
Int
?
var
brand_name
:
String
?
var
brand_logo
:
String
?
var
brand_id
:
Int
?
//品牌id
var
brand_name
:
String
?
//品牌名
var
brand_logo
:
String
?
//品牌图标
var
brand_desc
:
String
?
var
site_url
:
String
?
var
sort_order
:
Int
?
var
brand_desc
:
String
?
//品牌描述
var
site_url
:
String
?
//站点地址
var
sort_order
:
Int
?
//排序
var
is_show
:
Int
?
var
brand_img
:
String
?
...
...
GeliBusinessPlatform/ViewController/应付账款/YingFuZhangKuanXQCell.swift
View file @
864b04cd
...
...
@@ -50,7 +50,7 @@ class YingFuZhangKuanXQCell: UITableViewCell {
date2Lbl
.
isHidden
=
true
if
data
?
.
pay_time
!=
0
&&
data
?
.
pay_time
!=
nil
{
date2Lbl
.
text
=
"收款时间:"
+
dayAndTimeByDouble
(
sender
:
(
data
?
.
pay_time
)
!
)
date2Lbl
.
isHidden
=
false
//
date2Lbl.isHidden = false
}
priceLbl3
.
text
=
data
?
.
arrears_money
!
...
...
@@ -86,7 +86,7 @@ class YingFuZhangKuanXQCell: UITableViewCell {
date2Lbl
.
isHidden
=
true
if
model
?
.
pay_time
!=
0
&&
model
?
.
pay_time
!=
nil
{
date2Lbl
.
text
=
"付款时间:"
+
dayAndTimeByDouble
(
sender
:
(
model
?
.
pay_time
!
)
!
)
date2Lbl
.
isHidden
=
false
//
date2Lbl.isHidden = false
}
// if model?.type == 1 {//应付
priceLbl1
.
text
=
model
?
.
money
...
...
GeliBusinessPlatform/ViewController/应付账款/YingFuZhangKuanXQViewController.swift
View file @
864b04cd
...
...
@@ -120,9 +120,9 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
@IBOutlet
weak
var
listView
:
UITableView
!
@IBOutlet
weak
var
searchBGView
:
UIView
!
var
first
=
""
var
second
=
""
var
third
=
""
var
first
=
"
0
"
var
second
=
"
0
"
var
third
=
"
0
"
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
...
...
@@ -199,6 +199,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
make
.
height
.
equalTo
(
18.5
)
make
.
width
.
equalTo
(
title2
.
bounds
.
size
.
width
)
}
let
ti11
=
UILabel
()
ti11
.
text
=
"¥
\(
second
)
"
ti11
.
font
=
UIFont
.
boldSystemFont
(
ofSize
:
13
)
...
...
@@ -226,6 +227,7 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
make
.
height
.
equalTo
(
18.5
)
make
.
width
.
equalTo
(
title3
.
bounds
.
size
.
width
)
}
let
ti111
=
UILabel
()
ti111
.
text
=
"¥
\(
third
)
"
ti111
.
font
=
UIFont
.
boldSystemFont
(
ofSize
:
13
)
...
...
@@ -390,10 +392,10 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
if
model
.
data
?
.
payable
!=
nil
{
self
.
first
=
model
.
data
?
.
payable
as!
String
}
if
self
.
first
.
count
==
0
{
}
else
{
self
.
first
=
"0"
}
if
model
.
data
?
.
already
!=
nil
{
self
.
second
=
"
\(
model
.
data
!.
already
!
)
"
}
else
{
...
...
@@ -420,9 +422,9 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
}
else
{
//应收
let
dic
=
[
"user_token"
:
UserToken
as
Any
,
"keyword"
:
keyword
as
Any
,
"page"
:
page
as
Any
,
"cus_id"
:
ven_id
as
Any
]
accountReceivableDetail
(
dic
,
success
:
{
(
data
)
in
self
.
second
=
"0
.00
"
self
.
third
=
"0
.00
"
self
.
first
=
"0"
self
.
second
=
"0"
self
.
third
=
"0"
let
model
=
data
as!
accountReceivableDetailModel
if
model
.
code
==
2
{
self
.
listView
.
mj_header
?
.
endRefreshing
()
...
...
@@ -432,16 +434,22 @@ class YingFuZhangKuanXQViewController:BaseViewController,UISearchBarDelegate,Sea
model
.
data
?
.
list
?
.
forEach
({
(
item
)
in
self
.
datas
.
append
(
item
)
})
if
model
.
data
?
.
arrears_money
!=
nil
{
self
.
first
=
model
.
data
?
.
arrears_money
!
as!
String
}
else
{
self
.
first
=
"0"
}
if
model
.
data
!.
jf
!=
nil
{
self
.
second
=
"
\(
model
.
data
!.
jf
!
)
"
}
else
{
self
.
second
=
"0"
}
if
model
.
data
!.
df
!=
nil
{
self
.
third
=
"
\(
model
.
data
!.
df
!
)
"
}
else
{
self
.
third
=
"0"
}
self
.
listView
.
reloadData
()
...
...
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