Skip to content

G
GeliBusinessPlatform
Commit 301b95c9 authored by lujunye's avatar lujunye
Browse files
Options

新增店长接口

parent 718dde69
Hide whitespace changes
Inline Side-by-side
Showing with 289 additions and 9 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 301b95c9
......@@ -324,6 +324,8 @@
E0AD92EA2550E50500D82C17 /* GYS_FX_Product_VC.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0AD92E82550E50500D82C17 /* GYS_FX_Product_VC.xib */; };
E0AD92F92550FD1500D82C17 /* GYS_FX_SearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0AD92F72550FD1500D82C17 /* GYS_FX_SearchViewController.swift */; };
E0AD92FA2550FD1500D82C17 /* GYS_FX_SearchViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0AD92F82550FD1500D82C17 /* GYS_FX_SearchViewController.xib */; };
E0AF740225FB16BA006AA336 /* queryStore_model.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0AF740125FB16BA006AA336 /* queryStore_model.swift */; };
E0AF740A25FB1747006AA336 /* queryStoreInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0AF740925FB1747006AA336 /* queryStoreInterface.swift */; };
E0B28DAC24D3B15E00997C69 /* HuoLaLaDiZhiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B28DAA24D3B15E00997C69 /* HuoLaLaDiZhiCell.swift */; };
E0B28DAD24D3B15E00997C69 /* HuoLaLaDiZhiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0B28DAB24D3B15E00997C69 /* HuoLaLaDiZhiCell.xib */; };
E0B5307E247266F400FFCC15 /* DKXDAdrCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B5307C247266F400FFCC15 /* DKXDAdrCell.swift */; };
......@@ -1067,6 +1069,8 @@
E0AD92E82550E50500D82C17 /* GYS_FX_Product_VC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GYS_FX_Product_VC.xib; sourceTree = "<group>"; };
E0AD92F72550FD1500D82C17 /* GYS_FX_SearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GYS_FX_SearchViewController.swift; sourceTree = "<group>"; };
E0AD92F82550FD1500D82C17 /* GYS_FX_SearchViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GYS_FX_SearchViewController.xib; sourceTree = "<group>"; };
E0AF740125FB16BA006AA336 /* queryStore_model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = queryStore_model.swift; sourceTree = "<group>"; };
E0AF740925FB1747006AA336 /* queryStoreInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = queryStoreInterface.swift; sourceTree = "<group>"; };
E0B28DAA24D3B15E00997C69 /* HuoLaLaDiZhiCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HuoLaLaDiZhiCell.swift; sourceTree = "<group>"; };
E0B28DAB24D3B15E00997C69 /* HuoLaLaDiZhiCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HuoLaLaDiZhiCell.xib; sourceTree = "<group>"; };
E0B5307C247266F400FFCC15 /* DKXDAdrCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DKXDAdrCell.swift; sourceTree = "<group>"; };
......@@ -1680,9 +1684,9 @@
children = (
E02F43C1246A91C1000ECFB1 /* GeliBusinessPlatform.entitlements */,
E088CC882446FFA1000DAA8A /* Other */,
E09B03B32445B19400211A51 /* Interface */,
E09B03AD2445B0BA00211A51 /* ViewController */,
E09B03AC2445B0B200211A51 /* View */,
E09B03B32445B19400211A51 /* Interface */,
E09B03A92445B09200211A51 /* Model */,
E09B03A42445B03200211A51 /* BaseView */,
E09B039E2445AEF800211A51 /* Appdelegate */,
......@@ -2202,6 +2206,7 @@
E09B03A92445B09200211A51 /* Model */ = {
isa = PBXGroup;
children = (
E0AF740025FB16A0006AA336 /* queryStore_model */,
E0A804B125B819DF0082F56B /* printOrder_model */,
E0B903B6259AD9490041EF62 /* dbtIncomeInfo_model */,
E0A0A66B255A2C0300B0D1A5 /* get_dbt_rule_model */,
......@@ -2221,6 +2226,7 @@
F956D5BD246A3629003FF510 /* PersonCenterModel */,
F956D5BC246A35DB003FF510 /* GoodsManageMoel */,
F9171EFB245128B200359C2B /* Interface.swift */,
E0AF740925FB1747006AA336 /* queryStoreInterface.swift */,
E0A804BA25B81B790082F56B /* printOrderInterface.swift */,
E0B903BC259ADAFE0041EF62 /* dbtIncomeInfoInterface.swift */,
E0A0A674255A2CFC00B0D1A5 /* getDbtRuleInterface.swift */,
......@@ -2591,6 +2597,14 @@
path = "供应商分销商品管理";
sourceTree = "<group>";
};
E0AF740025FB16A0006AA336 /* queryStore_model */ = {
isa = PBXGroup;
children = (
E0AF740125FB16BA006AA336 /* queryStore_model.swift */,
);
path = queryStore_model;
sourceTree = "<group>";
};
E0B5308224728D5600FFCC15 /* WarehouseManageModel */ = {
isa = PBXGroup;
children = (
......@@ -4072,6 +4086,7 @@
F9ECC928255CD7FD00990B61 /* RetailManageDetailViewController.swift in Sources */,
E020632B246CDD36007A40C4 /* OrderDViewFooterView.swift in Sources */,
F950FDDE24518B9500C40530 /* FSCalendarWeekdayView.m in Sources */,
E0AF740A25FB1747006AA336 /* queryStoreInterface.swift in Sources */,
F9A4AB6E24C927E900094BD1 /* LogisticsCostDetailViewController.swift in Sources */,
E07337F82579E8660039767A /* GYS_FX_Product_ListVc.swift in Sources */,
E0BE8A7F245A740600E80134 /* ChengGongCell.swift in Sources */,
......@@ -4406,6 +4421,7 @@
F95567AB2453E40B009674AB /* OrderListViewController.swift in Sources */,
E06B1AF625B52AD3002F3C65 /* PrintListMgVc.swift in Sources */,
E00E48C22457C0D600F16545 /* XuanZeShangPinViewController.swift in Sources */,
E0AF740225FB16BA006AA336 /* queryStore_model.swift in Sources */,
F956D5BB246A359C003FF510 /* GoodsInterface.swift in Sources */,
F91E9EBE2579D00900FAFCFA /* RetailListMgVC.swift in Sources */,
E0DA8ACF25E8F4C000425099 /* BtViewController.m in Sources */,
......@@ -4614,7 +4630,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5.2;
CURRENT_PROJECT_VERSION = 5.3;
DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH;
......@@ -4750,7 +4766,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5.2;
CURRENT_PROJECT_VERSION = 5.3;
DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH;
......
GeliBusinessPlatform/Define/Define.swift
View file @ 301b95c9
......@@ -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/Info.plist
View file @ 301b95c9
......@@ -79,7 +79,6 @@
<true/>
<key>UIBackgroundModes</key>
<array>
<string>bluetooth-central</string>
<string>fetch</string>
<string>remote-notification</string>
</array>
......
GeliBusinessPlatform/Interface/Interface_Z.plist
View file @ 301b95c9
......@@ -330,5 +330,13 @@
<string>Order/fullCommissionInquiry</string>
<key>库存详情</key>
<string>goods/inventoryDetails</string>
<key>店长审核列表界面信息查询</key>
<string>Distribution/queryStoreListInfo</string>
<key>店长审核信息界面查询</key>
<string>Distribution/storeInfo</string>
<key>店长审核通过、审核通过待补齐资料、不通过</key>
<string>Distribution/storeExamineOperation</string>
<key>保存店长审核信息（商家信息）</key>
<string>Distribution/saveStoreInfo</string>
</dict>
</plist>
GeliBusinessPlatform/Model/UpDataModel.swift
View file @ 301b95c9
......@@ -8,7 +8,7 @@
import Foundation
import ObjectMapper
//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,取消采购单,修改采购订单,新增品牌,拒绝退款,确认用户退款到账,拒绝接单,审核同意退货退款,取消订单审核,确认收到退货,审核同意退货或退款,订单确认收货,取消运单,支付运费,选定地址添加收发货历史,取消货拉拉订单，货拉拉二次支付，货拉拉格利支付，发票消息短信通知,修改电子发票链接地址,分销分账设置,供应商新增店铺,标记已人工结算,铺货与取消铺货,终止合作,分销商品管理,分销商新增供应商,审核操作（通过和不通过）,删除客户,新增分销员,删除分销员,修改不二制油订单打印
//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,取消采购单,修改采购订单,新增品牌,拒绝退款,确认用户退款到账,拒绝接单,审核同意退货退款,取消订单审核,确认收到退货,审核同意退货或退款,订单确认收货,取消运单,支付运费,选定地址添加收发货历史,取消货拉拉订单，货拉拉二次支付，货拉拉格利支付，发票消息短信通知,修改电子发票链接地址,分销分账设置,供应商新增店铺,标记已人工结算,铺货与取消铺货,终止合作,分销商品管理,分销商新增供应商,审核操作（通过和不通过）,删除客户,新增分销员,删除分销员,修改不二制油订单打印,店长审核通过、审核通过待补齐资料、不通过,保存店长审核信息（商家信息）,
class UpDataModel: Mappable {
......
GeliBusinessPlatform/Model/queryStoreInterface.swift 0 → 100644
View file @ 301b95c9
//
// queryStoreInterface.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/3/12.
// Copyright © 2021 junye lu. All rights reserved.
//
import Foundation
import Alamofire
import SwiftyJSON
import ObjectMapper
//MARK:--店长审核列表界面信息查询
/*
user_token token
type 1为待审核列表查询，2为已审核列表查询
keyword 模糊查询，申请人名称/手机号
from 来源：1:小程序,2:格利食品网
start_time 时间筛选开始时间(时间戳)
end_time 时间筛选结束时间(时间戳)
audit_type 审核类型 1审核通过 2审核不通过 3审核通过待补齐资料 100全部
page 分页，一页10个
*/
func queryStoreListInfo(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("店长审核列表界面信息查询", params, { (rep:DataResponse<queryStoreListInfo_model>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:--店长审核信息界面查询
/*
user_token token
shop_id 审核店长的shop_id
*/
func storeInfo(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("店长审核信息界面查询", params, { (rep:DataResponse<storeInfo_model>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
//MARK:--店长审核通过、审核通过待补齐资料、不通过
/*
user_token token
action 1为审核通过，2为审核不通过，3为审核通过待补齐资料
shop_id 审核店长的shop_id
vendor_audit_desc 审核备注
reason 审核不通过原因（审核不通过时必填）
shop_info 店长审核信息(如果修改了资料就传全部信息，不需要修改资料就传空数组){
shop_id 商店id
shop_name 商店名
shop_img 商店logo
province 省id
city 市id
district 区id
address 详细地址
shop_tel 联系方式
shop_email 邮件
shop_intro 公司简介
shop_scale 公司规模
stall_name 档口名称
contacts_name 联系人姓名
identity_card_front 负责人身份证(正面)
identity_card_back 负责人身份证(反面)
agreement 商家入驻协议
business_licence_number 营业执照号
business_sphere 法定经营范围
zhizhao 执照
food_production_license 流通许可证
}
*/
func storeExamineOperation(_ 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
shop_info 店长审核信息
{
shop_id 商店id
shop_name 商店名
shop_img 商店logo
province 省id
city 市id
district 区id
address 详细地址
shop_tel 联系方式
shop_email 邮件
shop_intro 公司简介
shop_scale 公司规模
stall_name 档口名称
contacts_name 联系人姓名
identity_card_front 负责人身份证(正面)
identity_card_back 负责人身份证(反面)
agreement 商家入驻协议
business_licence_number 营业执照号
business_sphere 法定经营范围
zhizhao 执照
food_production_license 流通许可证
}
*/
func saveStoreInfo(_ 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/queryStore_model/queryStore_model.swift 0 → 100644
View file @ 301b95c9
//
// queryStore_model.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/3/12.
// Copyright © 2021 junye lu. All rights reserved.
//
import Foundation
import ObjectMapper
//MARK: - 店长审核列表界面信息查询
class queryStoreListInfo_model: Mappable {
var code:Int?
var message : String?
var data :Array<queryStoreListInfoData_model>?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class queryStoreListInfoData_model: Mappable {
var user_name:String?
var phone : String?
var from :String?
var create_time:String?
var vendor_audit_status : Int?//审核状态；1审核通过 2审核不通过 3审核通过待补齐资料
var shop_id :Int?
required init?( map: Map) {
}
func mapping(map: Map) {
user_name <- map["user_name"]
phone <- map["phone"]
from <- map["from"]
create_time <- map["create_time"]
vendor_audit_status <- map["vendor_audit_status"]
shop_id <- map["shop_id"]
}
}
//MARK: - 店长审核信息界面查询
class storeInfo_model: Mappable {
var code:Int?
var message : String?
var data :storeInfoData_model?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class storeInfoData_model: Mappable {
var shop_id:Int?
var shop_name : String? //商店名
var shop_img :String? //商店logo
var province:Int?
var city : Int?
var district :Int?
var address:String?//详细地址
var shop_tel : String?//联系方式
var shop_email :String?//邮件
var shop_intro:String? //公司简介
var shop_scale : String?//公司规模
var stall_name :String? //档口名称
var contacts_name:String? //联系人姓名
var contacts_phone : String? //联系人电话
var identity_card_front :String? //负责人身份证(正面)
var identity_card_back:String? //负责人身份证(反面)
var agreement : String?//商家入驻协议
var upload_status :Int?
var business_licence_number:String? //营业执照号
var business_sphere : String?//法定经营范围
var zhizhao :String? //营业执照电子版
var food_production_license:String? //流通许可证
var addr_str : String? //商家地址(省市区）拼接
required init?( map: Map) {
}
func mapping(map: Map) {
shop_id <- map["shop_id"]
shop_name <- map["shop_name"]
shop_img <- map["shop_img"]
province <- map["province"]
city <- map["city"]
district <- map["district"]
address <- map["address"]
shop_tel <- map["shop_tel"]
shop_email <- map["shop_email"]
shop_intro <- map["shop_intro"]
shop_scale <- map["shop_scale"]
stall_name <- map["stall_name"]
contacts_name <- map["contacts_name"]
contacts_phone <- map["contacts_phone"]
identity_card_front <- map["identity_card_front"]
identity_card_back <- map["identity_card_back"]
agreement <- map["agreement"]
upload_status <- map["upload_status"]
business_licence_number <- map["business_licence_number"]
business_sphere <- map["business_sphere"]
zhizhao <- map["zhizhao"]
food_production_license <- map["food_production_license"]
addr_str <- map["addr_str"]
}
}
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