完成InterfaceModel

GeliBusinessPlatform/Define/Define.swift

@@ -25,11 +25,11 @@ let systemVersion = (UIDevice.current.systemVersion as String)
 //接口地址
 //test
 //let SERVERCE_ImageHost = "http://admin.lgw.com/"
-//let SERVERCE_HOST = "http://admin.lgw.com/api/"
+let SERVERCE_HOST = "http://z.gelifood.com/admin/"
 
 //online
-let SERVERCE_ImageHost = "https://api.laigewan.com/upload/images/"
-let SERVERCE_HOST = "http://a.gelifood.com/apia"
+//let SERVERCE_ImageHost = "https://api.laigewan.com/upload/images/"
+//let SERVERCE_HOST = "http://a.gelifood.com/apia"
 //视图常量
 let IS_IPHONE_X = __CGSizeEqualToSize(CGSize(width: 375.0, height: 812.0),UIScreen.main.bounds.size ) || __CGSizeEqualToSize(CGSize(width: 812.0, height: 375.0),UIScreen.main.bounds.size)||__CGSizeEqualToSize(CGSize(width: 414.0, height: 896.0),UIScreen.main.bounds.size ) || __CGSizeEqualToSize(CGSize(width: 896.0, height: 414.0),UIScreen.main.bounds.size)
 

GeliBusinessPlatform/Define/NetworkRequest.swift

@@ -90,7 +90,7 @@ extension NetworkRequest {
         
         let dicstr:String = dic?[url] as! String
         
-        let allUrl = SERVERCE_HOST + "/" + dicstr
+        let allUrl = SERVERCE_HOST + dicstr
         
         print(allUrl)
         print(params)
@@ -112,23 +112,29 @@ extension NetworkRequest {
             case .success(let value):
                 let json = JSON(value)
                 print(json)
-                SwiftNotice.clear()
-                if  json["code"].intValue == 200 {
+
+                if  json["code"].intValue == 1 {
                     success(Mapper<T>().map(JSONObject: value))
-                    
-                }else if json["code"].intValue == 999  {
-                    print("uid错误")
-                    
-                    SwiftNotice.showText(json["message"].stringValue)
+                }else if json["code"].intValue == 2  {
+                    //正常-数据为空
+                    success(Mapper<T>().map(JSONObject: value))
+                }else if json["code"].intValue == 3  {
+                    //业务逻辑运行异常，一般作用于验证失败、参数异常(缺失)等异常情况返回
+                    //                    SwiftNotice.showText(json["message"].stringValue)
+                    failture(DogError.DataInvalidError)
+                }else if json["code"].intValue == 10  {
+                    NotificationCenter.default.post(name: Notification.Name(rawValue: "logout"), object: nil)
+                    //                    SwiftNotice.showText(json["message"].stringValue)
                     failture(DogError.DataInvalidError)
+                }else if json["code"].intValue == 11  {
                     
+                    //                    SwiftNotice.showText(json["message"].stringValue)
+                    failture(DogError.DataInvalidError)
                 }else{
-                    SwiftNotice.showText(json["message"].stringValue)
-                    
+                    //                    SwiftNotice.showText(json["message"].stringValue)
                     failture(DogError.DataInvalidError)
                 }
             case .failure(let error):
-                SwiftNotice.clear()
                 
                 failture(error)
                 print("error:\(error)")
@@ -176,7 +182,7 @@ extension NetworkRequest {
         let dicstr:String = dic?[url] as! String
         
         let allUrl = SERVERCE_HOST + dicstr
-        
+
         print(allUrl)
         print(params)
         
@@ -193,27 +199,32 @@ extension NetworkRequest {
             case .success(let value):
                 let json = JSON(value)
                 print(json)
-                SwiftNotice.clear()
                 
                 UserDefaults.standard.setValue(json["message"].stringValue, forKey: "jsonMessage")
                 
-                if json["code"].intValue == 200 {
+                if json["code"].intValue == 1 {
                     success(Mapper<T>().map(JSONObject: value))
                     
-                }else if json["code"].intValue == 999  {
-                    
-                    
-                    
+                }else if json["code"].intValue == 2  {
+                    //正常-数据为空
+                    success(Mapper<T>().map(JSONObject: value))
+                }else if json["code"].intValue == 3  {
+                    //业务逻辑运行异常，一般作用于验证失败、参数异常(缺失)等异常情况返回
+                    failture(DogError.DataInvalidError)
+                }else if json["code"].intValue == 10  {
+                    failture(DogError.DataInvalidError)
+
                     NotificationCenter.default.post(name: Notification.Name(rawValue: "logout"), object: nil)
+                }else if json["code"].intValue == 11  {
+                    
+                    //                    SwiftNotice.showText(json["message"].stringValue)
+                    failture(DogError.DataInvalidError)
                 }else{
-                    if json["code"].intValue == 500 {
-                        success(Mapper<T>().map(JSONObject: value))
-                    }else{
-                        failture(DogError.DataInvalidError)
-                    }
+                    failture(DogError.DataInvalidError)
+
                 }
             case .failure(let error):
-                SwiftNotice.clear()
+
                 failture(error)
             }
         }

GeliBusinessPlatform/Interface/Interface_Z.plist

@@ -16,6 +16,14 @@
 	<string>Gelipay/geliPayInfo</string>
 	<key>获取格利支付账号绑定的手机号</key>
 	<string>Gelipay/getGelipayMobile</string>
+	<key>获取商店管理员验证手机号</key>
+	<string>Admin/getShopMobile</string>
+	<key>修改登录密码</key>
+	<string>Admin/changePwd</string>
+	<key>绑定、更换绑定格利支付账号</key>
+	<string>Admin/bindGeliPay</string>
+	<key>格利支付的跳转</key>
+	<string>Gelipay/locationGeliPay</string>
 	<key>商品列表</key>
 	<string>goods/goodsList</string>
 </dict>

GeliBusinessPlatform/Model/AdminInfoModel.swift

+//
+//  AdminInfoModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by 刘俊宏 on 2020/4/23.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+//个人中心首页+账号信息
+class AdminInfoModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : AdminInfoDataModel?
+
+    required init?( map: Map) {
+
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class AdminInfoDataModel: Mappable {
+    var shop_name : String? //商店名
+    var shop_img : String? //商店logo
+    var logo_word_img : String? //商店文字logo
+    var stall_name : String? //档口名
+    var company_name : String? //公司名
+    var user_name : String? //管理员账号
+    var admin_name : String? //管理员名称
+    var phone : String? //管理员手机号
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        shop_name <- map["shop_name"]
+        shop_img <- map["shop_img"]
+        logo_word_img <- map["logo_word_img"]
+        stall_name <- map["stall_name"]
+        company_name <- map["company_name"]
+        user_name <- map["user_name"]
+        admin_name <- map["admin_name"]
+        phone <- map["phone"]
+     }
+    
+}

GeliBusinessPlatform/Model/GeliPayInfoModel.swift

+//
+//  GeliPayInfoModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by 刘俊宏 on 2020/4/23.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+//支付账号信息
+class GeliPayInfoModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : GeliPayInfoDataModel?
+
+    required init?( map: Map) {
+
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class GeliPayInfoDataModel: Mappable {
+    var gelipay_username : String? //支付账号
+    var status : Int? //状态：1已绑定格利支付且格利支付已绑卡，2已绑定格利支付且格利支付未绑卡，3未绑定格利支付
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        gelipay_username <- map["gelipay_username"]
+        status <- map["status"]
+
+     }
+    
+}

GeliBusinessPlatform/Model/GetMobileModel.swift

+//
+//  GetGelipayMobileModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by 刘俊宏 on 2020/4/23.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+//获取格利支付账号绑定的手机号
+class GetMobileModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : GetMobileDataModel?
+
+    required init?( map: Map) {
+
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class GetMobileDataModel: Mappable {
+    var mobile : String?  //手机号
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        mobile <- map["mobile"]
+     }
+    
+}

GeliBusinessPlatform/Model/GoodsListModel.swift

+//
+//  GoodsListModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by 刘俊宏 on 2020/4/23.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+//商品列表
+class GoodsListModel: 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 GoodsListDataModel: Mappable {
+    var count : Int?  //(筛选)商品总数
+    var goods_res : Array<GoodsResModel>?  //商品数据
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        count <- map["count"]
+     }
+    
+}
+class GoodsResModel: Mappable {
+    var sales : String?  //销量
+    var sku_id : Int?  //规格
+    var goods_id : Int?  //商品id
+    var goods_name : String?  //商品名
+    var goods_thumb : String?  //商品缩略图
+    var is_show : Int?  //上、下架状态，0下架，1上架
+    var price : String?  //价格
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        sales <- map["sales"]
+        sku_id <- map["sku_id"]
+        goods_id <- map["goods_id"]
+        goods_name <- map["goods_name"]
+        goods_thumb <- map["goods_thumb"]
+        is_show <- map["is_show"]
+        price <- map["price"]
+
+     }
+    
+}

GeliBusinessPlatform/Model/Interface.swift

+//
+//  Interface.swift
+//  GeliBusinessPlatform
+//
+//  Created by 刘俊宏 on 2020/4/23.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import Alamofire
+
+//MARK:--登录
+//params-key(user_name(用户名),pwd(密码))
+func login(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("登录", params, { (rep:DataResponse<LoginModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:--发送验证码
+//params-key(phone(手机号),type(    验证类型，1注册，2修改密码，3登录，4格利商家绑定(修改绑定)格利支付，5格利支付绑定格利商家))
+func sendSmsCaptcha(_ 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(phone(手机号),type(验证类型，需与发送时的类型一致),code(验证码))
+func verifyMmsCaptcha(_ 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 adminInfo(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("个人中心首页+账号信息", params, { (rep:DataResponse<AdminInfoModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:--商家信息
+//params-key(user_token)
+func shopInfo(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("商家信息", params, { (rep:DataResponse<ShopInfoModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:--支付账号信息
+//params-key(user_token)
+func geliPayInfo(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("支付账号信息", params, { (rep:DataResponse<GeliPayInfoModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:--获取格利支付账号绑定的手机号
+//params-key(user_token,geli_pay_user(格利支付用户名))
+func getGelipayMobile(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("获取格利支付账号绑定的手机号", params, { (rep:DataResponse<GetMobileModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:--获取商店管理员验证手机号
+//params-key(user_token)
+func getShopMobile(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("获取商店管理员验证手机号", params, { (rep:DataResponse<GetMobileModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:--修改登录密码
+//params-key(user_token,pwd(当前用户密码(明文传输)),new_pwd(修改后的新密码(明文传输)))
+func changePwd(_ 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,geli_pay_user(需要绑定的格利支付账号))
+func bindGeliPay(_ 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,type(跳转类型：1登录，2设置支付密码))
+func locationGeliPay(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("格利支付的跳转", params, { (rep:DataResponse<LocationGeliPayModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}
+//MARK:--商品列表
+//params-key(user_token,keyword(关键字),sort(1时间降序，2时间升序，3销量降序，4销量升序),is_show(上、下架，0下架，1上架，2全部),page(第几页))
+func goodsList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
+    NetworkRequest.sharedInstance.postRequest("商品列表", params, { (rep:DataResponse<GoodsListModel>) in
+    }, success: { (data) in
+        success(data)
+    }) { (error) in
+        failture(error)
+    }
+}

GeliBusinessPlatform/Model/LocationGeliPayModel.swift

+//
+//  LocationGeliPayModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by 刘俊宏 on 2020/4/23.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+//格利支付的跳转
+class LocationGeliPayModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : LocationGeliPayDataModel?
+
+    required init?( map: Map) {
+
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+
+class LocationGeliPayDataModel: Mappable {
+    var url : String?  //跳转的URL，有效期为15秒
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        url <- map["url"]
+     }
+    
+}

GeliBusinessPlatform/Model/LoginModel.swift

@@ -8,11 +8,11 @@
 
 import Foundation
 import ObjectMapper
-
+//登录
 class LoginModel: Mappable {
     var code:Int?
     var message : String?
-    var data : UserIdModel?
+    var data : LoginDataModel?
 
     required init?( map: Map) {
 
@@ -24,16 +24,13 @@ class LoginModel: Mappable {
     }
 }
 
-class UserIdModel: Mappable {
-
-    var user_id : String?
-    var user_qrcode:String?
+class LoginDataModel: Mappable {
+    var user_token : String? //返回token值，用于用户验证
     required init?( map: Map) {
         
     }
     func mapping(map: Map) {
-        user_id <- map["user_id"]
-        user_qrcode <- map["user_qrcode"]
+        user_token <- map["user_token"]
      }
     
 }

GeliBusinessPlatform/Model/ShopInfoModel.swift

+//
+//  ShopInfoModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by 刘俊宏 on 2020/4/23.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+//商家信息
+class ShopInfoModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : ShopInfoDataModel?
+
+    required init?( map: Map) {
+
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+class ShopInfoDataModel: Mappable {
+    var shop_id : Int? //商店id
+    var shop_name : String? //商店名
+    var shop_img : String? //商店logo
+    var province : Int? //省份id
+    var city : Int? //城市ID
+    var district : Int? //街道ID
+    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"]
+
+    }
+    
+}

GeliBusinessPlatform/Model/UpDataModel.swift

+//
+//  sendSmsCaptchaModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by 刘俊宏 on 2020/4/23.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+import ObjectMapper
+//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号
+class UpDataModel: Mappable {
+    var code:Int?
+    var message : String?
+    var data : [String: Any]?
+
+    required init?( map: Map) {
+
+    }
+    func mapping(map: Map) {
+        code <- map["code"]
+        message <- map["message"]
+        data <- map["data"]
+    }
+}
+  

GeliBusinessPlatform/ViewController/登录/LoginViewController.swift

@@ -87,6 +87,12 @@ class LoginViewController: BaseViewController {
 //        alertView.tishiLbl.text = "202121";
 //        alertView.titileLbl.text = "是否确认取消订单？"
 //        self.view.window?.addSubview(alertView)
-
+        //MARK:--登录接口样式
+        login(["user_name":"zxpf","pwd":"123456"], success: { (data) in
+            let dataM = data as! LoginModel
+            print("data=\(dataM.data?.user_token)")
+        }) { (error) in
+            print("error=\(error)")
+        }
     }
 }