@pisell/pisellos 2.2.233 → 2.2.234

package/lib/modules/Order/index.js

@@ -2144,6 +2144,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   hasOrderProductLineNote(product) {
     return typeof (product == null ? void 0 : product.note) === "string" && product.note.trim().length > 0;
   }
+  /**
+   * 判断商品行是否显式绑定了 booking。
+   *
+   * @example
+   * this.hasLinkedBookingUid({ metadata: { booking_uid: 'booking-1' } });
+   */
+  hasLinkedBookingUid(product) {
+    var _a;
+    const bookingUid = (product == null ? void 0 : product.booking_uid) ?? ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.booking_uid);
+    return bookingUid !== void 0 && bookingUid !== null && String(bookingUid) !== "";
+  }
   // ─── TempOrder: 商品 CRUD ───
   /**
    * 预约商品加车后的统一收尾：促销、折扣、summary 重算与持久化（批量拆行时只调用一次）。
@@ -2151,11 +2162,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * @example
    * await this.finalizeProductOrderMutation(tempOrder);
    */
-  async finalizeProductOrderMutation(tempOrder) {
+  async finalizeProductOrderMutation(tempOrder, options) {
     this.syncTempOrderHolderFromBookings(tempOrder);
-    await this.ensureEditDiscountConfigForProductChange(tempOrder);
-    await this.applyPromotion();
-    this.applyDiscount();
+    if (!(options == null ? void 0 : options.skipEditDiscountConfigRefresh)) {
+      await this.ensureEditDiscountConfigForProductChange(tempOrder);
+    }
+    if (!(options == null ? void 0 : options.skipDiscountRecalculation)) {
+      await this.applyPromotion();
+    }
+    if (!(options == null ? void 0 : options.skipDiscountRecalculation)) {
+      this.applyDiscount();
+    }
     this.sanitizeTempOrderProducts(tempOrder);
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();
@@ -2168,7 +2185,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * await this.appendProductLineToTempOrder(tempOrder, { product_id: 1, num: 1 }, booking);
    */
   async appendProductLineToTempOrder(tempOrder, product, booking) {
-    var _a;
+    var _a, _b;
     const linked = booking ? this.createLinkedProductAndBooking({ product, booking }) : null;
     const productToAdd = (linked == null ? void 0 : linked.product) || product;
     const incomingFingerprint = (0, import_utils3.buildProductLineFingerprint)(
@@ -2179,6 +2196,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       productToAdd,
       (0, import_utils3.normalizeOrderProduct)(productToAdd)
     );
+    const incomingBookingUid = productToAdd.booking_uid ?? ((_a = productToAdd.metadata) == null ? void 0 : _a.booking_uid);
+    if (incomingBookingUid !== void 0 && incomingBookingUid !== null && String(incomingBookingUid) !== "") {
+      normalizedIncoming.booking_uid = String(incomingBookingUid);
+      normalizedIncoming.metadata = {
+        ...normalizedIncoming.metadata || {},
+        booking_uid: String(incomingBookingUid)
+      };
+    }
     normalizedIncoming.discount_list = (0, import_utils.normalizeOrderProductDiscountList)(
       normalizedIncoming.discount_list
     );
@@ -2186,7 +2211,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       normalizedIncoming
     );
     const hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
-    const shouldForceNewLine = !!booking || hasIncomingProductNote;
+    const hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
+    const shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid;
     const matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex((item) => {
       if (this.hasGoodPassDiscount(item))
         return false;
@@ -2232,10 +2258,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           booking_uid: linked.bookingUid
         };
       }
-      tempOrder.products.push(normalizedIncoming);
+      tempOrder.products = [...tempOrder.products, normalizedIncoming];
     } else {
       const targetProduct = matchedProduct;
-      const targetUid = (_a = targetProduct.metadata) == null ? void 0 : _a.unique_identification_number;
+      const targetUid = (_b = targetProduct.metadata) == null ? void 0 : _b.unique_identification_number;
       const normalizedProduct = (0, import_utils.mergeOrderProductDisplayFields)(
         targetProduct,
         (0, import_utils3.normalizeOrderProduct)({
@@ -2329,6 +2355,47 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     await this.finalizeProductOrderMutation(tempOrder);
     return tempOrder.products;
   }
+  /**
+   * 批量添加商品行，所有行追加完成后只触发一次促销、折扣、summary 重算与持久化。
+   *
+   * @example
+   * await order.addProductsToOrder([
+   *   { product: { product_id: 1, product_variant_id: 0, num: 1 } },
+   *   { product: { product_id: 2, product_variant_id: 0, num: 1 } },
+   * ]);
+   */
+  async addProductsToOrder(items, options) {
+    const tempOrder = this.ensureTempOrder();
+    if (!Array.isArray(items) || items.length === 0)
+      return tempOrder.products;
+    for (const item of items || []) {
+      const { product, booking } = item;
+      if (!product)
+        continue;
+      if (booking) {
+        const productRecord = product;
+        const splitCount = (0, import_utils3.getSafeProductNum)(
+          productRecord.num ?? productRecord.product_quantity ?? 1
+        );
+        if (splitCount > 1) {
+          for (let i = 0; i < splitCount; i += 1) {
+            const singleLine = (0, import_lodash_es.cloneDeep)(productRecord);
+            singleLine.num = 1;
+            delete singleLine.product_quantity;
+            await this.appendProductLineToTempOrder(
+              tempOrder,
+              singleLine,
+              (0, import_lodash_es.cloneDeep)(booking)
+            );
+          }
+          continue;
+        }
+      }
+      await this.appendProductLineToTempOrder(tempOrder, product, booking);
+    }
+    await this.finalizeProductOrderMutation(tempOrder, options);
+    return tempOrder.products;
+  }
   hasGoodPassDiscount(product) {
     var _a, _b;
     const hasMainGoodPass = (product.discount_list || []).some(
@@ -2752,6 +2819,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 应传 1，确保 /shop/order/sales/checkout 返回打印所需数据。
    */
   async submitTempOrder(params) {
+    return this.runSubmitTempOrder(params);
+  }
+  async submitTempOrderAsync(params) {
+    return this.runSubmitTempOrder({
+      ...params,
+      syncMode: true
+    });
+  }
+  async runSubmitTempOrder(params) {
     var _a, _b, _c, _d, _e;
     const tempOrder = this.ensureTempOrder();
     this.persistTempOrder();
@@ -2782,8 +2858,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       channel: params == null ? void 0 : params.channel,
       type: params == null ? void 0 : params.type,
       summary: latestSummary,
+      request_unique_idempotency_token: params == null ? void 0 : params.request_unique_idempotency_token,
       enhance: enhancePayload
     });
+    if (params == null ? void 0 : params.syncMode) {
+      payload.sync_mode = true;
+    }
     if (!payload.created_at) {
       payload.created_at = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
     }
@@ -2796,7 +2876,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         requestUniqueIdempotencyToken: payload.request_unique_idempotency_token,
         paymentStatus: payload.payment_status,
         paymentsCount: ((_d = payload.payments) == null ? void 0 : _d.length) || 0,
-        smallTicketDataFlag: payload.small_ticket_data_flag
+        smallTicketDataFlag: payload.small_ticket_data_flag,
+        syncMode: payload.sync_mode
       });
       result = await this.submitSalesOrder({
         query: payload
@@ -2895,6 +2976,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       }
     });
   }
+  generateIdempotencyToken() {
+    const tempOrder = this.ensureTempOrder();
+    const token = this.buildPaymentSyncIdempotencyToken(
+      tempOrder,
+      tempOrder.payments
+    );
+    return `${token}_${Date.now()}`;
+  }
   async syncPaymentsToOrder(params) {
     const tempOrder = this.ensureTempOrder();
     const mappedPayments = (0, import_utils.mapPaymentItemsToOrderPayments)(
@@ -3229,7 +3318,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       with: ["products", "bookings", "payments", "customer", "summary", "contacts_info"],
       ...params.forceRemote ? { forceRemote: true } : {}
     }, { osServer: true });
-    debugger;
     if (res.code === 200) {
       this.store.lastOrderInfo = res.data;
     }

package/lib/modules/Order/types.d.ts

@@ -678,6 +678,17 @@ export interface OrderModuleAPI {
         smallTicketDataFlag?: number;
         enhancePayload?: SubmitPayloadEnhancer;
     }) => Promise<T>;
+    submitTempOrderAsync: <T = any>(params?: {
+        cacheId?: string;
+        platform?: string;
+        businessCode?: string;
+        channel?: string;
+        type?: string;
+        payments?: OrderPaymentSource[];
+        paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
+        smallTicketDataFlag?: number;
+        enhancePayload?: SubmitPayloadEnhancer;
+    }) => Promise<T>;
     getOrderPayments: () => OrderPaymentData[];
     setOrderPayments: (payments: OrderPaymentSource[]) => OrderPaymentData[];
     addOrderPayment: (payment: OrderPaymentSource) => OrderPaymentData[];

package/lib/modules/Order/utils.d.ts

@@ -188,6 +188,7 @@ export declare function buildSubmitPayload(params: {
     channel?: string;
     type?: string;
     summary?: OrderSummary | null;
+    request_unique_idempotency_token?: string;
     enhance?: SubmitPayloadEnhancer;
 }): OrderSubmitPayload;
 export declare function mapPaymentItemToOrderPayment(paymentItem: OrderPaymentSource): OrderPaymentData;

package/lib/modules/Order/utils.js

@@ -754,7 +754,7 @@ function buildSubmitPayload(params) {
     shop_order_number: tempOrder.shop_order_number ?? null,
     shop_full_order_number: tempOrder.shop_full_order_number ?? null,
     platform: normalizeSubmitPlatform(platform),
-    request_unique_idempotency_token: tempOrder.request_unique_idempotency_token || `${tempOrder.external_sale_number}_${now.getTime()}`,
+    request_unique_idempotency_token: (params == null ? void 0 : params.request_unique_idempotency_token) || tempOrder.request_unique_idempotency_token || `${tempOrder.external_sale_number}_${now.getTime()}`,
     type: submitType,
     business_code: businessCode ?? tempOrder.business_code,
     sales_channel: tempOrder.sales_channel || "my_pisel",

package/lib/server/index.d.ts

@@ -95,6 +95,9 @@ declare class Server {
     }[]>;
     private registerDeviceTaskActions;
     private handleSyncSalesTask;
+    private runCheckoutSync;
+    private omitCheckoutSyncMode;
+    private persistSyncedCheckoutOrder;
     /**
      * 将普通层 QuotationModule 的报价单计算能力桥接到 Server Products 模块。
      */
@@ -401,6 +404,7 @@ declare class Server {
     private getLocalPrintOrderLookup;
     private handleLocalPrintOrder;
     private handleOrderCheckoutSubmit;
+    private handleSyncCheckoutSubmit;
     private handlePendingSyncCheckoutOrder;
     private buildPendingSyncCheckoutOrder;
     private shouldBuildSmallTicketData;
@@ -455,6 +459,7 @@ declare class Server {
     private buildSyncedOrderForPrint;
     private isMergeableCheckoutOrder;
     private normalizeCheckoutResponse;
+    private withSyncedOrderIdInCheckoutResponse;
     private isCheckoutResponseRejected;
     private getUnknownErrorMessage;
     private normalizeUnknownError;

package/lib/server/index.js

@@ -1170,75 +1170,28 @@ var Server = class {
       return this.taskTimeout("app.request 不可用");
     }
     try {
-      const response = await this.app.request.post(backendPath, data, {
-        isShopApi: true,
-        customToast: () => {
-        }
+      const syncResult = await this.runCheckoutSync({
+        backendPath,
+        data,
+        title,
+        externalSaleNumber: payload.external_sale_number,
+        deviceId: (_c = ctx.task) == null ? void 0 : _c.device_id,
+        persistCheckoutDataWithResponse: false
       });
-      if (this.isCheckoutResponseRejected(response)) {
-        const message = (response == null ? void 0 : response.message) || "后端明确拒绝 checkout";
+      if (syncResult.rejected) {
         this.logError(`${title}: sync_sales 后端明确失败`, {
           backendPath,
-          response
-        });
-        return this.taskFail("BACKEND_REJECTED", message, response);
-      }
-      const fresh = this.extractOrderDataFromCheckoutResponse(response);
-      const externalSaleNumber = this.getCheckoutExternalSaleNumber(data, payload);
-      const shouldMergeRemoteOrder = fresh ? this.isMergeableCheckoutOrder(fresh, externalSaleNumber) : false;
-      let syncedOrder;
-      if (this.order && fresh && shouldMergeRemoteOrder) {
-        syncedOrder = {
-          ...fresh,
-          external_sale_number: fresh.external_sale_number ?? externalSaleNumber,
-          need_sync: 0
-        };
-        await this.order.upsertOrdersFromRemote([syncedOrder]);
-        this.logInfo(`${title}: sync_sales 完整订单已同步到本地`, {
-          order_id: fresh.order_id,
-          external_sale_number: syncedOrder.external_sale_number,
-          order_number: fresh.order_number
-        });
-      } else if (this.order && externalSaleNumber && typeof this.order.markOrderSyncedByExternalSaleNumber === "function") {
-        const patch = this.buildCheckoutSyncSuccessPatch(fresh);
-        const result = await this.order.markOrderSyncedByExternalSaleNumber({
-          externalSaleNumber,
-          patch
-        });
-        syncedOrder = (result == null ? void 0 : result.order) || {
-          ...data,
-          ...patch,
-          external_sale_number: externalSaleNumber,
-          need_sync: 0
-        };
-        this.logInfo(`${title}: sync_sales 已按 external_sale_number 标记本地订单`, {
-          order_id: (syncedOrder == null ? void 0 : syncedOrder.order_id) ?? null,
-          external_sale_number: externalSaleNumber,
-          hasRemoteOrder: !!fresh,
-          mergedRemoteOrder: false
-        });
-      } else {
-        this.logWarning(`${title}: sync_sales Order 模块未注册`, {
-          backendPath,
-          external_sale_number: externalSaleNumber,
-          order_id: fresh == null ? void 0 : fresh.order_id
-        });
-      }
-      const printableSyncedOrder = syncedOrder ? this.buildSyncedOrderForPrint({
-        syncedOrder,
-        checkoutResponseOrder: fresh
-      }) : void 0;
-      if (printableSyncedOrder && this.shouldPrintSyncedOrder({ checkoutData: data, syncedOrder: printableSyncedOrder })) {
-        await this.dispatchPrintOtherReceiptTask({
-          checkoutData: data,
-          syncedOrder: printableSyncedOrder,
-          response,
-          deviceId: (_c = ctx.task) == null ? void 0 : _c.device_id
+          response: syncResult.errorResponse
         });
+        return this.taskFail(
+          "BACKEND_REJECTED",
+          syncResult.message || "后端明确拒绝 checkout",
+          syncResult.errorResponse
+        );
       }
       return this.taskOk({
-        order: syncedOrder ?? null,
-        response: this.normalizeCheckoutResponse(response)
+        order: syncResult.syncedOrder ?? null,
+        response: syncResult.normalizedResponse
       });
     } catch (error) {
       const backendError = this.extractBackendErrorResponse(error);
@@ -1259,6 +1212,135 @@ var Server = class {
       return this.taskTimeout(errorMessage);
     }
   }
+  async runCheckoutSync(params) {
+    var _a, _b;
+    const { backendPath, title } = params;
+    const normalizedData = await this.normalizeCheckoutSubmitData(params.data, title);
+    const checkoutData = await this.ensureCheckoutOrderNumbers(normalizedData, title);
+    const remoteCheckoutData = this.omitCheckoutSyncMode(checkoutData);
+    if (!((_b = (_a = this.app) == null ? void 0 : _a.request) == null ? void 0 : _b.post)) {
+      throw new Error("app.request 不可用");
+    }
+    const response = await this.app.request.post(backendPath, remoteCheckoutData, {
+      isShopApi: true,
+      customToast: () => {
+      }
+    });
+    if (this.isCheckoutResponseRejected(response)) {
+      return {
+        rejected: true,
+        message: (response == null ? void 0 : response.message) || "后端明确拒绝 checkout",
+        errorResponse: response,
+        response,
+        normalizedResponse: this.normalizeCheckoutResponse(response),
+        checkoutData: remoteCheckoutData
+      };
+    }
+    const fresh = this.extractOrderDataFromCheckoutResponse(response);
+    const externalSaleNumber = this.getCheckoutExternalSaleNumber(
+      remoteCheckoutData,
+      {
+        external_sale_number: params.externalSaleNumber,
+        data: remoteCheckoutData
+      }
+    );
+    const syncedOrder = await this.persistSyncedCheckoutOrder({
+      backendPath,
+      checkoutData: remoteCheckoutData,
+      externalSaleNumber,
+      fresh,
+      title,
+      persistCheckoutDataWithResponse: params.persistCheckoutDataWithResponse === true
+    });
+    const printableSyncedOrder = syncedOrder ? this.buildSyncedOrderForPrint({
+      syncedOrder,
+      checkoutResponseOrder: fresh
+    }) : void 0;
+    if (printableSyncedOrder && this.shouldPrintSyncedOrder({
+      checkoutData: remoteCheckoutData,
+      syncedOrder: printableSyncedOrder
+    })) {
+      await this.dispatchPrintOtherReceiptTask({
+        checkoutData: remoteCheckoutData,
+        syncedOrder: printableSyncedOrder,
+        response,
+        deviceId: params.deviceId
+      });
+    }
+    return {
+      rejected: false,
+      response,
+      normalizedResponse: this.normalizeCheckoutResponse(response),
+      checkoutData: remoteCheckoutData,
+      syncedOrder,
+      fresh
+    };
+  }
+  omitCheckoutSyncMode(data) {
+    if (!data || typeof data !== "object")
+      return data;
+    const next = { ...data };
+    delete next.sync_mode;
+    delete next.syncMode;
+    return next;
+  }
+  async persistSyncedCheckoutOrder(params) {
+    const {
+      backendPath,
+      checkoutData,
+      externalSaleNumber,
+      fresh,
+      title,
+      persistCheckoutDataWithResponse
+    } = params;
+    const shouldMergeRemoteOrder = fresh ? this.isMergeableCheckoutOrder(fresh, externalSaleNumber) : false;
+    let syncedOrder;
+    if (this.order && fresh && (shouldMergeRemoteOrder || persistCheckoutDataWithResponse)) {
+      syncedOrder = persistCheckoutDataWithResponse ? {
+        ...checkoutData,
+        ...fresh,
+        external_sale_number: fresh.external_sale_number ?? externalSaleNumber,
+        need_sync: 0
+      } : {
+        ...fresh,
+        external_sale_number: fresh.external_sale_number ?? externalSaleNumber,
+        need_sync: 0
+      };
+      await this.order.upsertOrdersFromRemote([syncedOrder]);
+      this.logInfo(`${title}: sync_sales 完整订单已同步到本地`, {
+        order_id: fresh.order_id,
+        external_sale_number: syncedOrder.external_sale_number,
+        order_number: fresh.order_number,
+        mergedRemoteOrder: shouldMergeRemoteOrder,
+        persistedCheckoutDataWithResponse: persistCheckoutDataWithResponse
+      });
+    } else if (this.order && externalSaleNumber && typeof this.order.markOrderSyncedByExternalSaleNumber === "function") {
+      const patch = this.buildCheckoutSyncSuccessPatch(fresh);
+      const result = await this.order.markOrderSyncedByExternalSaleNumber({
+        externalSaleNumber,
+        patch
+      });
+      syncedOrder = (result == null ? void 0 : result.order) || {
+        ...checkoutData,
+        ...patch,
+        external_sale_number: externalSaleNumber,
+        need_sync: 0
+      };
+      this.logInfo(`${title}: sync_sales 已按 external_sale_number 标记本地订单`, {
+        order_id: (syncedOrder == null ? void 0 : syncedOrder.order_id) ?? null,
+        external_sale_number: externalSaleNumber,
+        hasRemoteOrder: !!fresh,
+        mergedRemoteOrder: false
+      });
+    } else {
+      this.logWarning(`${title}: sync_sales Order 模块未注册`, {
+        backendPath,
+        external_sale_number: externalSaleNumber,
+        order_id: fresh == null ? void 0 : fresh.order_id
+      });
+    }
+    return syncedOrder;
+  }
   /**
    * 将普通层 QuotationModule 的报价单计算能力桥接到 Server Products 模块。
    */
@@ -2605,6 +2687,13 @@ var Server = class {
       external_sale_number: data == null ? void 0 : data.external_sale_number,
       order_number: data == null ? void 0 : data.order_number
     });
+    if ((data == null ? void 0 : data.sync_mode) || (data == null ? void 0 : data.syncMode)) {
+      return this.handleSyncCheckoutSubmit({
+        backendPath,
+        data,
+        title
+      });
+    }
     const normalizedData = await this.normalizeCheckoutSubmitData(data, title);
     const checkoutData = await this.ensureCheckoutOrderNumbers(normalizedData, title);
     const pendingResult = await this.handlePendingSyncCheckoutOrder({
@@ -2642,6 +2731,63 @@ var Server = class {
     }
     return pendingResult;
   }
+  async handleSyncCheckoutSubmit(params) {
+    var _a, _b;
+    const { backendPath, data, title } = params;
+    if (!((_b = (_a = this.app) == null ? void 0 : _a.request) == null ? void 0 : _b.post)) {
+      this.logError(`${title}: sync checkout app.request 不可用`);
+      return {
+        code: 500,
+        status: false,
+        message: "app.request 不可用",
+        data: null
+      };
+    }
+    try {
+      const syncResult = await this.runCheckoutSync({
+        backendPath,
+        data,
+        title,
+        persistCheckoutDataWithResponse: true
+      });
+      if (syncResult.rejected) {
+        const normalized = this.normalizeCheckoutResponse(syncResult.errorResponse);
+        return {
+          ...normalized,
+          status: false,
+          message: syncResult.message || (normalized == null ? void 0 : normalized.message) || "后端明确拒绝 checkout",
+          data: (normalized == null ? void 0 : normalized.data) ?? null
+        };
+      }
+      return this.withSyncedOrderIdInCheckoutResponse(
+        syncResult.normalizedResponse,
+        syncResult.syncedOrder
+      );
+    } catch (error) {
+      const backendError = this.extractBackendErrorResponse(error);
+      if (backendError) {
+        const normalized = this.normalizeCheckoutResponse(backendError);
+        return {
+          ...normalized,
+          status: false,
+          message: (backendError == null ? void 0 : backendError.message) || (normalized == null ? void 0 : normalized.message) || "后端明确拒绝 checkout",
+          data: (normalized == null ? void 0 : normalized.data) ?? null
+        };
+      }
+      const message = this.getUnknownErrorMessage(error);
+      this.logError(`${title}: sync checkout 请求未明确成功`, {
+        backendPath,
+        error: message,
+        error_detail: this.normalizeUnknownError(error)
+      });
+      return {
+        code: 500,
+        status: false,
+        message,
+        data: null
+      };
+    }
+  }
   async handlePendingSyncCheckoutOrder(params) {
     var _a, _b, _c, _d;
     const { backendPath, data, title, reason } = params;
@@ -3219,6 +3365,21 @@ var Server = class {
       data: response
     };
   }
+  withSyncedOrderIdInCheckoutResponse(response, syncedOrder) {
+    const normalized = this.normalizeCheckoutResponse(response);
+    const orderId = syncedOrder == null ? void 0 : syncedOrder.order_id;
+    if (orderId === void 0 || orderId === null)
+      return normalized;
+    if (!(normalized == null ? void 0 : normalized.data) || typeof normalized.data !== "object")
+      return normalized;
+    return {
+      ...normalized,
+      data: {
+        ...normalized.data,
+        order_id: normalized.data.order_id ?? orderId
+      }
+    };
+  }
   isCheckoutResponseRejected(response) {
     const normalized = this.normalizeCheckoutResponse(response);
     const isErrorCode = (normalized == null ? void 0 : normalized.code) !== void 0 && normalized.code !== 200 && normalized.code !== "200";

package/lib/server/modules/order/index.d.ts

@@ -192,6 +192,8 @@ export declare class OrderModule extends BaseModule implements Module {
     private findOrderIndexByIdentity;
     private getOrderCompletenessScore;
     private pickPreferredOrder;
+    private getProductMergeKey;
+    private mergeOrderProductLists;
     private mergeOrderRecords;
     private summarizeDuplicateOrders;
     private logDuplicateOrders;

package/lib/server/modules/order/index.js

@@ -1130,6 +1130,45 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return right;
     return left;
   }
+  getProductMergeKey(product) {
+    var _a;
+    const record = product;
+    if (!record)
+      return "";
+    const metadataUid = (_a = record.metadata) == null ? void 0 : _a.unique_identification_number;
+    if (!this.isBlankIdentityValue(metadataUid))
+      return `uid:${String(metadataUid)}`;
+    const topLevelUid = record.unique_identification_number;
+    if (!this.isBlankIdentityValue(topLevelUid))
+      return `uid:${String(topLevelUid)}`;
+    const bookingUid = record.booking_uid;
+    if (!this.isBlankIdentityValue(bookingUid))
+      return `booking:${String(bookingUid)}`;
+    return "";
+  }
+  mergeOrderProductLists(preferred, secondary) {
+    const preferredList = Array.isArray(preferred) ? preferred : [];
+    const secondaryList = Array.isArray(secondary) ? secondary : [];
+    if (secondaryList.length === 0)
+      return preferredList;
+    if (preferredList.length === 0)
+      return secondaryList;
+    const seenKeys = /* @__PURE__ */ new Set();
+    for (const item of preferredList) {
+      const key = this.getProductMergeKey(item);
+      if (key)
+        seenKeys.add(key);
+    }
+    const result = [...preferredList];
+    for (const item of secondaryList) {
+      const key = this.getProductMergeKey(item);
+      if (!key || seenKeys.has(key))
+        continue;
+      seenKeys.add(key);
+      result.push((0, import_lodash_es.cloneDeep)(item));
+    }
+    return result;
+  }
   mergeOrderRecords(existing, incoming) {
     const preferred = this.pickPreferredOrder(existing, incoming);
     const secondary = preferred === existing ? incoming : existing;
@@ -1150,7 +1189,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       "shipping_status",
       "updated_at",
       "summary",
-      "payments"
+      "payments",
+      "products",
+      "bookings"
     ];
     const mergedRecord = merged;
     const preferredRecord = preferred;
@@ -1174,6 +1215,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         continue;
       mergedRecord[field] = (0, import_lodash_es.cloneDeep)(incomingRecord[field]);
     }
+    mergedRecord.products = this.mergeOrderProductLists(preferredRecord.products, secondaryRecord.products);
     if (!this.isPendingSyncOrder(preferred) || !this.isPendingSyncOrder(secondary)) {
       merged.need_sync = 0;
     }

package/lib/solution/BaseSales/index.d.ts

@@ -203,6 +203,12 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         smallTicketDataFlag?: number;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
+    submitTempOrderAsync<T = any>(params?: {
+        payments?: OrderPaymentSource[];
+        paymentStatus?: BaseSalesPaymentStatus;
+        smallTicketDataFlag?: number;
+        enhancePayload?: SubmitPayloadEnhancer;
+    }): Promise<T>;
     printLocalOrderReceipt<T = any>(lookup?: BaseSalesPrintLocalOrderReceiptParams): Promise<T>;
     private getSubmitPaymentStatus;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;