订单--自提流程fixed

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -209,7 +209,6 @@
 		A7824B082271F53A00ABA381 /* EditSetDefaultTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7824B072271F53A00ABA381 /* EditSetDefaultTableViewCell.swift */; };
 		A79057022276C9770037F823 /* SetPasswordModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79057012276C9770037F823 /* SetPasswordModel.swift */; };
 		A79057062276EA3D0037F823 /* OpenCityListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79057052276EA3D0037F823 /* OpenCityListModel.swift */; };
-		A79057082276FEB00037F823 /* SelfMentionContactsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79057072276FEB00037F823 /* SelfMentionContactsModel.swift */; };
 		A7A98DFD227E84F4005306E9 /* SwiftMoyaServiceProductApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7A98DFC227E84F4005306E9 /* SwiftMoyaServiceProductApi.swift */; };
 		A7A98DFF227E8501005306E9 /* SwiftMoyaNetWorkServiceProduct.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7A98DFE227E8501005306E9 /* SwiftMoyaNetWorkServiceProduct.swift */; };
 		A7A98E02227E8900005306E9 /* ProductSearchListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7A98E01227E8900005306E9 /* ProductSearchListModel.swift */; };
@@ -607,7 +606,6 @@
 		A7824B072271F53A00ABA381 /* EditSetDefaultTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditSetDefaultTableViewCell.swift; sourceTree = "<group>"; };
 		A79057012276C9770037F823 /* SetPasswordModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetPasswordModel.swift; sourceTree = "<group>"; };
 		A79057052276EA3D0037F823 /* OpenCityListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenCityListModel.swift; sourceTree = "<group>"; };
-		A79057072276FEB00037F823 /* SelfMentionContactsModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelfMentionContactsModel.swift; sourceTree = "<group>"; };
 		A7A59A7722363CCB00417FA4 /* RainbowPlanet.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RainbowPlanet.entitlements; sourceTree = "<group>"; };
 		A7A98DFC227E84F4005306E9 /* SwiftMoyaServiceProductApi.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftMoyaServiceProductApi.swift; sourceTree = "<group>"; };
 		A7A98DFE227E8501005306E9 /* SwiftMoyaNetWorkServiceProduct.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftMoyaNetWorkServiceProduct.swift; sourceTree = "<group>"; };
@@ -1366,7 +1364,6 @@
 				A7CC74E52270628B003C4F38 /* DeliveryMethodTypeModel.swift */,
 				A757C92D22744ACE00226355 /* AddressManagerListModel.swift */,
 				A79057012276C9770037F823 /* SetPasswordModel.swift */,
-				A79057072276FEB00037F823 /* SelfMentionContactsModel.swift */,
 				BDF45F0C228C00B8004E2682 /* DefaultContactInfoModel.swift */,
 			);
 			path = UserModel;
@@ -3512,7 +3509,6 @@
 				A70B2C4322883B4E00B2449F /* ProductDetailShopTableViewCell.swift in Sources */,
 				A70B2C102286A3BC00B2449F /* ProductDetailModel.swift in Sources */,
 				A72A72A922321DE000B21995 /* NumberKeyboard.swift in Sources */,
-				A79057082276FEB00037F823 /* SelfMentionContactsModel.swift in Sources */,
 				A70B2C272286C5D600B2449F /* ProductDetailFSPagerViewCell.swift in Sources */,
 				A7FF1585228C847300A85748 /* OrderDetailContactAddressTableViewCell.swift in Sources */,
 				A72A72AA22321DE000B21995 /* Log.swift in Sources */,

RainbowPlanet/RainbowPlanet/Modules/MineModule/EditSelfMentionContacts/ViewController/EditSelfMentionContactsViewController.swift

@@ -16,6 +16,9 @@ class EditSelfMentionContactsViewController: BaseViewController {
     var selfMentionContactsModel: SelfMentionContactsModel?
     var selfMentionContactsModel1 = SelfMentionContactsModel()
     
+    // 是否由支付订单页面进入
+    var isFromOrderPay: Bool = false
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()
@@ -73,12 +76,20 @@ class EditSelfMentionContactsViewController: BaseViewController {
         if self.selfMentionContactsModel != nil {
             SwiftMoyaNetWorkServiceUser.shared().userSaveExpreesContactsApi(id: self.selfMentionContactsModel?.id ?? 0 ,mobile: self.selfMentionContactsModel?.mobile ?? "", name: self.selfMentionContactsModel?.name ?? "") {
                 [weak self] (data) -> (Void) in
-                self?.popVC()
+                if self!.isFromOrderPay {
+                    self?.navigationController?.popViewController(animated: true)
+                } else {
+                    self?.popVC()
+                }
             }
         }else {
             SwiftMoyaNetWorkServiceUser.shared().userSaveExpreesContactsApi(id: self.selfMentionContactsModel1.id ?? 0 ,mobile: self.selfMentionContactsModel1.mobile ?? "", name: self.selfMentionContactsModel1.name ?? "") {
                 [weak self] (data) -> (Void) in
-                self?.popVC()
+                if self!.isFromOrderPay {
+                    self?.navigationController?.popViewController(animated: true)
+                } else {
+                    self?.popVC()
+                }
             }
         }
         

RainbowPlanet/RainbowPlanet/Modules/MineModule/SelfMentionContactsList/ViewController/SelfMentionContactsListViewController.swift

@@ -12,6 +12,9 @@ class SelfMentionContactsListViewController: BaseViewController {
     
     var selfMentionContactsModels : Array<SelfMentionContactsModel>?
     
+    // 是否由支付订单页面进入
+    var isFromOrderPay: Bool = false
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()
@@ -80,8 +83,9 @@ class SelfMentionContactsListViewController: BaseViewController {
     /// 自提收货人信息
     func userExpreesContactsListApi() {
         SwiftMoyaNetWorkServiceUser.shared().userExpreesContactsListApi {
-            [weak self] (selfMentionContactsModels) -> (Void) in
-            self?.selfMentionContactsModels = selfMentionContactsModels as? Array<SelfMentionContactsModel>
+            [weak self] (contactListModel) -> (Void) in
+            let originMdl = contactListModel as? ContactListModel
+            self?.selfMentionContactsModels = originMdl?.list
             self?.selfMentionContactsListView.selfMentionContactsModels = self?.selfMentionContactsModels
         }
     }
@@ -90,7 +94,11 @@ class SelfMentionContactsListViewController: BaseViewController {
     func userSetExpreesContactsDefaultApi(id:Int = 0) {
         SwiftMoyaNetWorkServiceUser.shared().userSetExpreesContactsDefaultApi(id: id, completion: {
             [weak self] (data) -> (Void) in
-            self?.userExpreesContactsListApi()
+            if self!.isFromOrderPay {
+                self?.navigationController?.popViewController(animated: true)
+            } else {
+                self?.userExpreesContactsListApi()
+            }                        
         })
     }
 

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderPayOrder/View/AdressCell/OrderPaySelfPickInfoCell.swift

@@ -11,7 +11,7 @@ import UIKit
 class OrderPaySelfPickInfoCell: UITableViewCell {
     
     // 默认联系人Mdl
-    var contactMdl: DefaultContactInfoModel? {
+    var contactMdl: SelfMentionContactsModel? {
         didSet {
             nameLabel.text = contactMdl?.name
             phoneLabel.text = contactMdl?.mobile

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderPayOrder/View/ShoppingCartOrderPayView.swift

@@ -64,7 +64,7 @@ class ShoppingCartOrderPayView: BaseView {
     }
     
     // 自提联系人信息Mdl
-    var selfAddressInfoMdl: DefaultContactInfoModel? {
+    var selfAddressInfoMdl: SelfMentionContactsModel? {
         didSet {
             if selfAddressInfoMdl != nil {
                 tableView.reloadData()
@@ -211,7 +211,7 @@ extension ShoppingCartOrderPayView : UITableViewDelegate, UITableViewDataSource
             switch deliverType {
             case "1":
                 // 自提
-                if selfAddressInfoMdl == nil  {
+                if selfAddressInfoMdl?.id == nil  {
                     if indexPath.row == 0 {
                         // 自提添加收货人信息
                         let cell = OrderPaySelfPickAddInfoCell.cellWith(tableView: tableView, indexPath: indexPath)
@@ -319,7 +319,7 @@ extension ShoppingCartOrderPayView : UITableViewDelegate, UITableViewDataSource
         switch deliverType {
         case "1":
             // 自提
-            if selfAddressInfoMdl == nil {
+            if selfAddressInfoMdl?.id == nil {
                 if indexPath.row == 0 {
                     if let jumpNavBlock = self.jumpNavBlock {
                         jumpNavBlock(WillJumpType.selfAddInfo)

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderPayOrder/ViewController/ShoppingCartPayOrderController.swift

@@ -83,9 +83,11 @@ class ShoppingCartPayOrderController: BaseViewController {
                 self?.navigationController?.pushViewController(vc, animated: true)
             case WillJumpType.selfAddInfo:
                 let vc = EditSelfMentionContactsViewController()
+                vc.isFromOrderPay = true
                 self?.navigationController?.pushViewController(vc, animated: true)
             case WillJumpType.selfPersonalInfo:
                 let vc = SelfMentionContactsListViewController()
+                vc.isFromOrderPay = true
                 self?.navigationController?.pushViewController(vc, animated: true)
             case WillJumpType.selfAddressInfo:
                 let vc = SelfRecommendationViewController()
@@ -118,7 +120,7 @@ class ShoppingCartPayOrderController: BaseViewController {
     // 获取默认用户自提信息
     func userDefaultContactApi() {
         SwiftMoyaNetWorkServiceUser.shared().userDefaultContactApi { [weak self] (contactModel) -> (Void) in
-            self?.orderPayView.selfAddressInfoMdl = contactModel as? DefaultContactInfoModel
+            self?.orderPayView.selfAddressInfoMdl = contactModel as? SelfMentionContactsModel
         }        
     }
     

RainbowPlanet/RainbowPlanet/Service/Model/UserModel/DefaultContactInfoModel.swift

@@ -1,5 +1,5 @@
 //
-//  DefaultContactInfoModel.swift
+//  SelfMentionContactsModel.swift
 //  RainbowPlanet
 //
 //  Created by Christopher on 2019/5/15.
@@ -9,8 +9,25 @@
 import Foundation
 import ObjectMapper
 
+class ContactListModel : NSObject, Mappable{
+    
+    var list : [SelfMentionContactsModel]?
+    
+    class func newInstance(map: Map) -> Mappable?{
+        return ContactListModel()
+    }
+    required init?(map: Map){}
+    private override init(){}
+    
+    func mapping(map: Map)
+    {
+        list <- map["list"]
+        
+    }
+    
+}
 
-class DefaultContactInfoModel : NSObject, Mappable{
+class SelfMentionContactsModel : NSObject, Mappable{
     
     var createdAt : AnyObject?
     var deletedAt : AnyObject?
@@ -19,14 +36,14 @@ class DefaultContactInfoModel : NSObject, Mappable{
     var mobile : String?
     var name : String?
     var uid : Int?
-    var updatedAt : AnyObject?
+    var updatedAt : String?
     
     
     class func newInstance(map: Map) -> Mappable?{
-        return DefaultContactInfoModel()
+        return SelfMentionContactsModel()
     }
     required init?(map: Map){}
-    private override init(){}
+    override init(){}
     
     func mapping(map: Map)
     {

RainbowPlanet/RainbowPlanet/Service/Model/UserModel/SelfMentionContactsModel.swift

@@ -1,40 +0,0 @@
-//
-//	SelfMentionContactsModel.swift
-//	Model file generated using JSONExport: https://github.com/Ahmed-Ali/JSONExport
-
-import Foundation 
-import ObjectMapper
-
-
-class SelfMentionContactsModel : NSObject, Mappable{
-    
-    var createdAt : String?
-    var deletedAt : AnyObject?
-    var id : Int?
-    var mobile : String?
-    var name : String?
-    var uid : Int?
-    var updatedAt : String?
-    var isDefault : Int?
-    
-    
-    class func newInstance(map: Map) -> Mappable?{
-        return SelfMentionContactsModel()
-    }
-    required init?(map: Map){}
-    override init(){}
-    
-    func mapping(map: Map)
-    {
-        createdAt <- map["created_at"]
-        deletedAt <- map["deleted_at"]
-        id <- map["id"]
-        mobile <- map["mobile"]
-        name <- map["name"]
-        uid <- map["uid"]
-        updatedAt <- map["updated_at"]
-        isDefault <- map["is_default"]
-        
-    }
-    
-}

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaNetWorkServiceUser.swift

@@ -394,13 +394,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     func userExpreesContactsListApi(completion: @escaping apiCallBack) {
         let parameters = Dictionary<String,Any>()
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServiceUserApi.userExpreesContactsList(parameters: parameters))) {
-            (rootModel) in
-            let rootModel = rootModel as! RootModel
-            
-                let selfMentionContactsModels = Mapper<SelfMentionContactsModel>().mapArray(JSONString: rootModel.data!)
+        SwiftMoyaNetWorkManager.shared().request(ContactListModel.self, target: MultiTarget(SwiftMoyaServiceUserApi.userExpreesContactsList(parameters: parameters))) { (contactListModel) in
             SwiftProgressHUD.shared().hide()
-            completion(selfMentionContactsModels as Any)
+            completion(contactListModel)
         }
     }
     
@@ -428,7 +424,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             SwiftProgressHUD.shared().hide()
             let rootModel = rootModel as! RootModel
             
-            let contactMdl = DefaultContactInfoModel(JSONString: rootModel.data ?? "")
+            let contactMdl = SelfMentionContactsModel(JSONString: rootModel.data ?? "")
             completion(contactMdl as Any)
         }
     }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaServiceUserApi.swift

@@ -241,12 +241,12 @@ extension SwiftMoyaServiceUserApi: TargetType {
              .userIsBindWeixin,
              .userAddExpressAddress,
              .userSaveExpreesContacts,
-             .userSetExpreesContactsDefault,
              .userAddSelfAddress
             :
             return .post
         case .userAddressIsDefault,
-             .userSetDeliverType
+             .userSetDeliverType,
+             .userSetExpreesContactsDefault
             :
             return .put
         case .userSelfAddressList,