0

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -63,6 +63,8 @@
 		E019E98124A975920086C565 /* brandListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E019E98024A975920086C565 /* brandListModel.swift */; };
 		E019E98324A9763A0086C565 /* BrandListInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E019E98224A9763A0086C565 /* BrandListInterface.swift */; };
 		E01C26B12446989700ADCC70 /* Interface_Z.plist in Resources */ = {isa = PBXBuildFile; fileRef = E01C26B02446989700ADCC70 /* Interface_Z.plist */; };
+		E01CEB5F2654A74200316645 /* agentList_model.swift in Sources */ = {isa = PBXBuildFile; fileRef = E01CEB5E2654A74200316645 /* agentList_model.swift */; };
+		E01CEB672654A82900316645 /* agentList_interface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E01CEB662654A82900316645 /* agentList_interface.swift */; };
 		E01E5471254FABFD00A2620C /* GYS_FX_ProductCellTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E01E546F254FABFD00A2620C /* GYS_FX_ProductCellTableViewCell.swift */; };
 		E01E5472254FABFD00A2620C /* GYS_FX_ProductCellTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E01E5470254FABFD00A2620C /* GYS_FX_ProductCellTableViewCell.xib */; };
 		E01E5484254FD34C00A2620C /* GYS_GuanLi_Cell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E01E5482254FD34B00A2620C /* GYS_GuanLi_Cell.swift */; };
@@ -879,6 +881,8 @@
 		E019E98024A975920086C565 /* brandListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = brandListModel.swift; sourceTree = "<group>"; };
 		E019E98224A9763A0086C565 /* BrandListInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrandListInterface.swift; sourceTree = "<group>"; };
 		E01C26B02446989700ADCC70 /* Interface_Z.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Interface_Z.plist; sourceTree = "<group>"; };
+		E01CEB5E2654A74200316645 /* agentList_model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = agentList_model.swift; sourceTree = "<group>"; };
+		E01CEB662654A82900316645 /* agentList_interface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = agentList_interface.swift; sourceTree = "<group>"; };
 		E01E546F254FABFD00A2620C /* GYS_FX_ProductCellTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GYS_FX_ProductCellTableViewCell.swift; sourceTree = "<group>"; };
 		E01E5470254FABFD00A2620C /* GYS_FX_ProductCellTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GYS_FX_ProductCellTableViewCell.xib; sourceTree = "<group>"; };
 		E01E5482254FD34B00A2620C /* GYS_GuanLi_Cell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GYS_GuanLi_Cell.swift; sourceTree = "<group>"; };
@@ -1949,6 +1953,14 @@
 			path = pinPai;
 			sourceTree = "<group>";
 		};
+		E01CEB5D2654A72600316645 /* agentList_model */ = {
+			isa = PBXGroup;
+			children = (
+				E01CEB5E2654A74200316645 /* agentList_model.swift */,
+			);
+			path = agentList_model;
+			sourceTree = "<group>";
+		};
 		E01EA19D245A5D5600F019D5 /* 运单详情 */ = {
 			isa = PBXGroup;
 			children = (
@@ -2512,6 +2524,7 @@
 		E09B03A92445B09200211A51 /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				E01CEB5D2654A72600316645 /* agentList_model */,
 				E05C21412620549700BD407D /* pph */,
 				E0AF740025FB16A0006AA336 /* queryStore_model */,
 				E0A804B125B819DF0082F56B /* printOrder_model */,
@@ -2533,6 +2546,7 @@
 				F956D5BD246A3629003FF510 /* PersonCenterModel */,
 				F956D5BC246A35DB003FF510 /* GoodsManageMoel */,
 				F9171EFB245128B200359C2B /* Interface.swift */,
+				E01CEB662654A82900316645 /* agentList_interface.swift */,
 				E05C214A262055A200BD407D /* getVehicleType_InterFace.swift */,
 				E0AF740925FB1747006AA336 /* queryStoreInterface.swift */,
 				E0A804BA25B81B790082F56B /* printOrderInterface.swift */,
@@ -4589,6 +4603,7 @@
 				E0E7CB6124C17B9F00A26D3F /* GLKHCell.swift in Sources */,
 				E083F0BB26047BA100627DBE /* DZGL_VC.swift in Sources */,
 				F95D9CA424493E840080D6E3 /* ShopInfoViewController.swift in Sources */,
+				E01CEB672654A82900316645 /* agentList_interface.swift in Sources */,
 				E013D7902484D5AF0092DE46 /* NewCKCell.swift in Sources */,
 				E0F503E02648DE52000F9633 /* SY_DLS_GL_VC.swift in Sources */,
 				F9171EFC245128B200359C2B /* Interface.swift in Sources */,
@@ -4887,6 +4902,7 @@
 				E042F73C245288F800CDFA12 /* WenDuCell.swift in Sources */,
 				F933F6C92452C68B00189561 /* HUD.swift in Sources */,
 				E0D197BC2448431C002B080C /* BabyPeripheralManager.m in Sources */,
+				E01CEB5F2654A74200316645 /* agentList_model.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -356,5 +356,21 @@
 	<string>Logistics/pphPayment</string>
 	<key>拼拼货预约时间</key>
 	<string>Logistics/pphAppointmentTime</string>
+	<key>下游代理商管理信息查询</key>
+	<string>Distribution/agentList</string>
+	<key>新增代理商下拉框查询</key>
+	<string>Distribution/getAllAge</string>
+	<key>供应商新增代理商(批量和单个新增代理商)</key>
+	<string>Distribution/ageAddContract</string>
+	<key>终止与代理商合作</key>
+	<string>Distribution/stopAgentContract</string>
+	<key>设置下游代理商品信息查询</key>
+	<string>Distribution/queryAgentGoods</string>
+	<key>给代理商设置分销商品</key>
+	<string>Distribution/setDbtGoodsAgent</string>
+	<key>商品上下架</key>
+	<string>Distribution/setGoodsAttr</string>
+	<key>供应商取消商品分销</key>
+	<string>Distribution/delDbtInfo</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/UpDataModel.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 import ObjectMapper
-//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,取消采购单,修改采购订单,新增品牌,拒绝退款,确认用户退款到账,拒绝接单,审核同意退货退款,取消订单审核,确认收到退货,审核同意退货或退款,订单确认收货,取消运单,支付运费,选定地址添加收发货历史,取消货拉拉订单，货拉拉二次支付，货拉拉格利支付，发票消息短信通知,修改电子发票链接地址,分销分账设置,供应商新增店铺,标记已人工结算,铺货与取消铺货,终止合作,分销商品管理,分销商新增供应商,审核操作（通过和不通过）,删除客户,新增分销员,删除分销员,修改不二制油订单打印,店长审核通过、审核通过待补齐资料、不通过,保存店长审核信息（商家信息）,拼拼货取消订单,
+//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,取消采购单,修改采购订单,新增品牌,拒绝退款,确认用户退款到账,拒绝接单,审核同意退货退款,取消订单审核,确认收到退货,审核同意退货或退款,订单确认收货,取消运单,支付运费,选定地址添加收发货历史,取消货拉拉订单，货拉拉二次支付，货拉拉格利支付，发票消息短信通知,修改电子发票链接地址,分销分账设置,供应商新增店铺,标记已人工结算,铺货与取消铺货,终止合作,分销商品管理,分销商新增供应商,审核操作（通过和不通过）,删除客户,新增分销员,删除分销员,修改不二制油订单打印,店长审核通过、审核通过待补齐资料、不通过,保存店长审核信息（商家信息）,拼拼货取消订单,供应商新增代理商(批量和单个新增代理商),终止与代理商合作,给代理商设置分销商品,商品上下架,供应商取消商品分销,
 
 
 class UpDataModel: Mappable {

GeliBusinessPlatform/Model/agentList_interface.swift

+//
+//  agentList_interface.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2021/5/19.
+//  Copyright © 2021 junye lu. All rights reserved.
+//
+
+import Foundation
+import Alamofire
+import SwiftyJSON
+import ObjectMapper
+//MARK:--下游代理商管理信息查询
+/*
+ user_token : 验证token
+ agent_name : 输入框模糊查询(代理商商点名称)
+ page : 分页查询（默认第一页）
+ */
+func agentList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("下游代理商管理信息查询", params, { (rep:DataResponse<agentList_model>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK:--新增代理商下拉框查询
+/*
+ user_token : 验证token
+ */
+func getAllAge(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("新增代理商下拉框查询", params, { (rep:DataResponse<getAllAge_model>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK:--供应商新增代理商(批量和单个新增代理商)
+/*
+ user_token : 验证token
+ agent_id :  代理商店铺id（英文逗号隔开，例：100008,100009）
+ */
+func ageAddContract(_ 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
+ agent_id :  代理商店铺id（英文逗号隔开，例：100008,100009）
+ */
+func stopAgentContract(_ 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
+ keyword :  模糊搜索（分销商品名称）
+ dbt_goods_type : 1分销商品、2现货商品（即未参与分销商品）、3提成比例分销商品(供货价)、4固定提成分销商品(分销价)、100全部商品
+ is_show : 上下架（1为上架，0为下架）
+ page :     分页
+ */
+func queryAgentGoods(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("设置下游代理商品信息查询", params, { (rep:DataResponse<queryAgentGoods_model>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+
+//MARK:--给代理商设置分销商品
+/*
+ user_token : 验证token
+ goods_id :  商品goods_id
+ sku_id : sku_id
+ price_type : 分销价格类型：0普通 1供应价
+ dbt_price : 分销价
+ commission_val : 固定佣金
+ supply_price : 供货价
+ floor_price : 最低价格范围
+ ceiling_price : 最高价格范围
+ */
+func setDbtGoodsAgent(_ 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
+ sku_id : sku_id
+ action : 操作，1为上架2为下架
+ */
+func setGoodsAttr(_ 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
+ sku_id : sku_id
+ action : 操作，1为上架2为下架
+ */
+func delDbtInfo(_ 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/agentList_model/agentList_model.swift

+//
+//  agentList_model.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2021/5/19.
+//  Copyright © 2021 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+
+//MARK: - 设置下游代理商品信息查询
+class queryAgentGoods_model: Mappable {
+    var code:Int?
+    var message : String?
+    var data :Array<queryAgentGoods_data_model>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class queryAgentGoods_data_model: Mappable {
+    var goods_name:String?
+    var goods_thumb : String?
+    var goods_id :Int?
+    
+    var sku_id:Int?
+    var price : String?
+    var inventory :Int?//库存
+    
+    var price_type:Int? //分销价格类型：0普通 1供应价
+    var supply_price : String? //代理商供货价
+    var floor_price :String?//最低价格范围
+    
+    var ceiling_price:String?//最高价格范围
+    var is_show : Int?//是否上下架：0否 1是
+   
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        goods_name <- map["goods_name"]
+        goods_thumb <- map["goods_thumb"]
+        goods_id <- map["goods_id"]
+        
+        sku_id <- map["sku_id"]
+        price <- map["price"]
+        inventory <- map["inventory"]
+        
+        price_type <- map["price_type"]
+        supply_price <- map["supply_price"]
+        floor_price <- map["floor_price"]
+        
+        ceiling_price <- map["ceiling_price"]
+        is_show <- map["is_show"]
+    }
+}
+//MARK: - 新增代理商下拉框查询
+class getAllAge_model: Mappable {
+    var code:Int?
+    var message : String?
+    var data :Array<getAllAge_data_model>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class getAllAge_data_model: 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"]
+    }
+}
+//MARK: - 下游代理商管理信息查询
+class agentList_model: Mappable {
+    var code:Int?
+    var message : String?
+    var data :Array<agentList_data_model>?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class agentList_data_model: Mappable {
+    var shop_name:String? //商店名称
+    var shop_img_thumb : String?//缩略图
+    var address :String?//地址
+    
+    var start_time:String?   //开始合作时间
+    var end_time : String? //合作结束时间
+    var status :String?//合作状态
+    
+    var age_id:Int?//代理商id
+    var sum_agent_commission_val : Int? //累计分销收益
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        shop_name <- map["shop_name"]
+        shop_img_thumb <- map["shop_img_thumb"]
+        address <- map["address"]
+        
+        start_time <- map["start_time"]
+        end_time <- map["end_time"]
+        status <- map["status"]
+        
+        age_id <- map["age_id"]
+        sum_agent_commission_val <- map["sum_agent_commission_val"]
+    }
+}