接口更新一波

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -238,6 +238,11 @@
 		F933F6CE2452C68B00189561 /* PKHUDSquareBaseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F933F6BD2452C68B00189561 /* PKHUDSquareBaseView.swift */; };
 		F933F6CF2452C68B00189561 /* PKHUDErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F933F6BE2452C68B00189561 /* PKHUDErrorView.swift */; };
 		F933F6D22452DAE100189561 /* TabBarContentClassView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F933F6D12452DAE000189561 /* TabBarContentClassView.swift */; };
+		F94A314724624E9500FEC38E /* GetGelipayInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F94A314624624E9500FEC38E /* GetGelipayInfoModel.swift */; };
+		F94A314924624FA400FEC38E /* ShopAdministratorInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F94A314824624FA400FEC38E /* ShopAdministratorInfoModel.swift */; };
+		F94A314B246250DB00FEC38E /* GoodsDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F94A314A246250DB00FEC38E /* GoodsDetailModel.swift */; };
+		F94A314D2462582F00FEC38E /* GeneralInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F94A314C2462582F00FEC38E /* GeneralInfoModel.swift */; };
+		F94A314F24625AFA00FEC38E /* GoodsUpDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F94A314E24625AFA00FEC38E /* GoodsUpDataModel.swift */; };
 		F950FDA32451438A00C40530 /* AdminInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F950FDA22451438A00C40530 /* AdminInfoModel.swift */; };
 		F950FDA52451453A00C40530 /* ShopInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F950FDA42451453A00C40530 /* ShopInfoModel.swift */; };
 		F950FDA72451494500C40530 /* GeliPayInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F950FDA62451494500C40530 /* GeliPayInfoModel.swift */; };
@@ -565,6 +570,11 @@
 		F933F6BE2452C68B00189561 /* PKHUDErrorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PKHUDErrorView.swift; sourceTree = "<group>"; };
 		F933F6BF2452C68B00189561 /* PKHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PKHUD.h; sourceTree = "<group>"; };
 		F933F6D12452DAE000189561 /* TabBarContentClassView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabBarContentClassView.swift; sourceTree = "<group>"; };
+		F94A314624624E9500FEC38E /* GetGelipayInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetGelipayInfoModel.swift; sourceTree = "<group>"; };
+		F94A314824624FA400FEC38E /* ShopAdministratorInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopAdministratorInfoModel.swift; sourceTree = "<group>"; };
+		F94A314A246250DB00FEC38E /* GoodsDetailModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoodsDetailModel.swift; sourceTree = "<group>"; };
+		F94A314C2462582F00FEC38E /* GeneralInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralInfoModel.swift; sourceTree = "<group>"; };
+		F94A314E24625AFA00FEC38E /* GoodsUpDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoodsUpDataModel.swift; sourceTree = "<group>"; };
 		F950FDA22451438A00C40530 /* AdminInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdminInfoModel.swift; sourceTree = "<group>"; };
 		F950FDA42451453A00C40530 /* ShopInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopInfoModel.swift; sourceTree = "<group>"; };
 		F950FDA62451494500C40530 /* GeliPayInfoModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeliPayInfoModel.swift; sourceTree = "<group>"; };
@@ -1016,12 +1026,17 @@
 				F9171EFB245128B200359C2B /* Interface.swift */,
 				E09B03AA2445B0A300211A51 /* LoginModel.swift */,
 				F9171F0124513C5B00359C2B /* UpDataModel.swift */,
+				F94A314E24625AFA00FEC38E /* GoodsUpDataModel.swift */,
 				F950FDA22451438A00C40530 /* AdminInfoModel.swift */,
 				F950FDA42451453A00C40530 /* ShopInfoModel.swift */,
 				F950FDA62451494500C40530 /* GeliPayInfoModel.swift */,
 				F950FDA82451613500C40530 /* GetMobileModel.swift */,
 				F950FDAA2451634B00C40530 /* LocationGeliPayModel.swift */,
 				F950FDAC245163E500C40530 /* GoodsListModel.swift */,
+				F94A314624624E9500FEC38E /* GetGelipayInfoModel.swift */,
+				F94A314824624FA400FEC38E /* ShopAdministratorInfoModel.swift */,
+				F94A314A246250DB00FEC38E /* GoodsDetailModel.swift */,
+				F94A314C2462582F00FEC38E /* GeneralInfoModel.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -1890,6 +1905,7 @@
 				F933F6C82452C68B00189561 /* PKHUDTextView.swift in Sources */,
 				E0B6036E244D376900A56B38 /* KuWeiCell.swift in Sources */,
 				E0D197BA2448431C002B080C /* BabyDefine.m in Sources */,
+				F94A314924624FA400FEC38E /* ShopAdministratorInfoModel.swift in Sources */,
 				F961D264244FD744007FBE70 /* SearchBarView.swift in Sources */,
 				F950FDE124518B9500C40530 /* FSCalendarConstants.m in Sources */,
 				F9023F712449ACA800DD5A63 /* TitleAndSwitchCell.swift in Sources */,
@@ -1903,6 +1919,7 @@
 				E0BE8A7F245A740600E80134 /* ChengGongCell.swift in Sources */,
 				E02DDD90244FE54C00ABB707 /* NewCreateHeader.swift in Sources */,
 				F950FDA92451613500C40530 /* GetMobileModel.swift in Sources */,
+				F94A314724624E9500FEC38E /* GetGelipayInfoModel.swift in Sources */,
 				E0B94623245671E100FBEC9A /* DaiKeXiaDanGouWuViewController.swift in Sources */,
 				E0A320C52456D01300AF321C /* DaiKeXiaDanFooterView.swift in Sources */,
 				E0336DD5244EC40000380BE9 /* CreatNewSpecsViewController.swift in Sources */,
@@ -1936,6 +1953,7 @@
 				E02C882A2456B4BA00925766 /* WLGZCell.swift in Sources */,
 				F950FDE824518CD800C40530 /* TimeSelectView.swift in Sources */,
 				F933F6C72452C68B00189561 /* PKHUDWideBaseView.swift in Sources */,
+				F94A314B246250DB00FEC38E /* GoodsDetailModel.swift in Sources */,
 				E02DDD85244FDC6A00ABB707 /* TitleAndSwitchHeaderView.swift in Sources */,
 				E0F3C2CB24590C86006F0D1F /* XinZengAndBianJiKeHuViewController.swift in Sources */,
 				E0D197C02448431C002B080C /* BabyCentralManager.m in Sources */,
@@ -2029,6 +2047,7 @@
 				E042F734245274F200CDFA12 /* YunDanLieBiaoCell.swift in Sources */,
 				E00E48CA2457D96100F16545 /* ChuRuKuJiLuXQViewController.swift in Sources */,
 				E01C26B62446AF3100ADCC70 /* DemoViewController.swift in Sources */,
+				F94A314F24625AFA00FEC38E /* GoodsUpDataModel.swift in Sources */,
 				F933F6C32452C68B00189561 /* FrameView.swift in Sources */,
 				F9DDBE922457BFEC00A32CB2 /* HUDEXT.swift in Sources */,
 				E06524FD24581BD900CA22E2 /* PiCiXuanZeViewController.swift in Sources */,
@@ -2053,6 +2072,7 @@
 				F933F6CC2452C68B00189561 /* WindowRootViewController.swift in Sources */,
 				E088CC8D24470BF0000DAA8A /* CodeView.swift in Sources */,
 				E01EA1A4245A60E000F019D5 /* XiaDanChengGongViewController.swift in Sources */,
+				F94A314D2462582F00FEC38E /* GeneralInfoModel.swift in Sources */,
 				E02DDD8D244FE43900ABB707 /* NewCreateFooter.swift in Sources */,
 				E0D197CF24485649002B080C /* BluetoothConnectViewController.swift in Sources */,
 				E042F73C245288F800CDFA12 /* WenDuCell.swift in Sources */,

GeliBusinessPlatform/Define/NetworkRequest.swift

@@ -153,7 +153,7 @@ extension NetworkRequest {
         let dicstr:String = dic?[url] as! String
         
         Alamofire.upload(multipartFormData: { (multipartFormData) in
-            let data = image.jpegData(compressionQuality: 0.5)
+            let data = image.jpegData(compressionQuality: 0.8)
             let fileName = String.init(describing: NSDate()) + ".png"
             // withName:是根据文档决定传入的字符串
             multipartFormData.append(data!, withName: "image", fileName: fileName, mimeType: "image/png")

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -8,6 +8,11 @@
 	<string>Common/sendSmsCaptcha</string>
 	<key>验证短信验证码</key>
 	<string>Common/verifyMmsCaptcha</string>
+	<key>简单通用操作接口
+</key>
+	<string>Common/editField</string>
+	<key>图片(文件)上传</key>
+	<string>Common/saveFile</string>
 	<key>个人中心首页+账号信息</key>
 	<string>Admin/adminInfo</string>
 	<key>商家信息</key>
@@ -24,10 +29,19 @@
 	<string>Admin/bindGeliPay</string>
 	<key>格利支付的跳转</key>
 	<string>Gelipay/locationGeliPay</string>
+	<key>获取格利支付账号信息</key>
+	<string>Gelipay/getGelipayInfo</string>
+	<key>获取商店超级管理员信息</key>
+	<string>Admin/getShopAdministratorInfo</string>
 	<key>商品列表</key>
 	<string>goods/goodsList</string>
-	<key>简单通用操作接口
-</key>
-	<string>Common/editField</string>
+	<key>商品详情</key>
+	<string>goods/goodsDetail</string>
+	<key>新增商品-获取基本信息</key>
+	<string>goods/GeneralInfo</string>
+	<key>新增商品</key>
+	<string>goods/goodsAdd</string>
+	<key>编辑商品</key>
+	<string>goods/goodsEdit</string>
 </dict>
 </plist>

GeliBusinessPlatform/Model/GeneralInfoModel.swift

+//
+//  GeneralInfoModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by 刘俊宏 on 2020/5/6.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+//新增商品-获取基本信息
+class GeneralInfoModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : GoodsListDataModel?
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class GeneralDataModel: Mappable {
+    var brand : Array<GeneralInfoBrandModel>? //品牌信息(提交 "品牌id")
+    var cats : Array<GeneralInfoCatsModel>? //商品分类信息(提交 "分类id")
+    var gs : Array<GeneralInfoGsModel>? //商品状态信息(提交 "状态ID")
+    var unit : Array<String>? //商品单位信息，(提交 "单位值") "吨",        //单位值
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        brand <- map["brand"]
+        cats <- map["cats"]
+        gs <- map["gs"]
+        unit <- map["unit"]
+        
+    }
+    
+}
+class GeneralInfoBrandModel: Mappable {
+    var brand_id : Int? //品牌id
+    var brand_name : String?  //品牌名
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        brand_id <- map["brand_id"]
+        brand_name <- map["brand_name"]
+        
+    }
+    
+}
+class GeneralInfoCatsModel: Mappable {
+    
+    var cat_id : Int? //分类id
+    var cat_name : String?  //分类名
+    var parent_id : Int? //分类上一级id，其值为 上一层级分类的"cat_id"
+    var parents_id : Int?
+    var sort_order : Int?
+    var level : Int?  //分类层级，0为第一级
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        cat_id <- map["cat_id"]
+        cat_name <- map["cat_name"]
+        parent_id <- map["parent_id"]
+        parents_id <- map["parents_id"]
+        sort_order <- map["sort_order"]
+        level <- map["level"]
+    }
+    
+    
+}
+class GeneralInfoGsModel: Mappable {
+    
+    var gs_id : Int?  //状态ID
+    var gs_name : String?   //状态名
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        gs_id <- map["gs_id"]
+        gs_name <- map["gs_name"]
+        
+    }
+    
+}
+ 

GeliBusinessPlatform/Model/GetGelipayInfoModel.swift

+//
+//  GetGelipayInfoModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by 刘俊宏 on 2020/5/6.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+//获取格利支付账号信息
+class GetGelipayInfoModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : GetGelipayDataModel?
+
+    required init?( map: Map) {
+
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class GetGelipayDataModel: Mappable {
+    var haveBind : Int?  //是否有绑定银行卡，1是0非
+    var phone : String?  //绑定的手机号，为空字符串则为绑定手机号
+    var haveUser : Int?  //是否有这个格利支付账号，1是0非
+    var havePwd : Int?   //是否设置了支付密码，1是0非
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        haveBind <- map["haveBind"]
+        phone <- map["phone"]
+        haveUser <- map["haveUser"]
+        havePwd <- map["havePwd"]
+
+     }
+    
+}

GeliBusinessPlatform/Model/GoodsDetailModel.swift

+//
+//  GoodsDetailModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by 刘俊宏 on 2020/5/6.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+//商品详情
+class GoodsDetailModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : GoodsDetailDataModel?
+
+    required init?( map: Map) {
+
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class GoodsDetailDataModel: Mappable {
+    var goods_res : Array<GoodsDetailGoodsResModel>?  //商品数据
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        goods_res <- map["goods_res"]
+        
+    }
+    
+}
+class GoodsDetailGoodsResModel: Mappable {
+    var goods_id : Int?  //商品id
+    var goods_name : String?  //商品名
+    var cat_id : Int?  //分类id
+    var brand_id : Int?  //品牌id
+    var goods_sn : String?  //商品sn
+    var market_price : String?  //市场价
+    var shop_price : String?  //(默认)售价(本店售价)
+    var goods_intro : String?  //商品简介
+    var goods_unit : String?  //(默认)单位
+    var origin_number : Int?  //起订量
+    var goods_type : Int?  //商品类型
+    var goods_desc : String?    //商品详情<p>11111</p>
+    var original_img : String?  //商品封面图
+    var is_show : Int?  //上、下架状态，1上架，0下架
+    var is_best : Int?  //是否推介，1是0非
+    var coun_id : Int?   //国家id
+    var sort_order : Int?   //排序
+    var specifications : String?    //(默认)规格
+    var logistics : String?   //物流费用
+    var gs_id : Int?  //商品状态
+    var is_check : Int?   //是否通过审核
+    var shelf_life : Int?  //保质期，单位：月
+    var transportation : Int?  //运输方式
+    var is_adsale : Int? //是否开启预售，1是非
+    var need_check : Int?    //付款是否需要审核 1是 0否
+    var dj_time_start : Double?    //预设预付定金开始时间
+    var dj_time_end : Double?   //预设预付定金结束间
+    var wk_time_start : Double?     //预设预付尾款开始间
+    var wk_time_end : Double?   //预设预付尾款结束间
+    var set_time : Int?  //预付尾款后几天后发货
+    var is_inquiry : Int? //是否询价 1是 0否
+    var is_qz : Int? //是否清真，1是0非
+    
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        goods_id <- map["goods_id"]
+        goods_name <- map["goods_name"]
+        cat_id <- map["cat_id"]
+        brand_id <- map["brand_id"]
+        goods_sn <- map["goods_sn"]
+        market_price <- map["market_price"]
+        shop_price <- map["shop_price"]
+        goods_intro <- map["goods_intro"]
+        goods_unit <- map["goods_unit"]
+        origin_number <- map["origin_number"]
+        goods_type <- map["goods_type"]
+        goods_desc <- map["goods_desc"]
+        original_img <- map["original_img"]
+        is_show <- map["is_show"]
+        is_best <- map["is_best"]
+        coun_id <- map["coun_id"]
+        sort_order <- map["sort_order"]
+        specifications <- map["specifications"]
+        logistics <- map["logistics"]
+        gs_id <- map["gs_id"]
+        is_check <- map["is_check"]
+        shelf_life <- map["shelf_life"]
+        transportation <- map["transportation"]
+        is_adsale <- map["is_adsale"]
+        need_check <- map["need_check"]
+        dj_time_start <- map["dj_time_start"]
+        dj_time_end <- map["dj_time_end"]
+        wk_time_start <- map["wk_time_start"]
+        wk_time_end <- map["wk_time_end"]
+        set_time <- map["set_time"]
+        is_inquiry <- map["is_inquiry"]
+        is_qz <- map["is_qz"]
+
+     }
+    
+}
+//商品sku信息
+class GoodsDetailSkuResModel: Mappable {
+    var sku_id : Int?  //规格
+    var price : String?  //售价
+    var pack_attr : String?  //长宽高体积重量等信息
+    var refrigerate : String?  //温藏
+    var tiered_pri : String?  //阶梯价
+    var spec_str : String?  //规格(中文字符串)
+    var unit : String?  //单位
+    var label : String?  //标签: 4一般、3无抗、2品牌
+    var is_tiered : Int?  //是否开启阶梯价 1开启 0关闭
+    var is_open_adsale : Int?  //是否开启预售 1是 0否
+    var adsale_pri : String?  //预售价格
+    var adsale_inventory : String?  //预售库存
+    var pct : String?  //定金比例（百分比） 例如填12即是定金比例为12%
+    var adsale_tiered_pri : String?  //预售阶梯价
+    var is_adsale_tiered : Int?  //是否开启预售阶梯价 1开启 0关闭
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        sku_id <- map["sku_id"]
+        price <- map["price"]
+        pack_attr <- map["pack_attr"]
+        refrigerate <- map["refrigerate"]
+        tiered_pri <- map["tiered_pri"]
+        spec_str <- map["spec_str"]
+        unit <- map["unit"]
+        label <- map["label"]
+        is_tiered <- map["is_tiered"]
+        is_open_adsale <- map["is_open_adsale"]
+        adsale_pri <- map["adsale_pri"]
+        adsale_inventory <- map["adsale_inventory"]
+        pct <- map["pct"]
+        adsale_tiered_pri <- map["adsale_tiered_pri"]
+        is_adsale_tiered <- map["is_adsale_tiered"]
+     }
+    
+}
+//副图信息
+class GoodsDetailBannerResModel: Mappable {
+    var img_id : String?  //副图ID
+    var img_original : String?  //副图图片地址
+    
+    required init?( map: Map) {
+        
+    }
+    
+    func mapping(map: Map) {
+        img_id <- map["img_id"]
+        img_original <- map["img_original"]
+     }
+}

GeliBusinessPlatform/Model/GoodsUpDataModel.swift

+//
+//  GoodsUpDataModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by 刘俊宏 on 2020/5/6.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+//新增商品,编辑商品
+class GoodsUpDataModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : GoodsUpDataBackDataModel?
+
+    required init?( map: Map) {
+
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+  
+class GoodsUpDataBackDataModel: Mappable {
+    var goods_id : String? //返回商品ID
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        goods_id <- map["goods_id"]
+     }
+    
+}

GeliBusinessPlatform/Model/Interface.swift

@@ -139,3 +139,104 @@ func editField(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:
         failture(error)
     }
 }
+//MARK:--获取格利支付账号信息
+//params-key(user_token,geli_pay_user(格利支付账号))
+func getGelipayInfo(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("获取格利支付账号信息", params, { (rep:DataResponse<GetGelipayInfoModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:--获取商店超级管理员信息
+//params-key(user_token)
+func getShopAdministratorInfo(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("获取商店超级管理员信息", params, { (rep:DataResponse<ShopAdministratorInfoModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:--商品详情
+//params-key(user_token,goods_id)
+func goodsDetail(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("商品详情", params, { (rep:DataResponse<GoodsDetailModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:--新增商品-获取基本信息
+//params-key(user_token)
+func GeneralInfo(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("新增商品-获取基本信息", params, { (rep:DataResponse<GeneralInfoModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:--新增商品
+//params-key
+/*
+ user_token
+ cat_id  分类ID
+ brand_id  品牌ID
+ goods_name  商品名称
+ is_qz  是否清真商品，1是0非
+ goods_type  商品类型，普通2现货3期货4团购
+ is_adsale  商品类型字段，预售专用，选定”预售”则值为1，否则值为0
+ is_inquiry  是否询价：1是0非
+ need_check  付款是否需要审核， 1是0非
+ dj_time_start  预设预付定金开始时间，时间戳，预售专用
+ dj_time_end  预设预付定金结束时间，时间戳，预售专用
+ wk_time_start  预设预付尾款开始时间，时间戳，预售专用
+ wk_time_end  预设预付尾款结束时间，时间戳，预售专用
+ set_time  预付尾款后几天后发货
+ keywords  关键字
+ goods_intro  简介
+ logistics  物流费用
+ coun_id  国家id
+ gs_id  商品状态
+ shelf_life  保质期，单位：月
+ transportation  运输方式，1冷链，2常温，3热链
+ goods_desc  商品详情
+ market_price  市场价
+ specifications  默认规格，选sku中最低价格(需判定阶梯价)的 规格值
+ shop_price  默认售价，选sku中最低价格(需判定阶梯价)的价格
+ goods_unit  默认商品单位，选sku中最低价格(需判定阶梯价)的单位
+ original_img      商品封面图
+ goods_banner   商品副图，多张，最多5张，使用一维数组转json格式
+ sku_info   商品sku信息，字段见“SKU信息表”，使用二维数组转json格式
+ */
+func goodsAdd(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("新增商品", params, { (rep:DataResponse<GoodsUpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:--编辑商品
+//params-key(user_token)
+/*
+ 商品基础信息新增 goods_id 参数
+ 商品封面 是否修改 参数
+ goods_banner(商品副图) 参数比新增复杂
+ sku信息 新增 sku_id 、 goods_id 、is_del等字段信息
+ 
+ goods_id  需要修改的商品ID
+ original_img_edit    商品封面图是否有修改，1是0非
+
+ */
+func goodsEdit(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("编辑商品", params, { (rep:DataResponse<GoodsUpDataModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}

GeliBusinessPlatform/Model/ShopAdministratorInfoModel.swift

+//
+//  ShopAdministratorInfoModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by 刘俊宏 on 2020/5/6.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+//获取商店超级管理员信息
+class ShopAdministratorInfoModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : ShopAdministratorDataModel?
+
+    required init?( map: Map) {
+
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class ShopAdministratorDataModel: Mappable {
+    var user_name : String? //超级管理员账号
+    var mobile : String?  //超级管理员手机号
+ 
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        user_name <- map["user_name"]
+        mobile <- map["mobile"]
+
+     }
+    
+}

GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.swift

@@ -21,7 +21,6 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
     //MARK:--加载数据
     func loadData(){
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
-
         adminInfo(["user_token":UserToken as Any], success: { (data) in
             self.dataModel = (data as! AdminInfoModel)
             self.iconImg.kf.setImage(with: URL(string: SERVERCE_HOST + (self.dataModel?.data?.shop_img)!))