1.商户详情页商品信息列表应按照商品添加时间倒序排列

2.我的订单-全部订单列表页缺少刷新功能

RainbowPlanet/RainbowPlanet/Manager/PayManager/PayManagerPay/PayManagerPay.swift

@@ -61,6 +61,9 @@ class PayManagerPay: NSObject {
         orderFinishPayVC.reloadClosure = {
             [weak self] in
             if let reloadClosure = self?.reloadClosure {
+                if orderFinishPayVCType == .order || orderFinishPayVCType == .orderDetail {
+                    kOrderVCTypeAlliSRefresh = true
+                }
                 reloadClosure()
             }
         }

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

@@ -10,6 +10,8 @@ import UIKit
 import JXSegmentedView
 import RxSwift
 
+public var kOrderVCTypeAlliSRefresh : Bool = false 
+
 class OrderListViewController: UIViewController {
     
     deinit {
@@ -375,6 +377,38 @@ extension OrderListViewController : UITableViewDelegate, UITableViewDataSource {
 
 extension OrderListViewController : JXSegmentedListContainerViewListDelegate {
     func listView() -> UIView {
+        
         return view
     }
+    
+    func listDidAppear() {
+        if self.orderVCType == .all && kOrderVCTypeAlliSRefresh {
+            orderPurchaseOrderListApiAll()
+        }
+    }
+    
+    /// 订单列表
+    ///
+    /// - Parameter page: <#page description#>
+    func orderPurchaseOrderListApiAll(page:Int = 1) {
+        
+        SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseOrderListApi(page: page, status: -1) {
+            [weak self] (orderListModel) -> (Void) in
+            let orderListModel = orderListModel as? OrderListModel
+            if orderListModel?.pagination?.currentPage ?? 1  <= orderListModel?.pagination?.totalPages ?? 1 {
+                if orderListModel?.pagination?.currentPage == 1{
+                    self?.orderModelArray.removeAll()
+                    self?.orderListView.tableView.resetNoMoreData()
+                }
+                self?.orderModelArray = (self?.orderModelArray)! + (orderListModel?.data!)!
+                self?.orderListView.tableView.reloadData()
+                if self?.orderModelArray.isEmpty ?? true {
+                    self?.orderListView.tableView.isHiddenFooter(true)
+                }
+            }else {
+                self?.orderListView.tableView.endFooterNoMoreData()
+            }
+            kOrderVCTypeAlliSRefresh = false
+        }
+    }
 }

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

@@ -52,6 +52,7 @@ class OrderViewController: BaseViewController {
     }
     
     override func setupLayouts() {
+        
         segmentedView.snp.makeConstraints { (make) in
             make.left.right.equalToSuperview()
             make.height.equalTo(44)
@@ -69,7 +70,6 @@ class OrderViewController: BaseViewController {
             [weak self] (notification) in
             self?.orderListViewController?.orderPurchaseOrderListApi(page: 1)
         }
-
     }
     
     //1.初始化JXSegmentedView
@@ -215,6 +215,7 @@ extension OrderViewController :JXSegmentedListContainerViewDataSource {
             let vc1 = OrderCommentController()
             vc1.orderDetailModel = orderModel
             vc1.commentSuccessedBlock = {
+                kOrderVCTypeAlliSRefresh = true
                 vc.orderPurchaseOrderListApi(page: 1)
             }
             self.navigationController?.pushViewController(vc1, animated: true)
@@ -236,7 +237,7 @@ extension OrderViewController :JXSegmentedListContainerViewDataSource {
         
         AlertSheetView.alert(title: "是否取消订单", cancelTitle: "取消", sureTitle: "确定", cancelBlock: nil) { (popupView, index, str) in
             SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseCloseApi(patchNum: orderModel.patchNum ?? "") { (data) -> (Void) in
-                NotificationCenter.default.post(name: NSNotification.Name("OrderListVCAll"), object: self)
+                kOrderVCTypeAlliSRefresh = true
                 vc.orderPurchaseOrderListApi(page: 1)
             }
         }
@@ -247,6 +248,7 @@ extension OrderViewController :JXSegmentedListContainerViewDataSource {
     func orderPurchaseConfirmApi(orderModel:OrderModel,vc: OrderListViewController) {
         AlertSheetView.alert(title: "是否确认收货", cancelTitle: "取消", sureTitle: "确定", cancelBlock: nil) { (popupView, index, str) in
             SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseConfirmApi(purchaseId: orderModel.id ?? 0) { (data) -> (Void) in
+                kOrderVCTypeAlliSRefresh = true
                 vc.orderPurchaseOrderListApi(page: 1)
             }
         }

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

@@ -126,6 +126,7 @@ class OrderDetailViewController: BaseViewController {
                 SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseCloseApi(patchNum: self?.orderDetailModel?.patchNum ?? "") {
                     [weak self] (data) -> (Void) in
                     self?.isChange = true
+                    kOrderVCTypeAlliSRefresh = true
                     self?.orderPurchaseDetailApi()
                 }
             }
@@ -134,6 +135,7 @@ class OrderDetailViewController: BaseViewController {
             AlertSheetView.alert(title: "是否确认收货", cancelTitle: "取消", sureTitle: "确定", cancelBlock: nil) { [weak self] (popupView, index, str) in
                 SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseConfirmApi(purchaseId: self?.orderDetailModel?.id ?? 0) {
                     [weak self] (data) -> (Void) in
+                    kOrderVCTypeAlliSRefresh = true
                     self?.orderPurchaseDetailApi()
                 }
             }
@@ -154,6 +156,7 @@ class OrderDetailViewController: BaseViewController {
             vc.orderDetailModel = self.orderDetailModel
             vc.commentSuccessedBlock = {
                 [weak self] in
+                kOrderVCTypeAlliSRefresh = true
                 self?.orderPurchaseDetailApi()
             }
             self.navigationController?.pushViewController(vc, animated: true)

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductDetail/ViewController/ProductDetailViewController.swift

@@ -138,7 +138,7 @@ class ProductDetailViewController: BaseViewController {
     
     /// 获取商家商品列表
     private func productListApi() {
-        SwiftMoyaNetWorkServiceProduct.shared().productListApi(page: 1, shopId: shopId ?? 0,desc: 1, fieldOrder: 1) {
+        SwiftMoyaNetWorkServiceProduct.shared().productListApi(page: 1, shopId: shopId ?? 0,desc: 1, fieldOrder: 0) {
             [weak self] (productListModel) -> (Void) in
             let productSearchListModel = productListModel as? ProductSearchListModel
             self?.productDetailView.productSearchListModel = productSearchListModel

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Shop/View/ShopSectionHeaderModel.swift

@@ -12,4 +12,5 @@ class ShopSectionHeaderModel: NSObject {
     var priceState : Int = 0 // 0默认,1down,2up
     var salesState : Int = 0 // 0默认,1down,2up
     var state : Int = 0 // 0默认,1down,2up
+    var fieldOrder : Int = 0 // 默认,1.销量,2,价格
 }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Shop/View/ShopSectionHeaderView.swift

@@ -45,14 +45,19 @@ class ShopSectionHeaderView: BaseView {
 
             if self?.shopSectionHeaderModel?.priceState == 0 && self?.shopSectionHeaderModel?.salesState == 0 {
                 self?.shopSectionHeaderModel?.priceState = 1
+                self?.shopSectionHeaderModel?.fieldOrder = 2
+
             }else if self?.shopSectionHeaderModel?.priceState == 1 && self?.shopSectionHeaderModel?.salesState == 0 {
                 self?.shopSectionHeaderModel?.priceState = 2
+                self?.shopSectionHeaderModel?.fieldOrder = 2
+
             }else if self?.shopSectionHeaderModel?.priceState == 2 && self?.shopSectionHeaderModel?.salesState == 0 {
                 self?.shopSectionHeaderModel?.priceState = 0
+                self?.shopSectionHeaderModel?.fieldOrder = 0
             }
             self?.shopSectionHeaderModel?.state = (self?.shopSectionHeaderModel?.priceState)!
 
-            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "ShopVCDesc"), object: self?.shopSectionHeaderModel?.priceState, userInfo: ["desc":self?.shopSectionHeaderModel as Any,"field_order":2])
+            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "ShopVCDesc"), object: self?.shopSectionHeaderModel?.priceState, userInfo: ["desc":self?.shopSectionHeaderModel as Any,"field_order":self?.shopSectionHeaderModel?.fieldOrder as Any])
 
         }).disposed(by: disposeBag)
         return priceButton
@@ -70,14 +75,17 @@ class ShopSectionHeaderView: BaseView {
 
             if self?.shopSectionHeaderModel?.priceState == 0 && self?.shopSectionHeaderModel?.salesState == 0 {
                 self?.shopSectionHeaderModel?.salesState = 1
+                self?.shopSectionHeaderModel?.fieldOrder = 1
             } else if self?.shopSectionHeaderModel?.priceState == 0 && self?.shopSectionHeaderModel?.salesState == 1 {
                 self?.shopSectionHeaderModel?.salesState = 2
+                self?.shopSectionHeaderModel?.fieldOrder = 1
             } else if self?.shopSectionHeaderModel?.priceState == 0 && self?.shopSectionHeaderModel?.salesState == 2 {
                 self?.shopSectionHeaderModel?.salesState = 0
+                self?.shopSectionHeaderModel?.fieldOrder = 0
             }
             self?.shopSectionHeaderModel?.state = (self?.shopSectionHeaderModel?.salesState)!
             
-            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "ShopVCDesc"), object: self?.shopSectionHeaderModel?.salesState, userInfo: ["desc":self?.shopSectionHeaderModel as Any,"field_order":1])
+            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "ShopVCDesc"), object: self?.shopSectionHeaderModel?.salesState, userInfo: ["desc":self?.shopSectionHeaderModel as Any,"field_order":self?.shopSectionHeaderModel?.fieldOrder as Any])
         }).disposed(by: disposeBag)
         return salesVolumeButton
     }()

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Shop/ViewController/ShopViewController.swift

@@ -13,7 +13,7 @@ class ShopViewController: BaseViewController {
     var shopId : Int?
     var productSearchModelArray = Array<ProductSearchModel>()
     
-    var fieldOrder : Int = 2
+    var fieldOrder : Int = 0
     var shopSectionHeaderModel = ShopSectionHeaderModel()
     
     override func viewDidLoad() {