编辑商品 - 删除

张旭
1 parent 50ede8bb
Showing 6 changed files with 136 additions and 78 deletions
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveGoodsCategoryController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopNewProductController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopProductManagerController.swift
metaCode/Classes/Main/HomePage/View/CNMainView.swift
metaCode/Classes/Main/HomePage/ViewModel/GoodsManager/CNLiveShopGoodListViewModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
@@ -201,8 +201,6 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
             self.postShopClassify()
         }
     }
-    
-    
     // MARK: - initUI
     func initUI(){
         self.shadowView = UIView(frame: self.view.bounds)
@@ -6,7 +6,7 @@
 //  新增商品
 import Foundation
-
+import HandyJSON
 ///
 enum CNLiveShopGoodsAddEditType{
@@ -39,9 +39,66 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         let shopGoodsDetailsModel = CNLiveShopGoodsDetailsModel()
         return shopGoodsDetailsModel
     }()
-    var selectCategoryVC:CNLiveGoodsCategoryController?
+    
+    var _selectCategoryVC:CNLiveGoodsCategoryController?
+    var selectCategoryVC:CNLiveGoodsCategoryController?{
+        get{
+            if _selectCategoryVC == nil{
+                let vc = CNLiveGoodsCategoryController()
+                vc.categoryType = .goods
+                if self.shopGoodsDetailsModel.id?.count ?? 0 > 0{
+                    vc.firCategoryId = self.shopGoodsDetailsModel.groupid
+                    vc.secCategoryId = self.shopGoodsDetailsModel.groupid2
+                    vc.thiCategoryId = self.shopGoodsDetailsModel.groupid3
+                }
+                vc.finishBlock = {
+                    //商品分类
+                    let singleView1 = self.bgScrollView.viewWithTag(1) as! CNLiveShopAddGoodsSingleView
+                    singleView1.contentTextField.text = "\(self.selectCategoryVC?.firCategoryName ?? "") \(self.selectCategoryVC?.secCategoryName ?? "")"
+                    singleView1.layoutSubviews()
+                }
+                self.addChild(vc)
+                vc.view.frame = CGRect(x: 0, y: KNavigationHeight, width: self.view.width, height: self.view.height-KNavigationHeight)
+                vc.didMove(toParent: self)
+                self.view.addSubview(vc.view)
+                _selectCategoryVC = vc
+            }
+            
+            return _selectCategoryVC
+        }
+        set{
+            
+            _selectCategoryVC = newValue
+            
+        }
+    }
+
+    //    lazy var selectCategoryVC :CNLiveGoodsCategoryController = {
+//            let vc = CNLiveGoodsCategoryController()
+//            vc.categoryType = .goods
+//            if self.shopGoodsDetailsModel.id?.count ?? 0 > 0{
+//                vc.firCategoryId = self.shopGoodsDetailsModel.groupid
+//                vc.secCategoryId = self.shopGoodsDetailsModel.groupid2
+//                vc.thiCategoryId = self.shopGoodsDetailsModel.groupid3
+//            }
+//            vc.finishBlock = {
+//                //商品分类
+//                let singleView1 = self.bgScrollView.viewWithTag(1) as! CNLiveShopAddGoodsSingleView
+//                singleView1.contentTextField.text = "\(self.selectCategoryVC.firCategoryName ?? "") \(self.selectCategoryVC.secCategoryName ?? "")"
+//                singleView1.layoutSubviews()
+//            }
+////            self.addChild(vc)
+////            vc.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
+////            vc.didMove(toParent: self)
+////            self.view.addSubview(vc.view)
+//            self.selectCategoryVC = vc
+//
+//        return selectCategoryVC
+//    }()
+
     lazy var selectShopClassifyVC:CNLiveGoodsCategoryController = {
+        
         let vc = CNLiveGoodsCategoryController()
         vc.categoryType = .shop
@@ -87,15 +144,18 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         self.bgScrollView.frame = CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: KSreenHeight-KNavigationHeight-KTabBarHeight)
         var lastView:UIView? = nil
         for i in 0..<self.dataModel.list.count{
-            let singleView = self.view.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
-            singleView.frame = CGRect(x: 0, y: lastView?.bottom ?? 0, width: self.bgScrollView.width, height: singleView.height)
-            if i+1 == 15{
-                singleView.frame = CGRect(x: 0, y: lastView?.bottom ?? 0, width: self.bgScrollView.width, height: 0.001)
+            if let singleView = self.view.viewWithTag(i+1) as? CNLiveShopAddGoodsSingleView{
+                singleView.frame = CGRect(x: 0, y: lastView?.bottom ?? 0, width: self.bgScrollView.width, height: singleView.height)
+                if i+1 == 15{
+                    singleView.frame = CGRect(x: 0, y: lastView?.bottom ?? 0, width: self.bgScrollView.width, height: 0.001)
+                }
+                lastView = singleView
+            }else{
+                
             }
-            lastView = singleView
         }
         self.bgScrollView.contentSize = CGSize(width: self.bgScrollView.width, height: lastView?.bottom ?? 0)
-        self.selectCategoryVC?.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
+        self.selectCategoryVC!.view.frame = CGRect(x: 0, y: KNavigationHeight, width: self.view.width, height: self.view.height-KNavigationHeight)
     }
     deinit {
@@ -120,7 +180,6 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
             deleteNavBtn.setTitleColor(HexColor("#FC1541"), for: .normal)
             deleteNavBtn.addTarget(self, action: #selector(deleteNavBtnClick), for: .touchUpInside)
             self.rightNavBtns = [deleteNavBtn]
-            
         }
         self.initBottomView()
@@ -265,27 +324,11 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
     // MARK: - 显示选取分类界面
     func displaySelectCategoryVC(){
-        if self.selectCategoryVC == nil{
-            let vc = CNLiveGoodsCategoryController()
-            vc.categoryType = .goods
-            if self.shopGoodsDetailsModel.id?.count ?? 0 > 0{
-                vc.firCategoryId = self.shopGoodsDetailsModel.groupid
-                vc.secCategoryId = self.shopGoodsDetailsModel.groupid2
-                vc.thiCategoryId = self.shopGoodsDetailsModel.groupid3
-            }
-            vc.finishBlock = {
-                //商品分类
-                let singleView1 = self.bgScrollView.viewWithTag(1) as! CNLiveShopAddGoodsSingleView
-                singleView1.contentTextField.text = "\(self.selectCategoryVC?.firCategoryName ?? "") \(self.selectCategoryVC?.secCategoryName ?? "")"
-                singleView1.layoutSubviews()
-            }
-            self.addChild(vc)
-            vc.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
-            vc.didMove(toParent: self)
-            self.view.addSubview(vc.view)
-            self.selectCategoryVC = vc
-        }
-        self.selectCategoryVC?.display()
+//        self.addChild(self.selectCategoryVC!)
+//        self.selectCategoryVC!.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
+//        self.selectCategoryVC!.didMove(toParent: self)
+//        self.view.addSubview(self.selectCategoryVC!.view)
+        self.selectCategoryVC!.display()
     }
     // MARK: - 获取店铺分类view
@@ -316,7 +359,8 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
     // MARK: - BtnAction
     @objc func deleteNavBtnClick(){
         AlertTool.showSystemAlert(title: "确认删除？", message: nil, actionTitles: ["取消","确定"], style: .alert, actionStyles:[.cancel,.default] ) { index in
-            if (index == 1) {
+            //1取消 2确定
+            if (index == 2) {
                 showLoading(message: "")
                 CNLiveShopGoodListViewModel.postChangeGoodsStateWithGoodsId(goodsId: self.goodsId, state: "3") { result, status in
                     hiddenLoading()
@@ -331,7 +375,6 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
             }
         }
     }
-    
     @objc func previewBtnClick(){
         //商品轮播
@@ -496,7 +539,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
             contentDetailsImageStr = contentDetailsImageStr.replacingOccurrences(of: "\\", with: "")
             contentDetailsImageStr = contentDetailsImageStr.replacingOccurrences(of: " ", with: "")
         } catch _ {}
-        if self.type == .add && self.selectCategoryVC?.thiCategoryId == 0{
+        if self.type == .add && self.selectCategoryVC!.thiCategoryId == 0{
             showMessage(message: "请选择商品分类")
             return
         }else if self.selectShopClassifyVC.firCategoryId == 0{
@@ -593,7 +636,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         }
         showLoading(message: "")
         if self.type == .add{
-            CNLiveShopGoodListViewModel.postGoodsAddWithUid(uid: DSUserInfoManager.shared.dsUserInfo.uid!, groupid3: self.selectCategoryVC?.thiCategoryId != 0 ? String(format: "%d", self.selectCategoryVC?.thiCategoryId ?? 0) : "", bannerImg: bannerImageStr, simg: bannersSelectImageUrls.first!, video: bannerSelectVideoUrl, title: singleView5.contentTextField.text ?? "", ads: singleView6.contentTextView.text, price: singleView7.contentTextField.text ?? "", prices: singleView8.contentTextField.text ?? "", kg: singleView9.contentTextField.text ?? "", unit: singleView16.contentTextField.text ?? "", state: singleView11.contentSwitch.isOn ? "2" : "1", storage:self.dicArrayToJson(kvArray as [Dictionary<String, Any>]), infoImg: contentDetailsImageStr, yunfei: singleView14.contentTextField.text ?? "", min_count: singleView10.countTF.text ?? "", isRefund: "0", category_id: String(format: "%d", category_id)) { result, status in
+            CNLiveShopGoodListViewModel.postGoodsAddWithUid(uid: DSUserInfoManager.shared.dsUserInfo.uid!, groupid3: self.selectCategoryVC!.thiCategoryId != 0 ? String(format: "%d", self.selectCategoryVC!.thiCategoryId ) : "", bannerImg: bannerImageStr, simg: bannersSelectImageUrls.first!, video: bannerSelectVideoUrl, title: singleView5.contentTextField.text ?? "", ads: singleView6.contentTextView.text, price: singleView7.contentTextField.text ?? "", prices: singleView8.contentTextField.text ?? "", kg: singleView9.contentTextField.text ?? "", unit: singleView16.contentTextField.text ?? "", state: singleView11.contentSwitch.isOn ? "2" : "1", storage:self.dicArrayToJson(kvArray as [Dictionary<String, Any>]), infoImg: contentDetailsImageStr, yunfei: singleView14.contentTextField.text ?? "", min_count: singleView10.countTF.text ?? "", isRefund: "0", category_id: String(format: "%d", category_id)) { result, status in
                 hiddenLoading()
                 if status == .failed{
                     showMessage(message: "发布失败")
@@ -612,8 +655,21 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                 }
             }
         }else{
-            CNLiveShopGoodListViewModel.postGoodsAddWithUid(uid: DSUserInfoManager.shared.dsUserInfo.uid!, groupid3:self.selectCategoryVC?.thiCategoryId != 0 ? String(format: "%d", self.selectCategoryVC?.thiCategoryId ?? 0) : ""   , bannerImg: bannerImageStr, simg: bannersSelectImageUrls.first!, video: bannerSelectVideoUrl, title: singleView5.contentTextField.text ?? "", ads: singleView6.contentTextView.text ?? "", price: singleView7.contentTextField.text ?? "", prices: singleView8.contentTextField.text ?? "", kg: singleView9.contentTextField.text ?? "", unit: singleView16.contentTextField.text ?? "", state: singleView11.contentSwitch.isOn ? "2" : "1", storage: self.dicArrayToJson(kvArray as [Dictionary<String, Any>]), infoImg: contentDetailsImageStr, yunfei: singleView14.contentTextField.text ?? "", min_count: singleView10.countTF.text ?? "", isRefund: "0", category_id: String(format: "%d", category_id)) { result, status in
-                hiddenLoading()
+            //编辑
+            var kvArrayJSONStr = ""
+            do {
+                let jsonData = try JSONSerialization.data(withJSONObject: kvArray) // 将数组转换为JSON格式的NSData对象
+                
+                if let jsonString = String(data: jsonData, encoding: .utf8) {
+                    print("转换后的JSON字符串:\n\(jsonString)")
+                    kvArrayJSONStr = jsonString
+                } else {
+                    print("无法将JSON数据转换为字符串")
+                }
+            } catch {
+                print("发生错误：\(error)")
+            }
+            CNLiveShopGoodListViewModel.postGoodsEditWithGoodsId(goodsId: self.goodsId, uid: DSUserInfoManager.shared.dsUserInfo.uid!, bannerImg: bannerImageStr, simg: bannersSelectImageUrls.first!, video: bannerSelectVideoUrl, title: singleView5.contentTextField.text ?? "", ads: singleView6.contentTextView.text ?? "", price: singleView7.contentTextField.text ?? "", prices: singleView8.contentTextField.text ?? "", kg: singleView9.contentTextField.text ?? "", unit: singleView16.contentTextField.text ?? "", state: singleView11.contentSwitch.isOn ? "2" : "1", storage: kvArrayJSONStr, infoImg: contentDetailsImageStr, yunfei: singleView14.contentTextField.text ?? "", min_count: singleView10.countTF.text ?? "", isRefund: "0", category_id: String(format: "%d", category_id)) { result, status in
                 if status == .failed{
                     showMessage(message: "修改失败")
                     return
@@ -622,9 +678,10 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                     showMessage(message: "修改成功")
                     NotificationCenter.default.post(name: NSNotification.Name.ShopGoodsManage.kDSGoodsManageEditNotification, object: nil, userInfo: (result as! Dictionary))
                     for i in 0..<self.dataModel.list.count{
-                        let singleView = self.view.viewWithTag(i+1) as! CNLiveShopAddGoodsSingleView
-                        if singleView.addEditGoodsListModel?.style == "3"{
-                            singleView.uploadImageView.deleteReplaceImageUrlAfterSuccessUploadThings()
+                        if let singleView = self.view.viewWithTag(i+1) as? CNLiveShopAddGoodsSingleView{
+                            if singleView.addEditGoodsListModel?.style == "3"{
+                                singleView.uploadImageView.deleteReplaceImageUrlAfterSuccessUploadThings()
+                            }
                         }
                     }
                     self.navigationController?.popViewController(animated: true)
@@ -683,6 +740,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
             if status == .success{
                 let model = result as! CNLiveShopGoodsDetailsModel
                 self.shopGoodsDetailsModel = model
+                let thiCategoryId =  self.selectCategoryVC!.thiCategoryId
                 //商品分类
                 let singleView1 = self.bgScrollView.viewWithTag(1) as! CNLiveShopAddGoodsSingleView
                 //店铺分类
@@ -302,8 +302,8 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
     }
     @objc func goodsManageEditNotification(notification:Notification){
         let dict = (notification.userInfo ?? ["":""]) as! [String :Any]
-        let nModel = newDictionaryToModel(dict, CNLiveShopGoodsListModel.self) as! CNLiveShopGoodsListModel
-        var dataArr = Array(self.dataArray)
+        let nModel = newDictionaryToModel(dict["data"] as! [String : Any], CNLiveShopGoodsListModel.self) as! CNLiveShopGoodsListModel
+        let dataArr = Array(self.dataArray)
         for (idx,mdl) in dataArr.enumerated() {
             let model = mdl as! CNLiveShopGoodsListModel
@@ -318,7 +318,7 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
                 model.state = nModel.state
                 model.count = nModel.count
                 model.ord = nModel.ord
-                self.dataArray.replaceObject(at: idx, with: nModel)
+                self.dataArray.replaceObject(at: idx, with: model)
                 self.tableView.reloadData()
                 break
             }
@@ -351,12 +351,12 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
                 if self.pageNum == 1 {
                     self.dataArray.removeAllObjects()
-                    self.dataArray.addObjects(from: result as! [CNLiveShopGoodsListModel])
+                    self.dataArray.addObjects(from: arr)
                     if (self.dataArray.count > 0 && self.tableView.mj_header == nil && self.tableView.mj_footer == nil) {
                         self.addRefreshView()
                     }
                 }else if self.pageNum > 1 {
-                    self.dataArray.addObjects(from: result as! [CNLiveShopGoodsListModel])
+                    self.dataArray.addObjects(from: arr)
                 }
                 self.tableView.reloadData()
                 self.tableView.mj_header?.endRefreshing()
@@ -170,7 +170,7 @@ class CNFrontMainView : UIView{
                 frontCardContentView.isHidden = true
                 //显示textview 添加身份
                 frontDescContentView.isHidden = false
-                textView.text = newValue!.descriptions
+                textView.text = newValue!.description
                 addStandBtn.backgroundColor = HexColor(newValue!.backgroundColor)
                 textViewBgImgView.kf.setImage(with: URL(string: _idModel!.descBackgroundImg), placeholder: UIImage(named: "homepage_desc_bgImg"))
             }
@@ -93,7 +93,8 @@ class CNLiveShopGoodListViewModel:NSObject{
         CNLiveNetworking.setupDSRequest(true)
         CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/goodsAdd", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
-            if (error == nil) {
+            let res = (result as! Dictionary<String, Any>)["code"] as! String
+            if (error == nil && (res == "200" || res == "0")) {
                 resultBlock(result as Any,.success)
             }else{
                 resultBlock(NSNull(),.failed)
@@ -101,33 +102,6 @@ class CNLiveShopGoodListViewModel:NSObject{
         }
     }
-    // MARK: - 商品详情
-    /**
-     商品详情
-
-     @param goodsId 商品id
-     @param result 结果
-     */
-    static func getGoodsInfoWithGoodsId(goodsId:String,resultBlock: @escaping categoryResultBlock){
-        let param = NSMutableDictionary()
-        param.setValue(goodsId, forKey: "id")
-        
-        CNLiveNetworking.setAllowRequestDefaultArgument(true)
-        CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.setupDSRequest(true)
-        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/goodsInfo", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
-            hiddenLoading()
-            if (error == nil) {
-                let respDic = result as! NSDictionary
-                let resp = respDic["data"] as! NSDictionary
-                let model =  newDictionaryToModel(resp as! [String : Any], CNLiveShopGoodsDetailsModel.self) as! CNLiveShopGoodsDetailsModel
-                resultBlock(model,.success)
-            }else{
-                resultBlock(NSNull(),.failed)
-            }
-        }
-    }
-    
     /// 商品修改
     /// @param goodsId 商品id
     /// @param uid 用户id
@@ -148,8 +122,8 @@ class CNLiveShopGoodListViewModel:NSObject{
     /// @param isRefund 是否可退 0可以退 1不可退
     /// @param category_id 店铺分类id,选中了二级分类,传二级分类的id,没选二级分类就传一级分类的id
     /// @param result 结果
+    /// 
     static func postGoodsEditWithGoodsId(goodsId:String,uid:String,bannerImg:String,simg:String,video:String,title:String,ads:String,price:String,prices:String,kg:String,unit:String,state:String,storage:String,infoImg:String,yunfei:String,min_count:String,isRefund:String,category_id:String,resultBlock: @escaping downSlideResultBlock){
-        
         let param = NSMutableDictionary()
         param.setValue(goodsId, forKey: "id")
         param.setValue(uid, forKey: "uid")
@@ -175,7 +149,8 @@ class CNLiveShopGoodListViewModel:NSObject{
         CNLiveNetworking.setupDSRequest(true)
         CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/goodsEdit", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
-            if (error == nil) {
+            let res = (result as! Dictionary<String, Any>)["code"] as! String
+            if (error == nil && (res == "200" || res == "0")) {
                 resultBlock(result as Any,.success)
             }else{
                 resultBlock(NSNull(),.failed)
@@ -183,6 +158,33 @@ class CNLiveShopGoodListViewModel:NSObject{
         }
     }
+    // MARK: - 商品详情
+    /**
+     商品详情
+
+     @param goodsId 商品id
+     @param result 结果
+     */
+    static func getGoodsInfoWithGoodsId(goodsId:String,resultBlock: @escaping categoryResultBlock){
+        let param = NSMutableDictionary()
+        param.setValue(goodsId, forKey: "id")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/goodsInfo", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let respDic = result as! NSDictionary
+                let resp = respDic["data"] as! NSDictionary
+                let model =  newDictionaryToModel(resp as! [String : Any], CNLiveShopGoodsDetailsModel.self) as! CNLiveShopGoodsDetailsModel
+                resultBlock(model,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
+    
     /// 商品单个属性修改
     /// @param shopId 商家id
     /// @param goodsId 商品id
@@ -143,7 +143,7 @@ final class StandListModel: BaseModel {//, TableCodable {
     var backgroundImg: String = ""//首页背景图-
     var backgroundColor: String = ""//添加身份按钮背景色-
     var backgroundColour: String = ""//-
-    var descriptions: String = ""//首页身份说明描述-
+    var description: String = ""//首页身份说明描述-
     var descBackgroundImg: String = ""//首页文字背景图
     var cardImg: String = ""//卡片背景图-
     var cardBackgroundImg: String = ""//首页卡片背景图