订单详情完

RainbowPlanet/RainbowPlanet/Modules/MineModule/ExpressAddressList/ViewController/ExpressAddressListViewController.swift

@@ -71,7 +71,7 @@ class ExpressAddressListViewController: BaseViewController {
     
     /// 获取地址列表
     func userExpressAddressListApi() {
-        SwiftMoyaNetWorkServiceUser.shared().userSelfAndExpressAddressListApi(type: 1) {
+        SwiftMoyaNetWorkServiceUser.shared().userSelfAndExpressAddressListApi(type: 2) {
             
             [weak self] (addressManagerListModel) -> (Void) in
            self?.addressManagerListModel = (addressManagerListModel as! AddressManagerListModel)

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/ViewController/OrderListViewController.swift

@@ -17,6 +17,18 @@ class OrderListViewController: UIViewController {
     var orderVCType : OrderVCType?
     var orderModelArray = Array<OrderModel>()
     
+    var change : Bool? {
+        didSet {
+            orderPurchaseOrderListApi(page:1)
+        }
+    }
+    
+    typealias SetButtonBlock = (_ button:UIButton,_ orderModel:OrderModel) -> Void
+    var setButtonBlock : SetButtonBlock?
+    
+    typealias DidSelectBlock = (_ orderModel:OrderModel) -> Void
+    var didSelectBlock : DidSelectBlock?
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()
@@ -47,6 +59,7 @@ class OrderListViewController: UIViewController {
     }
     
     func orderPurchaseOrderListApi(page:Int = 1) {
+        
         SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseOrderListApi(page: page, status: orderVCType.map { $0.rawValue } ?? -1) {
             [weak self] (orderListModel) -> (Void) in
             let orderListModel = orderListModel as? OrderListModel
@@ -65,33 +78,8 @@ class OrderListViewController: UIViewController {
     
     func setButton(button:UIButton,indexPath:IndexPath) {
         let orderModel = orderModelArray[indexPath.section]
-        if button.titleLabel?.text == "去付款" {
-            
-        }
-        if button.titleLabel?.text == "取消订单" {
-            
-        }
-        if button.titleLabel?.text == "确认收货" {
-            
-        }
-        if button.titleLabel?.text == "查看物流" {
-            
-        }
-        if button.titleLabel?.text == "退款详情" {
-            let vc = OrderRefunddetailsViewController()
-            vc.refundNo = orderModel.refundNo
-            self.navigationController?.pushViewController(vc, animated: true)
-        }
-        if button.titleLabel?.text == "去评价" {
-            
-        }
-        if button.titleLabel?.text == "再次购买" {
-            let vc = ShopViewController()
-            vc.shopId = orderModel.shopId
-            self.navigationController?.pushViewController(vc, animated: true)
-        }
-        if button.titleLabel?.text == "申请退款" {
-            
+        if let setButtonBlock = setButtonBlock {
+            setButtonBlock(button,orderModel)
         }
     }
     
@@ -321,10 +309,13 @@ extension OrderListViewController : UITableViewDelegate, UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
         let orderModel = orderModelArray[indexPath.section]
-        let vc = OrderDetailViewController()
-        vc.orderModel = orderModel
-        self.navigationController?.pushViewController(vc, animated: true)
+        if indexPath.row == 0 {
+            if let didSelectBlock = didSelectBlock {
+                didSelectBlock(orderModel)
+            }
+        }
     }
     
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/ViewController/OrderViewController.swift

@@ -145,7 +145,54 @@ extension OrderViewController :JXSegmentedListContainerViewDataSource {
     }
     func listContainerView(_ listContainerView: JXSegmentedListContainerView, initListAt index: Int) -> JXSegmentedListContainerViewListDelegate {
         let vc = OrderListViewController()
-        vc.orderVCType? = OrderVCType(rawValue: index-1)!
+        vc.orderVCType = OrderVCType(rawValue: index-1)
+        vc.setButtonBlock = {
+            [weak self] (button,orderModel) in
+            self?.setButton(button: button, orderModel: orderModel)
+        }
+        
+        vc.didSelectBlock = {
+            [weak self] (orderModel) in
+            let orderDetailVC = OrderDetailViewController()
+            orderDetailVC.orderModel = orderModel
+            orderDetailVC.cancelOrderClosure = {
+                vc.change = true
+            }
+            self?.navigationController?.pushViewController(orderDetailVC, animated: true)
+        }
         return vc
     }
+    
+    func setButton(button:UIButton,orderModel:OrderModel) {
+        if button.titleLabel?.text == "去付款" {
+            
+        }
+        if button.titleLabel?.text == "取消订单" {
+            let vc = OrderApplyRefundController()
+            vc.orderModel = orderModel
+            self.navigationController?.pushViewController(vc, animated: true)
+        }
+        if button.titleLabel?.text == "确认收货" {
+            
+        }
+        if button.titleLabel?.text == "查看物流" {
+            
+        }
+        if button.titleLabel?.text == "退款详情" {
+            let vc = OrderRefunddetailsViewController()
+            vc.refundNo = orderModel.refundNo
+            self.navigationController?.pushViewController(vc, animated: true)
+        }
+        if button.titleLabel?.text == "去评价" {
+            
+        }
+        if button.titleLabel?.text == "再次购买" {
+            let vc = ShopViewController()
+            vc.shopId = orderModel.shopId
+            self.navigationController?.pushViewController(vc, animated: true)
+        }
+        if button.titleLabel?.text == "申请退款" {
+            
+        }
+    }
 }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderApplyRefund/ViewController/OrderApplyRefundController.swift

@@ -11,6 +11,8 @@ import RxSwift
 
 class OrderApplyRefundController: BaseViewController {
     
+    var orderModel: OrderModel?
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/View/OrderDetailBottomView.swift

@@ -88,52 +88,52 @@ class OrderDetailBottomView: BaseView {
         didSet {
             switch orderModel?.status {
             case 0: //待付款
-                leftButton.isHidden = true
+                leftButton.isHidden = false
                 leftButton.setTitle("取消订单", for: UIControl.State.normal)
                 leftButton.setTitleColor(k333333Color, for: UIControl.State.normal)
                 
-                oneButton.isHidden = true
+                oneButton.isHidden = false
                 oneButton.setTitle("去付款", for: UIControl.State.normal)
                 oneButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
                 oneButton.backgroundColor = kFFA42FColor
             case 1,3,4: //待发货/配送中/待自提
-                leftButton.isHidden = true
+                leftButton.isHidden = false
                 leftButton.setTitle("申请退款", for: UIControl.State.normal)
                 leftButton.setTitleColor(k333333Color, for: UIControl.State.normal)
                 
-                oneButton.isHidden = true
+                oneButton.isHidden = false
                 oneButton.setTitle("再次购买", for: UIControl.State.normal)
                 oneButton.setTitleColor(k333333Color, for: UIControl.State.normal)
                 oneButton.backgroundColor = UIColor.white
                 oneButton.layer.borderColor = k333333Color.cgColor
                 oneButton.layer.borderWidth = 1
             case 2: //待收货
-                leftButton.isHidden = true
+                leftButton.isHidden = false
                 leftButton.setTitle("申请退款", for: UIControl.State.normal)
                 leftButton.setTitleColor(k333333Color, for: UIControl.State.normal)
                 
-                oneButton.isHidden = true
+                oneButton.isHidden = false
                 oneButton.setTitle("确认收货", for: UIControl.State.normal)
                 oneButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
                 oneButton.backgroundColor = kFFA42FColor
                 
-                twoButton.isHidden = true
+                twoButton.isHidden = false
                 twoButton.setTitle("查看物流", for: UIControl.State.normal)
                 twoButton.setTitleColor(k333333Color, for: UIControl.State.normal)
                 twoButton.backgroundColor = UIColor.white
                 twoButton.layer.borderColor = k333333Color.cgColor
                 twoButton.layer.borderWidth = 1
             case 5: //已自提
-                leftButton.isHidden = true
+                leftButton.isHidden = false
                 leftButton.setTitle("申请退款", for: UIControl.State.normal)
                 leftButton.setTitleColor(k333333Color, for: UIControl.State.normal)
                 
-                oneButton.isHidden = true
+                oneButton.isHidden = false
                 oneButton.setTitle("确认收货", for: UIControl.State.normal)
                 oneButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
                 oneButton.backgroundColor = kFFA42FColor
                 
-                twoButton.isHidden = true
+                twoButton.isHidden = false
                 twoButton.setTitle("再次购买", for: UIControl.State.normal)
                 twoButton.setTitleColor(k333333Color, for: UIControl.State.normal)
                 twoButton.backgroundColor = UIColor.white
@@ -141,19 +141,19 @@ class OrderDetailBottomView: BaseView {
                 twoButton.layer.borderWidth = 1
             case 6: //已完成
 
-                oneButton.isHidden = true
+                oneButton.isHidden = false
                 oneButton.setTitle("去评价", for: UIControl.State.normal)
                 oneButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
                 oneButton.backgroundColor = kFFA42FColor
                 
-                twoButton.isHidden = true
+                twoButton.isHidden = false
                 twoButton.setTitle("再次购买", for: UIControl.State.normal)
                 twoButton.setTitleColor(k333333Color, for: UIControl.State.normal)
                 twoButton.backgroundColor = UIColor.white
                 twoButton.layer.borderColor = k333333Color.cgColor
                 twoButton.layer.borderWidth = 1
             case 7: //已关闭
-                oneButton.isHidden = true
+                oneButton.isHidden = false
                 oneButton.setTitle("再次购买", for: UIControl.State.normal)
                 oneButton.setTitleColor(k333333Color, for: UIControl.State.normal)
                 oneButton.backgroundColor = UIColor.white

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/View/OrderDetailContactAddressTableViewCell.swift

@@ -53,15 +53,16 @@ class OrderDetailContactAddressTableViewCell: UITableViewCell {
             make.right.equalTo(-14)
             make.height.equalTo(21)
         }
-        addressTitleLabel.snp.remakeConstraints { (make) in
+        addressTitleLabel.snp.makeConstraints { (make) in
             make.top.equalTo(contactLabel.snp.bottom).offset(8)
             make.left.equalTo(contactLabel)
-            make.width.greaterThanOrEqualTo(10)
+            make.width.equalTo(65)
         }
-        addressContentLabel.snp.makeConstraints { (make) in
+        addressContentLabel.snp.remakeConstraints { (make) in
             make.top.equalTo(addressTitleLabel)
             make.left.equalTo(addressTitleLabel.snp.right)
-            make.right.bottom.equalTo(-14)
+            make.bottom.equalTo(-14)
+            make.right.equalTo(-14)
         }
     }
     
@@ -89,6 +90,7 @@ class OrderDetailContactAddressTableViewCell: UITableViewCell {
         let addressContentLabel = UILabel()
         addressContentLabel.textColor = k666666Color
         addressContentLabel.font = kRegularFont13
+        addressContentLabel.numberOfLines = 0
         return addressContentLabel
     }()
     

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/View/OrderDetailInfoTableViewCell.swift

@@ -56,7 +56,9 @@ class OrderDetailInfoTableViewCell: UITableViewCell {
         }
         copyButton.snp.makeConstraints { (make) in
             make.centerY.equalTo(titleLabel)
+            make.height.equalTo(16)
             make.right.equalTo(-14)
+            make.width.equalTo(40)
         }
     }
     
@@ -82,12 +84,14 @@ class OrderDetailInfoTableViewCell: UITableViewCell {
         copyButton.titleLabel?.font = kRegularFont12
         copyButton.cornerRadius = 8
         copyButton.masksToBounds = true
-        copyButton.layer.borderColor = k333333Color.cgColor
+        copyButton.isHidden = true
+        copyButton.layer.borderColor = kbfbfbfColor.cgColor
         copyButton.layer.borderWidth = 1
         copyButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
             let pasteboard = UIPasteboard.general
             pasteboard.string = self?.contents?[0]
+            SwiftProgressHUD.shared().showText("复制成功")
         }).disposed(by: disposeBag)
         return copyButton
     }()
@@ -95,16 +99,17 @@ class OrderDetailInfoTableViewCell: UITableViewCell {
     var titles : [String]? {
         didSet {
             titleLabel.text = titles?[(indexPath?.row)!]
-            if indexPath?.row == 0 {
-                copyButton.isHidden = true
-            }else {
-                copyButton.isHidden = false
-            }
+
         }
     }
     
     var contents : [String]? {
         didSet {
+            if indexPath?.row == 0 {
+                copyButton.isHidden = false
+            }else {
+                copyButton.isHidden = true
+            }
             contentLabel.text = contents?[(indexPath?.row)!]
         }
     }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/ViewController/OrderDetailViewController.swift

@@ -10,10 +10,13 @@ import UIKit
 
 class OrderDetailViewController: BaseViewController {
     
-    var orderModel : OrderModel? = nil
+    var orderModel : OrderModel?
     
     var orderDetailModel : OrderModel?
     
+    typealias CancelOrderClosure = () -> Void
+    var cancelOrderClosure : CancelOrderClosure?
+    
     var titles = ["订单编码","下单时间","支付时间","支付方式","订单备注"]
     
     var contents = ["","","","",""]
@@ -34,8 +37,9 @@ class OrderDetailViewController: BaseViewController {
     
     override func setupLayouts() {
         orderDetailBottomView.snp.makeConstraints { (make) in
-            make.left.bottom.right.equalToSuperview()
+            make.left.right.equalToSuperview()
             make.height.equalTo(48)
+            make.bottom.equalTo(-kSafeTabBarHeight)
         }
         tableView.snp.makeConstraints { (make) in
             make.top.equalTo(kNavBarTotalHeight)
@@ -87,7 +91,13 @@ class OrderDetailViewController: BaseViewController {
             
         }
         if button.titleLabel?.text == "取消订单" {
-            
+            SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseCloseApi(patchNum: self.orderDetailModel?.patchNum ?? "") {
+                [weak self] (data) -> (Void) in
+                if let cancelOrderClosure = self?.cancelOrderClosure {
+                    cancelOrderClosure()
+                }
+                self?.navigationController?.popViewController(animated: true)
+            }
         }
         if button.titleLabel?.text == "确认收货" {
             
@@ -144,15 +154,15 @@ extension OrderDetailViewController : UITableViewDelegate, UITableViewDataSource
             return 2
         case 1:
             if self.orderDetailModel?.deliverType == 1 { //自提
-                return 1
-            }else { // 快递
                 return 2
+            }else { // 快递
+                return 1
             }
         case 2:
             if self.orderDetailModel?.detail?.isEmpty ?? true {
-                return 2
+                return 0
             }else {
-                return 2 + (self.orderDetailModel?.detail?.count)!
+                return 2 + (self.orderDetailModel?.detail?.count ?? 0)
             }
         case 3:
             switch self.orderDetailModel?.status {
@@ -197,7 +207,7 @@ extension OrderDetailViewController : UITableViewDelegate, UITableViewDataSource
             default:
                 let detail = self.orderDetailModel?.detail
                 let cell = OrderProductTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
-                cell.orderModelDetailModel = detail?[indexPath.row]
+                cell.orderModelDetailModel = detail?[indexPath.row - 1]
                 return cell
             }
         case 3:
@@ -226,7 +236,7 @@ extension OrderDetailViewController : UITableViewDelegate, UITableViewDataSource
             switch indexPath.row {
             case 0:
                 return 43
-            case detail!.count + 1:
+            case detail?.count ?? 0 + 1:
                 return 112
             default:
                 return 40

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCartPayOrder/ViewController/ShoppingCartPayOrderController.swift

@@ -116,6 +116,7 @@ class ShoppingCartPayOrderController: BaseViewController {
     
     // 创建订单
     func orderCreateApi(paraMdl: OrderCreateParameterModel) {
+        
         SwiftMoyaNetWorkServiceOrder.shared().orderCreateApi(paraMdl: paraMdl) { (orderBackModel) -> (Void) in
             // 弹出支付方式View
             AlertSheetView.payAlertSheetView(cancelClosure: {

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceOrder/SwiftMoyaNetWorkServiceOrder.swift

@@ -104,7 +104,7 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
     ///   - completion: 回调
     func orderPurchaseDetailApi(purchaseNo:String = "",completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
-        parameters.updateValue(purchaseNo, forKey: "search_status")
+        parameters.updateValue(purchaseNo, forKey: "purchase_no")
         SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkManager.shared().request(OrderModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseDetail(parameters: parameters))) { (orderModel) in
             SwiftProgressHUD.shared().hide()
@@ -170,4 +170,20 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
 //        }
     }
     
+    // MARK: - 关闭订单
+    /// 关闭订单
+    ///
+    /// - Parameters:
+    ///   - patchNumN: 批次号
+    ///   - completion: 回调
+    func orderPurchaseCloseApi(patchNum:String = "",completion: @escaping apiCallBack) {
+        var parameters = Dictionary<String,Any>()
+        parameters.updateValue(patchNum, forKey: "patch_num")
+        SwiftProgressHUD.shared().showWait()
+        SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseClose(parameters: parameters))) { (data) in
+            SwiftProgressHUD.shared().showText("取消成功")
+            completion("")
+        }
+    }
+    
 }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceOrder/SwiftMoyaServiceOrderApi.swift

@@ -33,6 +33,9 @@ public let kOrderPurchaseRefundApi = "/order/purchase/refund"
 /// 确认收货
 public let kOrderPurchaseConfirmApi = "/order/purchase/confirm"
 
+// MARK: - 关闭订单
+/// 关闭订单
+public let kOrderPurchaseCloseApi = "/order/purchase/close"
 
 
 /// 商品
@@ -43,6 +46,7 @@ public let kOrderPurchaseConfirmApi = "/order/purchase/confirm"
 /// - orderPurchaseRefundDetail: 订单退款详情
 /// - orderPurchaseRefund: 申请退款
 /// - orderPurchaseConfirm: 确认收货
+/// - orderPurchaseClose: 关闭订单
 public enum SwiftMoyaServiceOrderApi {
     case orderCreate(parameters:Dictionary<String, Any>)
     case orderPurchaseOrderList(parameters:Dictionary<String, Any>)
@@ -50,6 +54,7 @@ public enum SwiftMoyaServiceOrderApi {
     case orderPurchaseRefundDetail(parameters:Dictionary<String, Any>)
     case orderPurchaseRefund(parameters:Dictionary<String, Any>)
     case orderPurchaseConfirm(parameters:Dictionary<String, Any>)
+    case orderPurchaseClose(parameters:Dictionary<String, Any>)
 }
 
 extension SwiftMoyaServiceOrderApi: TargetType {
@@ -61,7 +66,8 @@ extension SwiftMoyaServiceOrderApi: TargetType {
              .orderPurchaseDetail,
              .orderPurchaseRefundDetail,
              .orderPurchaseRefund,
-             .orderPurchaseConfirm
+             .orderPurchaseConfirm,
+             .orderPurchaseClose
             :
             return URL(string: kApiDataPrefix())!
         }
@@ -81,6 +87,8 @@ extension SwiftMoyaServiceOrderApi: TargetType {
             return kOrderPurchaseRefundApi
         case .orderPurchaseConfirm:
             return kOrderPurchaseConfirmApi
+        case .orderPurchaseClose:
+            return kOrderPurchaseCloseApi
         }
     }
     
@@ -90,7 +98,8 @@ extension SwiftMoyaServiceOrderApi: TargetType {
             :
             return .post
         case .orderPurchaseRefund,
-             .orderPurchaseConfirm
+             .orderPurchaseConfirm,
+             .orderPurchaseClose
             :
             return .put
         case .orderPurchaseOrderList,
@@ -109,8 +118,8 @@ extension SwiftMoyaServiceOrderApi: TargetType {
              .orderPurchaseDetail(var parameters),
              .orderPurchaseRefundDetail(var parameters),
              .orderPurchaseRefund(var parameters),
-             .orderPurchaseConfirm(var parameters)
-            
+             .orderPurchaseConfirm(var parameters),
+             .orderPurchaseClose(var parameters)
             :
             let sign = SwiftSign.shared().sign(signType:.AccessToken, parameters: parameters)
             parameters.updateValue(sign, forKey: "sign")
@@ -138,7 +147,8 @@ extension SwiftMoyaServiceOrderApi: TargetType {
              .orderPurchaseDetail,
              .orderPurchaseRefundDetail,
              .orderPurchaseRefund,
-             .orderPurchaseConfirm
+             .orderPurchaseConfirm,
+             .orderPurchaseClose
             :
             return (headerParameters(headerType: .tokenHeader) as! [String : String])
         }

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

@@ -139,8 +139,7 @@ extension SwiftMoyaServiceProductApi: TargetType {
     
     public var method: Moya.Method {
         switch self {
-        case .productHomeProduct,
-             .productCartAdd
+        case.productCartAdd
             :
             return .post
         case .productCartAmount,
@@ -148,7 +147,8 @@ extension SwiftMoyaServiceProductApi: TargetType {
              .productCartAllSel
             :
             return .put
-        case .productSearch,
+        case .productHomeProduct,
+             .productSearch,
              .productCategory,
              .productCartList,
              .productDetail,

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/SwiftMoyaNetWorkManager.swift

@@ -16,7 +16,7 @@ import RxCocoa
 import Result
 
 /// 超时时长
-private var requestTimeOut:Double = 10
+private var requestTimeOut:Double = 20
 
 ///网络请求的基本设置,这里可以拿到是具体的哪个网络请求，可以在这里做一些设置
 private let myEndpointClosure = { (target: MultiTarget) -> Endpoint in