Skip to content

G
GeliBusinessPlatform
Commit 11aa1dd7 authored by lujunye's avatar lujunye
Browse files
Options

asdfjlasdf;lkjasl;fdjka

parent d2783aba
Hide whitespace changes
Inline Side-by-side
Showing with 507 additions and 1 deletion
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 11aa1dd7
......@@ -196,6 +196,8 @@
E05AEFA7261577EA00FB7CF4 /* P_P_H_Adr_VC.xib in Resources */ = {isa = PBXBuildFile; fileRef = E05AEFA5261577EA00FB7CF4 /* P_P_H_Adr_VC.xib */; };
E05AEFAD2615976200FB7CF4 /* P_P_H_YDLB_VC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E05AEFAB2615976200FB7CF4 /* P_P_H_YDLB_VC.swift */; };
E05AEFAE2615976200FB7CF4 /* P_P_H_YDLB_VC.xib in Resources */ = {isa = PBXBuildFile; fileRef = E05AEFAC2615976200FB7CF4 /* P_P_H_YDLB_VC.xib */; };
E05C2143262054AB00BD407D /* getVehicleType_model.swift in Sources */ = {isa = PBXBuildFile; fileRef = E05C2142262054AB00BD407D /* getVehicleType_model.swift */; };
E05C214B262055A200BD407D /* getVehicleType_InterFace.swift in Sources */ = {isa = PBXBuildFile; fileRef = E05C214A262055A200BD407D /* getVehicleType_InterFace.swift */; };
E05FAD272498A5E500D8C90D /* accountsPayableInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E05FAD262498A5E500D8C90D /* accountsPayableInterface.swift */; };
E05FAD2A2498A5F200D8C90D /* accountsPayableListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E05FAD292498A5F200D8C90D /* accountsPayableListModel.swift */; };
E063A7582616A5EF0020EEDC /* WXTS_View.swift in Sources */ = {isa = PBXBuildFile; fileRef = E063A7572616A5EF0020EEDC /* WXTS_View.swift */; };
......@@ -991,6 +993,8 @@
E05AEFA5261577EA00FB7CF4 /* P_P_H_Adr_VC.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = P_P_H_Adr_VC.xib; sourceTree = "<group>"; };
E05AEFAB2615976200FB7CF4 /* P_P_H_YDLB_VC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = P_P_H_YDLB_VC.swift; sourceTree = "<group>"; };
E05AEFAC2615976200FB7CF4 /* P_P_H_YDLB_VC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = P_P_H_YDLB_VC.xib; sourceTree = "<group>"; };
E05C2142262054AB00BD407D /* getVehicleType_model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = getVehicleType_model.swift; sourceTree = "<group>"; };
E05C214A262055A200BD407D /* getVehicleType_InterFace.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = getVehicleType_InterFace.swift; sourceTree = "<group>"; };
E05FAD262498A5E500D8C90D /* accountsPayableInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = accountsPayableInterface.swift; sourceTree = "<group>"; };
E05FAD292498A5F200D8C90D /* accountsPayableListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = accountsPayableListModel.swift; sourceTree = "<group>"; };
E063A7572616A5EF0020EEDC /* WXTS_View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WXTS_View.swift; sourceTree = "<group>"; };
......@@ -2190,6 +2194,14 @@
path = "拼拼货group";
sourceTree = "<group>";
};
E05C21412620549700BD407D /* pph */ = {
isa = PBXGroup;
children = (
E05C2142262054AB00BD407D /* getVehicleType_model.swift */,
);
path = pph;
sourceTree = "<group>";
};
E05FAD282498A5E800D8C90D /* yfzkModel */ = {
isa = PBXGroup;
children = (
......@@ -2386,6 +2398,7 @@
E09B03A92445B09200211A51 /* Model */ = {
isa = PBXGroup;
children = (
E05C21412620549700BD407D /* pph */,
E0AF740025FB16A0006AA336 /* queryStore_model */,
E0A804B125B819DF0082F56B /* printOrder_model */,
E0B903B6259AD9490041EF62 /* dbtIncomeInfo_model */,
......@@ -2406,6 +2419,7 @@
F956D5BD246A3629003FF510 /* PersonCenterModel */,
F956D5BC246A35DB003FF510 /* GoodsManageMoel */,
F9171EFB245128B200359C2B /* Interface.swift */,
E05C214A262055A200BD407D /* getVehicleType_InterFace.swift */,
E0AF740925FB1747006AA336 /* queryStoreInterface.swift */,
E0A804BA25B81B790082F56B /* printOrderInterface.swift */,
E0B903BC259ADAFE0041EF62 /* dbtIncomeInfoInterface.swift */,
......@@ -4502,6 +4516,7 @@
E06524F924581A7900CA22E2 /* ChuKuCell.swift in Sources */,
E00ACBEB2490D6C800128052 /* YDLBVc.swift in Sources */,
F9A0E1DD246D198B00D7F26F /* CusListAllModel.swift in Sources */,
E05C214B262055A200BD407D /* getVehicleType_InterFace.swift in Sources */,
E0E4456924B00F7B00EF788E /* LogisticsModel.swift in Sources */,
E0833B8724D8F96D0014F3E9 /* PaymentView.swift in Sources */,
F9956B2524640D34001A617D /* GoodsClassModel.swift in Sources */,
......@@ -4535,6 +4550,7 @@
F950FDE424518B9500C40530 /* FSCalendarTransitionCoordinator.m in Sources */,
F9B6D9E12486890D00111698 /* MoreAndTimeSelectView.swift in Sources */,
E0BE8A90245A9B9600E80134 /* YingFuZhangKuanCell.swift in Sources */,
E05C2143262054AB00BD407D /* getVehicleType_model.swift in Sources */,
F9171F0224513C5B00359C2B /* UpDataModel.swift in Sources */,
F950FDAD245163E500C40530 /* GoodsListModel.swift in Sources */,
F9D44E8824CBC6A400FBD8DB /* ToAndFormSelectViewController.swift in Sources */,
......
GeliBusinessPlatform/Interface/Interface_Z.plist
View file @ 11aa1dd7
......@@ -338,5 +338,21 @@
<string>Distribution/storeExamineOperation</string>
<key>保存店长审核信息（商家信息）</key>
<string>Distribution/saveStoreInfo</string>
<key>拼拼货商户获取车辆类型</key>
<string>Logistics/getVehicleType</string>
<key>拼拼货计算价格</key>
<string>Logistics/countPrice</string>
<key>拼拼货下单</key>
<string>Logistics/addPinPinOrder</string>
<key>拼拼货查看订单详情</key>
<string>Logistics/orderDetails</string>
<key>充值操作界面信息查询</key>
<string>Logistics/rechargeOperation</string>
<key>拼拼货取消订单</key>
<string>Logistics/cancelOrder</string>
<key>查询是否开通格利支付和余额是否足够</key>
<string>Logistics/stateJudge</string>
<key>支付操作</key>
<string>Logistics/pphPayment</string>
</dict>
</plist>
GeliBusinessPlatform/Model/UpDataModel.swift
View file @ 11aa1dd7
......@@ -8,7 +8,7 @@
import Foundation
import ObjectMapper
//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,取消采购单,修改采购订单,新增品牌,拒绝退款,确认用户退款到账,拒绝接单,审核同意退货退款,取消订单审核,确认收到退货,审核同意退货或退款,订单确认收货,取消运单,支付运费,选定地址添加收发货历史,取消货拉拉订单，货拉拉二次支付，货拉拉格利支付，发票消息短信通知,修改电子发票链接地址,分销分账设置,供应商新增店铺,标记已人工结算,铺货与取消铺货,终止合作,分销商品管理,分销商新增供应商,审核操作（通过和不通过）,删除客户,新增分销员,删除分销员,修改不二制油订单打印,店长审核通过、审核通过待补齐资料、不通过,保存店长审核信息（商家信息）,
//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,取消采购单,修改采购订单,新增品牌,拒绝退款,确认用户退款到账,拒绝接单,审核同意退货退款,取消订单审核,确认收到退货,审核同意退货或退款,订单确认收货,取消运单,支付运费,选定地址添加收发货历史,取消货拉拉订单，货拉拉二次支付，货拉拉格利支付，发票消息短信通知,修改电子发票链接地址,分销分账设置,供应商新增店铺,标记已人工结算,铺货与取消铺货,终止合作,分销商品管理,分销商新增供应商,审核操作（通过和不通过）,删除客户,新增分销员,删除分销员,修改不二制油订单打印,店长审核通过、审核通过待补齐资料、不通过,保存店长审核信息（商家信息）,拼拼货取消订单,支付操作,
class UpDataModel: Mappable {
......
GeliBusinessPlatform/Model/getVehicleType_InterFace.swift 0 → 100644
View file @ 11aa1dd7
//
// getVehicleType_InterFace.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/4/9.
// Copyright © 2021 junye lu. All rights reserved.
//
import Foundation
import Alamofire
import SwiftyJSON
import ObjectMapper
//MARK:--拼拼货商户获取车辆类型
//params-key(user_name(用户名)
func getVehicleType(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("拼拼货商户获取车辆类型", params, { (rep:DataResponse<getVehicleType_model>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:--拼拼货计算价格
/*
user_token 验证token
type 查询车辆类型接口返回的type
tailplate 0不要尾板1要尾板(不填默认为0)
infos {
type 类型1装货点并且是始发点，2卸货点并且是终点，3卸货点,4装货点（注意每个订单里必须有且只能有一个type=1和type=2）
lng 经度
lat 纬度
}
*/
func countPrice(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("拼拼货计算价格", params, { (rep:DataResponse<countPrice_model>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:--拼拼货下单
/*
user_token 验证token
uid 查询车辆类型接口返回的id
price 计算订单价格接口返回的totalPrice
orderType 0立即用车1预约用车
startDate 预约用车时间如果orderType为1时必填（13位时间戳）
demo 订单备注
payType 支付渠道1现金支付2支付宝支付3微信支付4网银(不传默认为现金支付)
typeid 车辆类型
tailplate 是否有尾板车型0没有尾板1有尾板
addinfos 地址数组转json(二维数组，可以有多个，但是始发点和终点只能有一个)
{
province_name 地址(省)
city_name 地址(市)
district_name 地址(区)
street_name 地址(街道)
linkman 节点联系人姓名
shopName 节点名称（详细地址）
mobile 节点联系人电话
type 类型1装货点并且是始发点，2卸货点并且是终点，3卸货点,4装货点（注意每个订单里必须有且只能有一个type=1和type=2）
lng 经度
lat 纬度
note 节点备注
}
*/
func addPinPinOrder(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("拼拼货下单", params, { (rep:DataResponse<addPinPinOrder_model>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:--拼拼货查看订单详情
/*
user_token 验证token
id 运单id
*/
func orderDetails(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("拼拼货查看订单详情", params, { (rep:DataResponse<orderDetails_model>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:--充值操作界面信息查询
/*
user_token 验证token
*/
func rechargeOperation(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("充值操作界面信息查询", params, { (rep:DataResponse<rechargeOperationData_model>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:--拼拼货取消订单
/*
user_token 验证token
wb_no 运单编号（返回字段长wb_no的就是了）
*/
func cancelOrder(_ 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:--查询是否开通格利支付和余额是否足够
/*
user_token 验证token
price 拼拼货预估价格
*/
func stateJudge(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("查询是否开通格利支付和余额是否足够", params, { (rep:DataResponse<stateJudge_model>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:--支付操作
/*
user_token 验证token
wb_no 运单编号
pwd 支付密码
*/
func pphPayment(_ 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)
}
}
GeliBusinessPlatform/Model/pph/getVehicleType_model.swift 0 → 100644
View file @ 11aa1dd7
//
// getVehicleType_model.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/4/9.
// Copyright © 2021 junye lu. All rights reserved.
//
import Foundation
import ObjectMapper
//MARK: - 查询是否开通格利支付和余额是否足够
class stateJudge_model: Mappable {
var code:Int?
var message : String?
var data :stateJudgeData_model?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class stateJudgeData_model: Mappable {
var res:Int? //1是未开通格利支付，2是未设置支付密码，3是资金不足额，4是资金足额（只有等于4，才能继续走支付流程）
required init?( map: Map) {
}
func mapping(map: Map) {
res <- map["res"]
}
}
//MARK: - 充值操作界面信息查询
class orechargeOperation_model: Mappable {
var code:Int?
var message : String?
var data :rechargeOperationData_model?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class rechargeOperationData_model: Mappable {
var bank_branch:String?//支行名称（code=0时返回）
var code : Int?//返回代码，0为成功
var bank_branch_num :String?//支行号（code=0时返回）
var clt_nm:String? //开户名称（code=0时返回）
var bnk_eid : String? //银行电子账号（code=0时返回）
var bank_name :String? //银行名称（code=0时返回）
var rep_msg:String? //返回信息
var rep_code : String?
required init?( map: Map) {
}
func mapping(map: Map) {
bank_branch <- map["bank_branch"]
code <- map["code"]
bank_branch_num <- map["bank_branch_num"]
clt_nm <- map["clt_nm"]
bnk_eid <- map["bnk_eid"]
bank_name <- map["bank_name"]
rep_msg <- map["rep_msg"]
rep_code <- map["rep_code"]
}
}
//MARK: - 拼拼货查看订单详情
class orderDetails_model: Mappable {
var code:Int?
var message : String?
var data :orderDetailsData_model?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class cargoContactListData: Mappable {
var note:String? //节点备注
var address : String?//地址
var lng :Double?//经度
var lat:Double?//纬度
var arriveStatus:Int? //到达状态1已到达已接货0未到达2签到异常(例如司机不在节点范围签到)
var arriveDate:Int?
var mobile:String?//联系人电话
var shopName:String? //节点名称
var id : Int? //节点id
var type:Int?//类型1装货点并且是始发点2卸货点并且是终点3卸货点4装货点
var linkMan:String? //联系人
required init?( map: Map) {
}
func mapping(map: Map) {
note <- map["note"]
address <- map["address"]
lng <- map["lng"]
lat <- map["lat"]
arriveStatus <- map["arriveStatus"]
arriveDate <- map["arriveDate"]
mobile <- map["mobile"]
shopName <- map["shopName"]
id <- map["id"]
type <- map["type"]
linkMan <- map["linkMan"]
}
}
class pph_info_data: Mappable {
var payedAmount:Float? //实际支付金额（订单支付之后按这个价格为准）
var payType2 : Int?
var truckType :Int?
var cargoContactList:Array<cargoContactListData>?
var arriveDate:Int? //送达时间
var mid : Int? //货主mid
var demo:String? //订单备注
var driverMid:Int? //司机mid
var shipperMobile : String? //货主联系电话
var sysAmount:Float?//估计价格(订单支付前按这个价格为准)
var sysMileage:Float?//估计里程
var cargoNo : String? //订单号
var driverMobile:String?//司机电话
var driverOffer:Int? //司机收款
var deliverDate : Int? //用车时间
var indate:Int?//下单时间
var id:Int? //订单id
var time : String?//预计行车时间
var payStatus:Int? //是否支付完成0未支付1已支付
var status:Int? //状态1派车中2待接货3待送达4已送达5已取消
required init?( map: Map) {
}
func mapping(map: Map) {
payedAmount <- map["payedAmount"]
payType2 <- map["payType2"]
truckType <- map["truckType"]
cargoContactList <- map["cargoContactList"]
arriveDate <- map["arriveDate"]
mid <- map["mid"]
demo <- map["demo"]
driverMid <- map["driverMid"]
shipperMobile <- map["shipperMobile"]
sysAmount <- map["sysAmount"]
sysMileage <- map["sysMileage"]
cargoNo <- map["cargoNo"]
driverMobile <- map["driverMobile"]
driverOffer <- map["driverOffer"]
deliverDate <- map["deliverDate"]
indate <- map["indate"]
id <- map["id"]
time <- map["time"]
payStatus <- map["payStatus"]
status <- map["status"]
}
}
class orderDetailsData_model: Mappable {
var order_sn:String? //关联订单号
var sale_plat : String? //关联平台
var freight :Float? //实际运费
var pay_time:String? //支付时间
var lwb_no : String?
var pph_info :pph_info_data?
required init?( map: Map) {
}
func mapping(map: Map) {
order_sn <- map["order_sn"]
sale_plat <- map["sale_plat"]
freight <- map["freight"]
pay_time <- map["pay_time"]
lwb_no <- map["lwb_no"]
pph_info <- map["pph_info"]
}
}
//MARK: - 拼拼货下单
class addPinPinOrder_model: Mappable {
var code:Int?
var message : String?
var data :addPinPinOrderData_model?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class addPinPinOrderData_model: Mappable {
var id:String?
var wb_no : String?
required init?( map: Map) {
}
func mapping(map: Map) {
id <- map["id"]
wb_no <- map["wb_no"]
}
}
//MARK: - 拼拼货计算价格
class countPrice_model: Mappable {
var code:Int?
var message : String?
var data :countPriceData_model?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class countPriceData_model: Mappable {
var code:Int?
var discounts : String? //优惠金额
var totalPrice :String?//总价格
var elapsedTime:String?//预计用时
var mileage:String?//公里数
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
discounts <- map["discounts"]
totalPrice <- map["totalPrice"]
elapsedTime <- map["elapsedTime"]
mileage <- map["mileage"]
}
}
//MARK: - 拼拼货商户获取车辆类型
class getVehicleType_model: Mappable {
var code:Int?
var message : String?
var data :Array<getVehicleTypeData_model>?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class getVehicleTypeData_model: Mappable {
var cubage:Float? //体积容积
var truckVolume : String? //体积
var img :String?//图片
var truckWeight:Float?//载重
var name : String?
var istailplate :Int? //是否有尾板车型0没有尾板1有尾板
var id:Int? //车辆类型id(下单接口会用到)
var truckSize : String? //车长
var type :Int?//车辆类型(计算价格接口会用到)
required init?( map: Map) {
}
func mapping(map: Map) {
cubage <- map["cubage"]
truckVolume <- map["truckVolume"]
img <- map["img"]
truckWeight <- map["truckWeight"]
name <- map["name"]
istailplate <- map["istailplate"]
id <- map["id"]
truckSize <- map["truckSize"]
type <- map["type"]
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment