fix: 订单提交流程优化

Author: fancymax

12306ForMac/Service/Service+Order.swift

@@ -67,8 +67,8 @@ extension Service{
     }
 
     func orderFlowWithRandCode(_ randCodeStr:String,success:@escaping ()->Void,failure:@escaping (NSError)->Void,wait:@escaping (String)->Void){
-        self.checkRandCodeForOrder(randCodeStr).then{_ -> Promise<Bool> in
-            return self.checkOrderInfo(randCodeStr)
+        self.checkOrderInfo(randCodeStr).then{_ -> Promise<Void> in
+            return self.checkRandCodeForOrder(randCodeStr)
         }.then{_ -> Promise<Void> in
             return self.getQueueCount(wait)
         }.then{_ -> Promise<Void> in
@@ -487,7 +487,7 @@ extension Service{
                     }
                     let warningStr = ticketQueueCount.getWarningInfoBy(MainModel.selectPassengers[0].seatCodeName)
                     if ticketQueueCount.isTicketSoldOut() {
-                        reject(ServiceError.errorWithCode(.confirmSingleForQueueFailed, failureReason: warningStr))
+                        reject(ServiceError.errorWithCode(.getQueueCountFailed, failureReason: warningStr))
                     }
                     else {
                         if warningStr != "" {
@@ -585,17 +585,18 @@ extension Service{
                             }
                             else {
                                 if let msg = waitTimeResult.msg {
-                                    let error = ServiceError.errorWithCode(.confirmSingleForQueueFailed,failureReason: msg)
+                                    let error = ServiceError.errorWithCode(.queryOrderWaitTimeFailed,failureReason: msg)
                                     failMethod(error)
                                 }
                                 else {
-                                    let error = ServiceError.errorWithCode(.confirmSingleForQueueFailed)
+                                    let error = ServiceError.errorWithCode(.queryOrderWaitTimeFailed)
                                     failMethod(error)
                                 }
+                                logger.error(JSON(data))
                             }
                         }
                         else {
-                            let error = ServiceError.errorWithCode(.confirmSingleForQueueFailed)
+                            let error = ServiceError.errorWithCode(.queryOrderWaitTimeFailed)
                             failMethod(error)
                         }
                     }

12306ForMac/Service/ServiceError.swift

@@ -43,6 +43,8 @@ struct ServiceError {
         case getPassengerFailed     = -7013
         case loginUserFailed   = -7014
         case autoSumbitOrderFailed   = -7015
+        case queryOrderWaitTimeFailed   = -7016
+        case getQueueCountFailed   = -7017
     }
 
     static let errorDic = [
@@ -55,6 +57,8 @@ struct ServiceError {
         Code.submitOrderFailed: "提交订单失败",
         Code.checkOrderInfoFailed: "订单信息错误",
         Code.confirmSingleForQueueFailed: "锁定订单失败",
+        Code.getQueueCountFailed: "获取排队信息失败",
+        Code.queryOrderWaitTimeFailed: "查询订单剩余时间失败",
         Code.cancelOrderFailed: "取消订单失败",
         Code.zeroOrderFailed:"您没有历史订单",
         Code.queryTicketNoFailed:"查询车次详细信息失败",