添加购物车 -- req

RainbowPlanet/RainbowPlanet/Service/Model/ProductModel/ProductCartListModel.swift

@@ -30,7 +30,7 @@ class ProductCartListData : NSObject, Mappable{
 
 class CartProductListModel : NSObject, Mappable{
     
-    var productList : [CartProductModel]?
+    var productList : [ProductModel]?
     var shopId : Int?
     var shopName : String?
     
@@ -49,56 +49,3 @@ class CartProductListModel : NSObject, Mappable{
     }
     
 }
-
-
-class CartProductModel : NSObject, Mappable{
-    
-    var amount : Int?
-    var cityId : Int?
-    var cityName : String?
-    var createdAt : String?
-    var deliverType : Int?
-    var id : Int?
-    var isSelect : Int?
-    var productId : Int?
-    var productImg : String?
-    var productName : String?
-    var productPrice : Int?
-    var shopId : Int?
-    var shopName : String?
-    var skuId : Int?
-    var skuName : String?
-    var skuPrice : Int?
-    var uid : Int?
-    var updatedAt : String?
-    
-    
-    class func newInstance(map: Map) -> Mappable?{
-        return CartProductModel()
-    }
-    required init?(map: Map){}
-    private override init(){}
-    
-    func mapping(map: Map)
-    {
-        amount <- map["amount"]
-        cityId <- map["city_id"]
-        cityName <- map["city_name"]
-        createdAt <- map["created_at"]
-        deliverType <- map["deliver_type"]
-        id <- map["id"]
-        isSelect <- map["is_select"]
-        productId <- map["product_id"]
-        productImg <- map["product_img"]
-        productName <- map["product_name"]
-        productPrice <- map["product_price"]
-        shopId <- map["shop_id"]
-        shopName <- map["shop_name"]
-        skuId <- map["sku_id"]
-        skuName <- map["sku_name"]
-        skuPrice <- map["sku_price"]
-        uid <- map["uid"]
-        updatedAt <- map["updated_at"]
-    }
-    
-}

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceProduct/SwiftMoyaNetWorkServiceProduct.swift

@@ -110,25 +110,30 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
     /// 购物车-添加
     ///
     /// - Parameters:
-    ///   -
+    ///   - productMdl: 商品Model
     ///   - completion: 回调
-    func productCartAddApi(completion: @escaping apiCallBack) {
+    func productCartAddApi(productMdl:ProductModel, completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
-        parameters.updateValue(0, forKey: "shop_id")
-        parameters.updateValue("", forKey: "shop_name")
-        parameters.updateValue(0, forKey: "product_id")
-        parameters.updateValue("", forKey: "product_name")
-        parameters.updateValue("", forKey: "product_img")
-        parameters.updateValue(0, forKey: "product_price")
-        parameters.updateValue(0, forKey: "sku_id")
-        parameters.updateValue("", forKey: "sku_name")
-        parameters.updateValue(0, forKey: "amount")
-        parameters.updateValue(0, forKey: "is_select")
+        parameters.updateValue(productMdl.shopId       ?? 0, forKey: "shop_id")
+        parameters.updateValue(productMdl.productId    ?? 0, forKey: "product_id")
+        parameters.updateValue(productMdl.productPrice ?? 0, forKey: "product_price")
+        parameters.updateValue(productMdl.skuId        ?? 0, forKey: "sku_id")
+        parameters.updateValue(productMdl.amount       ?? 0, forKey: "amount")
+        parameters.updateValue(productMdl.isSelect     ?? 0, forKey: "is_select")
+        parameters.updateValue(productMdl.shopName    ?? "", forKey: "shop_name")
+        parameters.updateValue(productMdl.productName ?? "", forKey: "product_name")
+        parameters.updateValue(productMdl.productImg  ?? "", forKey: "product_img")
+        parameters.updateValue(productMdl.skuName     ?? "", forKey: "sku_name")
         
+        // 本地获取city_id/city_name
+        let loacationModel = LocationModel.shared().getLocationModel()
+        let baiduToCityModel = BaiduToCityFactory.shared.query(bjcityId: loacationModel!.cityCode)
+        parameters.updateValue(baiduToCityModel.areaCode, forKey: "city_id")
+        parameters.updateValue(baiduToCityModel.areaName, forKey: "city_name")
         
-        parameters.updateValue(0, forKey: "city_id")
-        parameters.updateValue(0, forKey: "city_name")
-        parameters.updateValue(0, forKey: "deliver_type")
+        // 本地获取deliver_type
+        let deliver_type = DeliveryMethodTypeModel.shared().getModel()?.deliveryMethodType
+        parameters.updateValue(deliver_type ?? 0, forKey: "deliver_type")
         
         SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServiceProductApi.productCartAdd(parameters: parameters))) { (rootModel) in