Ver código fonte

feat: 更新下单场景字段

陈文艺 6 dias atrás
pai
commit
8481b1e712

+ 2 - 2
Lanu/Manager/Order/LNOrderManager.swift

@@ -137,7 +137,7 @@ extension LNOrderManager {
 // MARK: 订单操作
 extension LNOrderManager {
     func createOrder(skillId: String, count: Int,
-                     remark: String, scene: LNOrderScene? = nil,
+                     remark: String, scene: LNOrderScene = .normal,
                      queue: DispatchQueue = .main,
                      handler: @escaping (String?) -> Void)
     {
@@ -365,7 +365,7 @@ extension LNOrderManager {
     }
     
     func createQRCodeOrder(data: String, count: Int,
-                           extra: String, scene: LNOrderScene? = nil,
+                           extra: String, scene: LNOrderScene = .normal,
                            queue: DispatchQueue = .main,
                            handler: @escaping (String?) -> Void) {
         LNHttpManager.shared.createQROrder(data: data, count: count, extra: extra, scene: scene) { [weak self] res, err in

+ 10 - 13
Lanu/Manager/Order/Network/LNHttpManager+Order.swift

@@ -38,22 +38,21 @@ private enum LNOrderHandlerType: Int {
 }
 
 enum LNOrderScene: Int {
-    case room = 1
+    case normal = 0
+    case room
 }
 
 extension LNHttpManager {
     func createOrderBySkill(
-        skillId: String, count: Int, remark: String, scene: LNOrderScene?,
+        skillId: String, count: Int, remark: String, scene: LNOrderScene,
         completion: @escaping (LNCreateOrderResponse?, LNHttpError?) -> Void)
     {
-        var params: [String: Any] = [
+        let params: [String: Any] = [
             "skillId": skillId,
             "purchaseQty": count,
-            "remark": remark
+            "remark": remark,
+            "source": scene.rawValue
         ]
-        if let scene {
-            params["scene"] = scene.rawValue
-        }
         post(path: kNetPath_Order_Create, params: params, completion: completion)
     }
 }
@@ -119,16 +118,14 @@ extension LNHttpManager {
         ], completion: completion)
     }
     
-    func createQROrder(data: String, count: Int, extra: String, scene: LNOrderScene?,
+    func createQROrder(data: String, count: Int, extra: String, scene: LNOrderScene,
                        completion: @escaping (LNCreateOrderResponse?, LNHttpError?) -> Void) {
-        var params: [String: Any] = [
+        let params: [String: Any] = [
             "qrCode": data,
             "purchaseQty": count,
-            "remark": extra
+            "remark": extra,
+            "source": scene.rawValue
         ]
-        if let scene {
-            params["scene"] = scene.rawValue
-        }
         post(path: kNetPath_Order_QR_Order, params: params, completion: completion)
     }
 }

+ 1 - 1
Lanu/Views/Order/Create/LNCreateOrderPanel.swift

@@ -62,7 +62,7 @@ class LNCreateOrderPanel: LNPopupView {
             countLabel.isHidden = editable
         }
     }
-    var scene: LNOrderScene?
+    var scene: LNOrderScene = .normal
     
     private var targetUid: String?
     var completionHandler: ((String) -> Void)?