Commit 5430f699 authored by lujunye's avatar lujunye

分销接口model

parent 3b8905fb
......@@ -249,6 +249,8 @@
E09F4C9E2452BEBB00BE033D /* JiPaiFangShiViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E09F4C9C2452BEBB00BE033D /* JiPaiFangShiViewController.xib */; };
E09F4CA22452D18800BE033D /* ZengZhiServicesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E09F4CA02452D18800BE033D /* ZengZhiServicesViewController.swift */; };
E09F4CA32452D18800BE033D /* ZengZhiServicesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E09F4CA12452D18800BE033D /* ZengZhiServicesViewController.xib */; };
E0A0A66D255A2C1600B0D1A5 /* getDbtRuleModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0A0A66C255A2C1600B0D1A5 /* getDbtRuleModel.swift */; };
E0A0A675255A2CFC00B0D1A5 /* getDbtRuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0A0A674255A2CFC00B0D1A5 /* getDbtRuleInterface.swift */; };
E0A2E81A24552E3C00D6DB34 /* XinZengPinPaiViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0A2E81824552E3C00D6DB34 /* XinZengPinPaiViewController.swift */; };
E0A2E81B24552E3C00D6DB34 /* XinZengPinPaiViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0A2E81924552E3C00D6DB34 /* XinZengPinPaiViewController.xib */; };
E0A2E81E24552F0A00D6DB34 /* TilteAndTextViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0A2E81C24552F0A00D6DB34 /* TilteAndTextViewCell.swift */; };
......@@ -906,6 +908,8 @@
E09F4C9C2452BEBB00BE033D /* JiPaiFangShiViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = JiPaiFangShiViewController.xib; sourceTree = "<group>"; };
E09F4CA02452D18800BE033D /* ZengZhiServicesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZengZhiServicesViewController.swift; sourceTree = "<group>"; };
E09F4CA12452D18800BE033D /* ZengZhiServicesViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ZengZhiServicesViewController.xib; sourceTree = "<group>"; };
E0A0A66C255A2C1600B0D1A5 /* getDbtRuleModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = getDbtRuleModel.swift; sourceTree = "<group>"; };
E0A0A674255A2CFC00B0D1A5 /* getDbtRuleInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = getDbtRuleInterface.swift; sourceTree = "<group>"; };
E0A2E81824552E3C00D6DB34 /* XinZengPinPaiViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XinZengPinPaiViewController.swift; sourceTree = "<group>"; };
E0A2E81924552E3C00D6DB34 /* XinZengPinPaiViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = XinZengPinPaiViewController.xib; sourceTree = "<group>"; };
E0A2E81C24552F0A00D6DB34 /* TilteAndTextViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TilteAndTextViewCell.swift; sourceTree = "<group>"; };
......@@ -1961,6 +1965,7 @@
E09B03A92445B09200211A51 /* Model */ = {
isa = PBXGroup;
children = (
E0A0A66B255A2C0300B0D1A5 /* get_dbt_rule_model */,
E040399424D14D1F008CF965 /* LalamoveInterface */,
E0E4456724B00F6400EF788E /* Logistics */,
E019E97F24A975710086C565 /* pinPai */,
......@@ -1977,6 +1982,7 @@
F956D5BD246A3629003FF510 /* PersonCenterModel */,
F956D5BC246A35DB003FF510 /* GoodsManageMoel */,
F9171EFB245128B200359C2B /* Interface.swift */,
E0A0A674255A2CFC00B0D1A5 /* getDbtRuleInterface.swift */,
E040399724D14E0E008CF965 /* LalamoveInterface.swift */,
E0E4456A24B0221500EF788E /* LogisticsInterface.swift */,
E019E98224A9763A0086C565 /* BrandListInterface.swift */,
......@@ -2212,6 +2218,14 @@
path = "增值服务";
sourceTree = "<group>";
};
E0A0A66B255A2C0300B0D1A5 /* get_dbt_rule_model */ = {
isa = PBXGroup;
children = (
E0A0A66C255A2C1600B0D1A5 /* getDbtRuleModel.swift */,
);
path = get_dbt_rule_model;
sourceTree = "<group>";
};
E0A2E8122455279100D6DB34 /* 下单成功 */ = {
isa = PBXGroup;
children = (
......@@ -3613,6 +3627,7 @@
F933F6C82452C68B00189561 /* PKHUDTextView.swift in Sources */,
F956D5AF246A2D9C003FF510 /* LMNCheckboxLine.m in Sources */,
E0A409C82464010D00CFF109 /* FirstCell.swift in Sources */,
E0A0A66D255A2C1600B0D1A5 /* getDbtRuleModel.swift in Sources */,
F9531F422465108800724BEE /* JXPhotoBrowserDefaultPageIndicator.swift in Sources */,
F96E9D59246656A700B5B94A /* HGImageCompleteButton.swift in Sources */,
F956D5B3246A2D9C003FF510 /* NSTextAttachment+LMNStore.m in Sources */,
......@@ -3895,6 +3910,7 @@
F961153324E22BA700EB3458 /* OtherInfoTextViewTableViewCell.swift in Sources */,
F90D37F925529984001F3AED /* GLAlertTbAddViewCell.swift in Sources */,
E00E48BE2457BAC700F16545 /* XuanZeShangPinCell.swift in Sources */,
E0A0A675255A2CFC00B0D1A5 /* getDbtRuleInterface.swift in Sources */,
E042F734245274F200CDFA12 /* YunDanLieBiaoCell.swift in Sources */,
F94A314F24625AFA00FEC38E /* GoodsUpDataModel.swift in Sources */,
F933F6C32452C68B00189561 /* FrameView.swift in Sources */,
......
......@@ -268,5 +268,29 @@
<string>Order/uploadInvoice</string>
<key>修改电子发票链接地址</key>
<string>Order/editInvoiceImg</string>
<key>分销分账设置查询</key>
<string>Distribution/getDbtRule</string>
<key>分销分账设置</key>
<string>Distribution/setDbtRule</string>
<key>获取商店</key>
<string>Distribution/getAllShop</string>
<key>供应商新增店铺</key>
<string>Distribution/supAddContract</string>
<key>分销订单管理</key>
<string>Distribution/dbtOrderLis</string>
<key>标记已人工结算</key>
<string>Distribution/editCommissionStatus</string>
<key>供应商铺货界面商品和商家查询</key>
<string>Distribution/supSpreadGoods</string>
<key>获取与供应商合作的分销商商店信息</key>
<string>Distribution/getDbtShop</string>
<key>铺货与取消铺货</key>
<string>Distribution/spreadGoods</string>
<key>供应商管理</key>
<string>Distribution/supList</string>
<key>分销商管理</key>
<string>Distribution/dbtList</string>
<key>终止合作</key>
<string>Distribution/stopContract</string>
</dict>
</plist>
......@@ -74,10 +74,16 @@ class OrderDetailResModel: Mappable {
var sale_res : OrderDetailSaleResModel?//订单预售详情(不是预售订单为空数组,无key=>value)
var invoice_img : String? //发票图片
var invoice_link : String? //发票链接
var sum_commission_val : String? //总佣金
var dbt_target : Int? //分销对象:1供应商 2分销商 3分销员
var target_name : String? //分销商名称
required init?( map: Map) {
}
func mapping(map: Map) {
sum_commission_val <- map["sum_commission_val"]
dbt_target <- map["dbt_target"]
target_name <- map["target_name"]
order_id <- map["order_id"]
order_sn <- map["order_sn"]
goods_before_pay <- map["goods_before_pay"]
......@@ -251,11 +257,12 @@ class OrderDetailGoodsModel: Mappable {
var goods_thumb : String? //商品缩略图
var warehouse_inventory : Int? //商品库存
var is_edit : Int? = 0 //订单商品是否有修改,1是0非--前端自主添加的字段
var commission_val:String? //这个商品的总佣金
required init?( map: Map) {
}
func mapping(map: Map) {
commission_val <- map["commission_val"]
og_id <- map["og_id"]
goods_id <- map["goods_id"]
goods_name <- map["goods_name"]
......
......@@ -32,7 +32,7 @@ class OrderListDataModel: Mappable {
var order_status : Int? //订单状态
var order_status_d : Int? //订单详细状态
var goods_before_pay :Int? //是否为先货后款:0否 1是
var order_type : Int? //订单类型 1普通2期货3团购4预售
var order_type : Int? //订单类型 1普通2期货3团购4预售5分销商品
var pay_status : Int? //支付状态
var pay_type : Int? //支付类型
var apply_cancel:Int? //申请取消订单标识:0待申请 1申请取消中 2已取消
......
......@@ -8,7 +8,7 @@
import Foundation
import ObjectMapper
//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,取消采购单,修改采购订单,新增品牌,拒绝退款,确认用户退款到账,拒绝接单,审核同意退货退款,取消订单审核,确认收到退货,审核同意退货或退款,订单确认收货,取消运单,支付运费,选定地址添加收发货历史,取消货拉拉订单,货拉拉二次支付,货拉拉格利支付,发票消息短信通知,修改电子发票链接地址
//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,取消采购单,修改采购订单,新增品牌,拒绝退款,确认用户退款到账,拒绝接单,审核同意退货退款,取消订单审核,确认收到退货,审核同意退货或退款,订单确认收货,取消运单,支付运费,选定地址添加收发货历史,取消货拉拉订单,货拉拉二次支付,货拉拉格利支付,发票消息短信通知,修改电子发票链接地址,分销分账设置,供应商新增店铺,标记已人工结算,铺货与取消铺货,终止合作
class UpDataModel: Mappable {
......
//
// get_dbt_rule_interface.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/11/10.
// Copyright © 2020 junye lu. All rights reserved.
//
import Foundation
import Alamofire
import SwiftyJSON
import ObjectMapper
//MARK:--分销分账设置查询
//params-key:user_token
func getDbtRule(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("分销分账设置查询", params, { (rep:DataResponse<getDbtRuleModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:--分销分账设置
/*
params
key:user_token
dbt_type:分账方式 1人工结算 2自动结算
commission_time:佣金结算时间 1立即结算
share_type:分享方式 1(1对1结算)2(1对多结算)
*/
func setDbtRule(_ 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
func getAllShop(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("获取商店", params, { (rep:DataResponse<getAllShopModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:--供应商新增店铺
//params-key:user_token
//shop_id:添加的商店id
func supAddContract(_ 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
//shop_name:输入分销商店名称
dbt_type 结算方式(0全部1人工结算 2自动结算(3待自动结算、4已自动结算)(5待人工结算6已人工结算))
dbt_target 分销商订单(0全部2分销商 3分销员
pay_time 结算时间,传时间戳如(“1604318257,1604318258”)
page 页数
*/
func dbtOrderLis(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("分销订单管理", params, { (rep:DataResponse<dbtOrderLisModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:--标记已人工结算
/*
//params-key:user_token
//order_id:订单id
*/
func editCommissionStatus(_ 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
//retrieval:输入框模糊查询(商品名称)
look_type 1为已铺商品,2为可铺商品(不传默认是1)
shop_id 与供应商有合作关系的分销商id
page 页数(第几页,每页查10条)
*/
func supSpreadGoods(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("供应商铺货界面商品和商家查询", params, { (rep:DataResponse<supSpreadGoodsModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:-- 获取与供应商合作的分销商商店信息
/*
//params-key:user_token
//retrieval:输入框模糊查询(商品名称)
look_type 1为已铺商品,2为可铺商品(不传默认是1)
shop_id 与供应商有合作关系的分销商id
page 页数(第几页,每页查10条)
*/
func getDbtShop(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("获取与供应商合作的分销商商店信息", params, { (rep:DataResponse<getDbtShopModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:-- 铺货与取消铺货
/*
//params-key:user_token
//goods_id:商品id
action 操作(1为铺货,2为取消铺货)
shop_id 商店id
*/
func spreadGoods(_ 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
*/
func supList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("供应商管理", params, { (rep:DataResponse<supListModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:-- 分销商管理
/*
//params-key:user_token
shop_name 商店名称
*/
func dbtList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("分销商管理", params, { (rep:DataResponse<dbtListModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:-- 终止合作
/*
//params-key:user_token
sup_id 供应商id
dbt_id 分销商id
*/
func stopContract(_ 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)
}
}
//
// get_dbt_rule_model.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/11/10.
// Copyright © 2020 junye lu. All rights reserved.
//
import Foundation
import ObjectMapper
//MARK: - 分销分账设置查询
class getDbtRuleModel: Mappable {
var code:Int?
var message : String?
var data :Array<getDbtRuleDataModel>?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class getDbtRuleDataModel: Mappable {
var is_sup:Int? //是否是供应商(1是,0不是)
var is_dbt : Int? //是否是分销商(1是,0不是)
var dbt_type :Int? //分账方式 1人工结算 2自动结算(初始化为0,0的话就是没有设置过)
var commission_time : Int?//佣金结算时间 1立即结算(初始化为0,0的话就是没有设置过)
var share_type :Int?//分享方式 1(1对1结算)2(1对多结算)(初始化为0,0的话就是没有设置过)
required init?( map: Map) {
}
func mapping(map: Map) {
is_sup <- map["is_sup"]
is_dbt <- map["is_dbt"]
dbt_type <- map["dbt_type"]
commission_time <- map["commission_time"]
share_type <- map["share_type"]
}
}
class getAllShopModel: Mappable {
var code:Int?
var message : String?
var data :Array<getAllShopDataModel>?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class getAllShopDataModel: Mappable {
var shop_id:Int?
var shop_name : String?
required init?( map: Map) {
}
func mapping(map: Map) {
shop_id <- map["shop_id"]
shop_name <- map["shop_name"]
}
}
class dbtOrderLisModel: Mappable {
var code:Int?
var message : String?
var data :Array<dbtOrderLisDataModel>?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class dbtOrderLisDataModel: Mappable {
var order_id:Int?
var order_sn : String?
var dbt_type:Int?
var dbt_target : Int?
var sum_commission_val:String?
var sum_amount : String?
var commission_status:Int?
var user_name : String?
var order_goods:Array<dbtOrderLisGoodsDataModel>?
required init?( map: Map) {
}
func mapping(map: Map) {
order_id <- map["order_id"]
order_sn <- map["order_sn"]
dbt_type <- map["dbt_type"]
dbt_target <- map["dbt_target"]
sum_commission_val <- map["sum_commission_val"]
sum_amount <- map["sum_amount"]
commission_status <- map["commission_status"]
user_name <- map["user_name"]
order_goods <- map["order_goods"]
}
}
class dbtOrderLisGoodsDataModel: Mappable {
var goods_name:String?
var goods_number : Int?
required init?( map: Map) {
}
func mapping(map: Map) {
goods_name <- map["goods_name"]
goods_number <- map["goods_number"]
}
}
//MARK: - 供应商铺货界面商品和商家查询
class supSpreadGoodsModel: Mappable {
var code:Int?
var message : String?
var data :Array<supSpreadGoodsDataModel>?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class supSpreadGoodsDataModel: Mappable {
var goods_thumb:String?//缩略图
var goods_name : String?//商品名称
var dbt_sale :Int?//销量
var goods_number:Int?//库存
var shop_price : String?//价格
var dbt_price :String?//分销价
required init?( map: Map) {
}
func mapping(map: Map) {
goods_thumb <- map["goods_thumb"]
goods_name <- map["goods_name"]
dbt_sale <- map["dbt_sale"]
goods_number <- map["goods_number"]
shop_price <- map["shop_price"]
dbt_price <- map["dbt_price"]
}
}
//MARK: - 获取与供应商合作的分销商商店信息
class getDbtShopModel: Mappable {
var code:Int?
var message : String?
var data :Array<getDbtShopDataModel>?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class getDbtShopDataModel: Mappable {
var shop_id:Int?//商店id
var shop_name : String?//商品名称
required init?( map: Map) {
}
func mapping(map: Map) {
shop_id <- map["shop_id"]
shop_name <- map["shop_name"]
}
}
//MARK: - 供应商管理
class supListModel: Mappable {
var code:Int?
var message : String?
var data :Array<supListDataModel>?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class supListDataModel: Mappable {
var sup_id:Int?//供应商id
var create_time : String?//创建时间
var shop_name:String? //商店名称
var shop_img_thumb : String?//商店图标
var address:String?//商店地址
required init?( map: Map) {
}
func mapping(map: Map) {
sup_id <- map["sup_id"]
create_time <- map["create_time"]
shop_name <- map["shop_name"]
shop_img_thumb <- map["shop_img_thumb"]
address <- map["address"]
}
}
//MARK: - 分销商管理
class dbtListModel: Mappable {
var code:Int?
var message : String?
var data :Array<dbtListDataModel>?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class dbtListDataModel: Mappable {
var dbt_id:Int?//供应商id
var create_time : String?//创建时间
var shop_name:String? //商店名称
var shop_img_thumb : String?//商店图标
var address:String?//商店地址
required init?( map: Map) {
}
func mapping(map: Map) {
dbt_id <- map["dbt_id"]
create_time <- map["create_time"]
shop_name <- map["shop_name"]
shop_img_thumb <- map["shop_img_thumb"]
address <- map["address"]
}
}
......@@ -270,15 +270,10 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
let dataM = data as! UpDataModel
if dataM.code == 1 {
HUD.flash(.label("提交成功"), delay: 1.2)
self.loadData()
self.delegate?.EPViewControllerFinishEdit()
}
}) { (erro) in
}
}else if sender.tag == 1004 {
......
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