@pisell/pisellos 2.3.50 → 2.3.53

package/dist/solution/VenueBooking/types.d.ts

@@ -1,6 +1,5 @@
 import { OrderModule, ProductList, SalesSummaryModule, ScanOrderLogInput, ScanOrderLoggerModule, ScanOrderLoggerProviderConfig, ScanOrderLoggerProviderType, DateModule, ScheduleModule, QuotationModule, OpenDataModule } from '../../modules';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
-import { HolderModule } from '../../modules/Holder';
 export type { ScanOrderOrderProductIdentity, ScanOrderOrderProduct, ScanOrderSubmitProduct, ScanOrderSummary, ScanOrderTempOrder, ScanOrderSubmitPayload, } from '../ScanOrder/types';
 export declare enum VenueBookingHooks {
     onInited = "venueBooking:onInited",
@@ -97,7 +96,6 @@ export interface VenueResourceRawData {
 export interface ResourceProductMapping {
     productId: number;
     productTitle: string;
-    formName?: string;
     resourceName: string;
     formId: number | string;
     price: string;
@@ -146,7 +144,6 @@ export interface VenueBookingState {
         passed: boolean | null;
         failures: QuantityCheckResult[];
     };
-    holder?: HolderModule;
 }
 export interface VenueBookingLoggerRuntimeConfig {
     provider?: ScanOrderLoggerProviderType;

package/dist/solution/VenueBooking/utils/resource.js

@@ -93,7 +93,6 @@ export function buildResourceProductMap(products) {
               var mapping = {
                 productId: product.id,
                 productTitle: product.title,
-                formName: resource.title,
                 resourceName: resource.title,
                 formId: resource.id,
                 price: product.price || '0.00',

package/dist/solution/VenueBooking/utils/slotMerge.d.ts

@@ -12,6 +12,10 @@ export declare function buildPriceBreakdown(params: {
         }) => number;
     };
 }): PriceBreakdownEntry[];
+export declare function buildVenueResourceMetadata(params: {
+    mapping: ResourceProductMapping;
+    rawResource: VenueResourceRawData | undefined;
+}): Record<string, any>;
 export interface BuildVenueBookingParams {
     group: MergedSlotGroup;
     resourceId: number | string;
@@ -25,10 +29,6 @@ export interface BuildVenueBookingParams {
      */
     childResources?: VenueResourceRawData[];
 }
-export declare function buildVenueResourceMetadata(params: {
-    mapping: ResourceProductMapping;
-    rawResource: VenueResourceRawData | undefined;
-}): Record<string, any>;
 export declare function buildVenueBookingEntry(params: BuildVenueBookingParams): Record<string, any>;
 /**
  * 从一条已合并的订单商品还原出独立的时段列表。

package/dist/solution/VenueBooking/utils/slotMerge.js

@@ -90,15 +90,13 @@ export function buildPriceBreakdown(params) {
   return entries;
 }
 export function buildVenueResourceMetadata(params) {
-  var _mapping$formName, _rawResource$main_fie;
+  var _rawResource$form_nam, _ref, _rawResource$main_fie, _rawResource$combined;
   var mapping = params.mapping,
     rawResource = params.rawResource;
-  var combined = rawResource === null || rawResource === void 0 ? void 0 : rawResource.combined_resource;
-  var isCombined = !!(combined && combined.status === 1 && Array.isArray(combined.resource_ids));
   return {
-    form_name: (_mapping$formName = mapping.formName) !== null && _mapping$formName !== void 0 ? _mapping$formName : mapping.resourceName,
-    resource_name: (_rawResource$main_fie = rawResource === null || rawResource === void 0 ? void 0 : rawResource.main_field) !== null && _rawResource$main_fie !== void 0 ? _rawResource$main_fie : mapping.resourceName,
-    combined_resource: isCombined ? combined : null
+    form_name: (_rawResource$form_nam = rawResource === null || rawResource === void 0 ? void 0 : rawResource.form_name) !== null && _rawResource$form_nam !== void 0 ? _rawResource$form_nam : '',
+    resource_name: (_ref = (_rawResource$main_fie = rawResource === null || rawResource === void 0 ? void 0 : rawResource.main_field) !== null && _rawResource$main_fie !== void 0 ? _rawResource$main_fie : mapping.resourceName) !== null && _ref !== void 0 ? _ref : '',
+    combined_resource: (_rawResource$combined = rawResource === null || rawResource === void 0 ? void 0 : rawResource.combined_resource) !== null && _rawResource$combined !== void 0 ? _rawResource$combined : null
   };
 }
 export function buildVenueBookingEntry(params) {
@@ -121,10 +119,7 @@ export function buildVenueBookingEntry(params) {
     form_id: (_rawResource$form_id = rawResource === null || rawResource === void 0 ? void 0 : rawResource.form_id) !== null && _rawResource$form_id !== void 0 ? _rawResource$form_id : mapping.formId,
     relation_id: resourceId,
     capacity: 1,
-    metadata: buildVenueResourceMetadata({
-      mapping: mapping,
-      rawResource: rawResource
-    })
+    metadata: {}
   };
   if (childResources && childResources.length) {
     resourceEntry.children = childResources.map(function (child) {

package/dist/solution/index.d.ts

@@ -8,4 +8,3 @@ export * from './Sales';
 export * from './ScanOrder';
 export * from './BaseSales';
 export * from './VenueBooking';
-export * from './UnifiedBookingSales';

package/dist/solution/index.js

@@ -7,5 +7,4 @@ export * from "./Checkout";
 export * from "./Sales";
 export * from "./ScanOrder";
 export * from "./BaseSales";
-export * from "./VenueBooking";
-export * from "./UnifiedBookingSales";
+export * from "./VenueBooking";

package/dist/types/index.d.ts

@@ -6,7 +6,6 @@ export interface Plugin {
     version: string;
     initialize: () => Promise<void> | void;
     destroy?: () => Promise<void> | void;
-    getLocalStorage?: (key: string) => string | null;
 }
 export interface PluginOptions {
     dependencies?: string[];

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,51 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  ITEM_REWARD_STRATEGY: () => import_examples.ITEM_REWARD_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  ITEM_REWARD_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -149,7 +149,9 @@ function mapOrderBundleToOtherBundle(bundle) {
   return bundle.map((item) => {
     return {
       ...item,
-      original_price: item.original_price ?? item.bundle_selling_price ?? item.price
+      // 后端历史订单可能没有 original_price；此时 price 是折前毛价，
+      // bundle_selling_price 已包含折扣，不能把它当成编辑时的新原价。
+      original_price: item.original_price ?? item.product_price ?? item.price ?? item.bundle_selling_price
     };
   });
 }

package/lib/modules/Discount/index.d.ts

@@ -32,7 +32,6 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         customerId?: number;
         orderId?: number;
     }): Promise<DiscountWithReason>;
-    batchSearchByProductIds(productIds: number[]): Promise<any>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
     private checkUsageCreditsLimit;
     filterEnabledDiscountListWithReason(discountList: Discount[]): DiscountWithReason;

package/lib/modules/Discount/index.js

@@ -147,15 +147,6 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     const resultDiscountWithReason = this.filterEnabledDiscountListWithReason((result == null ? void 0 : result.data) || []) || [];
     return resultDiscountWithReason;
   }
-  async batchSearchByProductIds(productIds) {
-    const result = await this.request.get(`/machinecode/batch-search`, {
-      ids: productIds,
-      translate_flag: 1,
-      tags: ["good_pass", "product_discount_card"],
-      relation_product: 1
-    });
-    return (result == null ? void 0 : result.data) || [];
-  }
   filterEnabledDiscountList(discountList) {
     return discountList.filter(
       (discount) => discount.limit_status === "enable" && new import_decimal.default((discount == null ? void 0 : discount.par_value) || 0).minus(new import_decimal.default((discount == null ? void 0 : discount.used_par_value) || 0)).greaterThan(0) && this.checkUsageCreditsLimit(discount)

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

@@ -157,7 +157,6 @@ export interface Discount {
     num?: number;
     start_date?: string;
     start_time?: string;
-    discount_rule_uncheck_flag?: boolean;
     usageLimitFailKey?: string | null;
     unified_available_status?: number | undefined | null;
 }

package/lib/modules/OpenData/index.js

@@ -73,7 +73,7 @@ var OpenDataModule = class extends import_BaseModule.BaseModule {
   }
   async fetchOpenData(params) {
     var _a, _b;
-    const getData = (_b = (_a = this.appPlugin) == null ? void 0 : _a.getData) == null ? void 0 : _b.call(_a);
+    const getData = (_b = (_a = this.appPlugin).getData) == null ? void 0 : _b.call(_a);
     const shopId = getData == null ? void 0 : getData("shop_id");
     if (!shopId)
       throw new Error("[OpenDataModule] 无法获取 shop_id");

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

@@ -1,9 +1,9 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { OrderModuleAPI, CommitOrderParams, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, CancelOrderParams, ChangeBookingStatusParams, CheckoutOrderParams } from './types';
+import { OrderModuleAPI, CommitOrderParams, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, CheckoutOrderParams, CancelOrderParams, ChangeBookingStatusParams } from './types';
 import { CartItem } from '../Cart/types';
 import { type SubmitPayloadEnhancer } from './utils';
-import type { OrderAmountSnapshot, AddProductBookingInput, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions } from './types';
+import type { OrderAmountSnapshot, AddProductBookingInput, AddProductToOrderOptions, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions } from './types';
 import type { ICustomer } from '../AccountList/types';
 import type { Discount } from '../Discount/types';
 import { UnavailableReason } from '../Rules/types';
@@ -147,7 +147,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     isTempOrderPersistEnabled(): boolean;
     /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化；草稿保存请使用 IndexedDB saveDraft。 */
     persistTempOrder(): void;
-    notifyTempOrderChanged(): void;
     private createDefaultTempOrderInstance;
     private createExternalSaleNumber;
     private ensureExternalSaleNumber;
@@ -385,7 +384,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * await order.addProductToOrder({ product_id: 1, num: 3 }, { start_time: '10:00' });
      * // → tempOrder.products 新增 3 行，每行 num=1，bookings 3 条
      */
-    addProductToOrder(product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput): Promise<OrderProduct[]>;
+    addProductToOrder(product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions): Promise<OrderProduct[]>;
     /**
      * 批量添加商品行，所有行追加完成后只触发一次促销、折扣、summary 重算与持久化。
      *
@@ -423,8 +422,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * @example
      * await order.removeProductsFromOrder([identityA, identityB]);
      */
-    removeProductsFromOrder(identities: OrderProductIdentity[]): Promise<OrderProduct[]>;
-    removeProductFromOrder(identity: OrderProductIdentity): Promise<OrderProduct[]>;
+    removeProductsFromOrder(identities: OrderProductIdentity[], options?: RemoveProductsFromOrderOptions): Promise<OrderProduct[]>;
+    removeProductFromOrder(identity: OrderProductIdentity, options?: RemoveProductsFromOrderOptions): Promise<OrderProduct[]>;
     /**
      * 仅清空购物车行（products / bookings），不重置整单。
      * 用于「仅清空商品」；客户、备注、支付等协议字段保持不变。
@@ -497,7 +496,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         is_deposit: number;
         relation_products: any[];
         relation_forms: any[];
-        business_code: string | undefined;
     };
     checkBeforeSubmitOrder(params: {
         cartItems: CartItem[];
@@ -563,4 +561,4 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     getOrderInfo(order_id: number): Promise<any>;
     getVouchers(): any[];
 }
-export type { UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';
+export type { AddProductToOrderOptions, RemoveProductsFromOrderOptions, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';

package/lib/modules/Order/index.js

@@ -328,7 +328,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
   }
   async initialize(core, options) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     this.core = core;
     this.store = options.store;
     if (!this.store.tempOrder) {
@@ -341,19 +341,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       this.store.availableWalletIds = [];
     }
     this.request = this.core.getPlugin("request");
-    const appPlugin = this.core.getPlugin("app");
-    if (!appPlugin) {
-      console.error("Order 模块需要 app 插件支持");
+    this.appPlugin = this.core.getPlugin("app");
+    if (!this.appPlugin) {
+      throw new Error("Order 模块需要 app 插件支持");
     }
-    const app = (_a = appPlugin == null ? void 0 : appPlugin.getApp) == null ? void 0 : _a.call(appPlugin);
-    this.logger = app == null ? void 0 : app.logger;
+    const app = this.appPlugin.getApp();
+    this.logger = app.logger;
     this.window = this.core.getPlugin("window");
     const otherParams = options.otherParams || {};
     this.cacheId = otherParams.cacheId;
     this.salesSummaryModuleName = otherParams.salesSummaryModuleName;
-    this.rulesHooksOverride = (_b = otherParams.rules) == null ? void 0 : _b.hooks;
+    this.rulesHooksOverride = (_a = otherParams.rules) == null ? void 0 : _a.hooks;
     this.moduleHooksOverride = options.hooks;
-    this.orderHooks = this.moduleHooksOverride || ((_c = otherParams.order) == null ? void 0 : _c.hooks) || ((_d = otherParams.hooks) == null ? void 0 : _d.order);
+    this.orderHooks = this.moduleHooksOverride || ((_b = otherParams.order) == null ? void 0 : _b.hooks) || ((_c = otherParams.hooks) == null ? void 0 : _c.order);
     this.otherParams = otherParams;
     this.registerDiscountModules(options);
     this.logInfo("OrderModule initialized successfully");
@@ -880,16 +880,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化；草稿保存请使用 IndexedDB saveDraft。 */
   persistTempOrder() {
   }
-  notifyTempOrderChanged() {
-    if (!this.store.tempOrder)
-      return;
-    this.store.tempOrder = {
-      ...this.store.tempOrder,
-      products: [...this.store.tempOrder.products],
-      bookings: this.store.tempOrder.bookings ? [...this.store.tempOrder.bookings] : []
-    };
-    this.persistTempOrder();
-  }
   // ─── TempOrder: 创建 & 获取 ───
   createDefaultTempOrderInstance() {
     return (0, import_utils.createDefaultTempOrder)({
@@ -2897,8 +2887,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * @example
    * await this.appendProductLineToTempOrder(tempOrder, { product_id: 1, num: 1 }, booking);
    */
-  async appendProductLineToTempOrder(tempOrder, product, booking) {
-    var _a, _b;
+  async appendProductLineToTempOrder(tempOrder, product, booking, options) {
+    var _a, _b, _c, _d;
     const linked = booking ? this.createLinkedProductAndBooking({ product, booking }) : null;
     const productToAdd = (linked == null ? void 0 : linked.product) || product;
     const incomingFingerprint = (0, import_utils3.buildProductLineFingerprint)(
@@ -2909,7 +2899,12 @@ 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);
+    const isWeighingProduct = Number(((_a = normalizedIncoming.product_sku) == null ? void 0 : _a.open_sold_weight) || 0) === 1;
+    const netWeight = Number((_b = normalizedIncoming.product_sku) == null ? void 0 : _b.net_weight);
+    if (isWeighingProduct && (!Number.isFinite(netWeight) || netWeight <= 0)) {
+      throw new Error("[Order] 称重商品净重必须大于 0");
+    }
+    const incomingBookingUid = productToAdd.booking_uid ?? ((_c = productToAdd.metadata) == null ? void 0 : _c.booking_uid);
     if (incomingBookingUid !== void 0 && incomingBookingUid !== null && String(incomingBookingUid) !== "") {
       normalizedIncoming.booking_uid = String(incomingBookingUid);
       normalizedIncoming.metadata = {
@@ -2925,7 +2920,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     );
     const hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
     const hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
-    const shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid;
+    const shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid || isWeighingProduct;
     const matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex((item) => {
       var _a2;
       if (this.hasGoodPassDiscount(item))
@@ -2974,10 +2969,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           booking_uid: linked.bookingUid
         };
       }
-      tempOrder.products = [...tempOrder.products, normalizedIncoming];
+      const insertAtIndex = options == null ? void 0 : options.insertAtIndex;
+      if (Number.isInteger(insertAtIndex) && Number(insertAtIndex) >= 0 && Number(insertAtIndex) < tempOrder.products.length) {
+        tempOrder.products = [
+          ...tempOrder.products.slice(0, insertAtIndex),
+          normalizedIncoming,
+          ...tempOrder.products.slice(insertAtIndex)
+        ];
+      } else {
+        tempOrder.products = [...tempOrder.products, normalizedIncoming];
+      }
     } else {
       const targetProduct = matchedProduct;
-      const targetUid = (_b = targetProduct.metadata) == null ? void 0 : _b.unique_identification_number;
+      const targetUid = (_d = targetProduct.metadata) == null ? void 0 : _d.unique_identification_number;
       const normalizedProduct = (0, import_utils.mergeOrderProductDisplayFields)(
         targetProduct,
         (0, import_utils3.normalizeOrderProduct)({
@@ -3033,6 +3037,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         tempOrder.products[matchedIndex],
         targetUid
       );
+      if (matchedIndex !== tempOrder.products.length - 1) {
+        const mergedProduct = tempOrder.products[matchedIndex];
+        tempOrder.products = [
+          ...tempOrder.products.slice(0, matchedIndex),
+          ...tempOrder.products.slice(matchedIndex + 1),
+          mergedProduct
+        ];
+      }
     }
     if (linked) {
       tempOrder.bookings = [...tempOrder.bookings || [], linked.booking];
@@ -3045,8 +3057,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * await order.addProductToOrder({ product_id: 1, num: 3 }, { start_time: '10:00' });
    * // → tempOrder.products 新增 3 行，每行 num=1，bookings 3 条
    */
-  async addProductToOrder(product, booking) {
+  async addProductToOrder(product, booking, options) {
     const tempOrder = this.ensureTempOrder();
+    const insertAfterProductUid = options == null ? void 0 : options.insertAfterProductUid;
+    const anchorIndex = booking && insertAfterProductUid ? tempOrder.products.findIndex((line) => {
+      var _a;
+      const uid = ((_a = line.metadata) == null ? void 0 : _a.unique_identification_number) || line.unique_identification_number;
+      return uid !== void 0 && uid !== null && String(uid) === String(insertAfterProductUid);
+    }) : -1;
+    let insertAtIndex = anchorIndex >= 0 ? anchorIndex + 1 : void 0;
     if (booking) {
       const productRecord = product;
       const splitCount = (0, import_utils3.getSafeProductNum)(
@@ -3060,14 +3079,22 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           await this.appendProductLineToTempOrder(
             tempOrder,
             singleLine,
-            (0, import_lodash_es.cloneDeep)(booking)
+            (0, import_lodash_es.cloneDeep)(booking),
+            { insertAtIndex }
           );
+          if (insertAtIndex !== void 0)
+            insertAtIndex += 1;
         }
         await this.finalizeProductOrderMutation(tempOrder);
         return tempOrder.products;
       }
     }
-    await this.appendProductLineToTempOrder(tempOrder, product, booking);
+    await this.appendProductLineToTempOrder(
+      tempOrder,
+      product,
+      booking,
+      { insertAtIndex }
+    );
     await this.finalizeProductOrderMutation(tempOrder);
     this.logInfo("addProductToOrder success", {
       product_id: product.product_id,
@@ -3548,7 +3575,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * @example
    * await order.removeProductsFromOrder([identityA, identityB]);
    */
-  async removeProductsFromOrder(identities) {
+  async removeProductsFromOrder(identities, options) {
     var _a, _b, _c, _d;
     const tempOrder = this.ensureTempOrder();
     if (!identities.length) {
@@ -3556,6 +3583,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     const productsBeforeRemove = tempOrder.products || [];
     const bookingsBeforeRemove = tempOrder.bookings || [];
+    const preserveDisplayPosition = options == null ? void 0 : options.preserveDisplayPosition;
+    const anchorIndex = preserveDisplayPosition ? productsBeforeRemove.findIndex((item) => {
+      var _a2;
+      const uid = ((_a2 = item.metadata) == null ? void 0 : _a2.unique_identification_number) || item.unique_identification_number;
+      return uid !== void 0 && uid !== null && String(uid) === String(preserveDisplayPosition.anchorProductUid);
+    }) : -1;
+    const productsAfterAnchor = anchorIndex >= 0 ? productsBeforeRemove.slice(anchorIndex + 1) : [];
     const matchedProducts = productsBeforeRemove.filter((item) => {
       return identities.some((identity) => (0, import_utils3.isIdentityMatch)(item, identity));
     });
@@ -3596,14 +3630,37 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         return !(isAddTimeProduct && lineBookingUid !== void 0 && lineBookingUid !== null && linkedBookingUidsToRemove.has(String(lineBookingUid)));
       });
     }
+    if (preserveDisplayPosition && anchorIndex >= 0) {
+      const remainingProductIndex = tempOrder.products.findIndex((item) => {
+        var _a2;
+        const uid = ((_a2 = item.metadata) == null ? void 0 : _a2.unique_identification_number) || item.unique_identification_number;
+        return uid !== void 0 && uid !== null && String(uid) === String(preserveDisplayPosition.remainingProductUid);
+      });
+      if (remainingProductIndex >= 0) {
+        const remainingProduct = tempOrder.products[remainingProductIndex];
+        const nextProduct = productsAfterAnchor.find(
+          (item) => tempOrder.products.includes(item)
+        );
+        const productsWithoutRemaining = [
+          ...tempOrder.products.slice(0, remainingProductIndex),
+          ...tempOrder.products.slice(remainingProductIndex + 1)
+        ];
+        const nextProductIndex = nextProduct ? productsWithoutRemaining.indexOf(nextProduct) : -1;
+        tempOrder.products = nextProductIndex >= 0 ? [
+          ...productsWithoutRemaining.slice(0, nextProductIndex),
+          remainingProduct,
+          ...productsWithoutRemaining.slice(nextProductIndex)
+        ] : [...productsWithoutRemaining, remainingProduct];
+      }
+    }
     await this.finalizeAfterProductsMutation(tempOrder);
     this.logInfo("removeProductsFromOrder success", {
       identities
     });
     return tempOrder.products;
   }
-  async removeProductFromOrder(identity) {
-    return this.removeProductsFromOrder([identity]);
+  async removeProductFromOrder(identity, options) {
+    return this.removeProductsFromOrder([identity], options);
   }
   /**
    * 仅清空购物车行（products / bookings），不重置整单。
@@ -3928,7 +3985,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder,
       effectivePayments
     );
-    const submitParams = {
+    const submitResult = await this.submitTempOrder({
       payments: effectivePayments,
       paymentStatus,
       smallTicketDataFlag: params.smallTicketDataFlag,
@@ -3942,8 +3999,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         };
         return nextPayload;
       }
-    };
-    const submitResult = params.checkoutSyncTaskEnabled === false ? await this.submitTempOrderAsync(submitParams) : await this.submitTempOrder(submitParams);
+    });
     return { ...completion, submitResult };
   }
   createOrder(params) {
@@ -3960,13 +4016,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       is_deposit: 0,
       relation_products: [],
       relation_forms: [],
-      business_code: params == null ? void 0 : params.business_code,
       ...(params == null ? void 0 : params.extraData) || {}
     };
     let is_deposit = 0;
     if (params.cartItems.length > 0) {
       params.cartItems.forEach((item) => {
-        var _a2;
         if (!item._origin.duration) {
           const { duration, durationType } = (0, import_utils.generateDuration)(item);
           item._origin.duration = duration;
@@ -3975,9 +4029,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         item._origin.sub_type = (0, import_utils.normalizeBookingSubType)(item._origin);
         const discountList = (0, import_utils.getAllDiscountList)(item);
         item._origin.product.discount_list = discountList;
-        if ((_a2 = params == null ? void 0 : params.extraData) == null ? void 0 : _a2.is_add_holder_info) {
-          (0, import_utils.ensureCartItemOriginHolder)(item, this.window);
-        }
         if ((0, import_utils2.isNormalProduct)(item._origin)) {
           order.relation_products.push(item._origin.product);
           const relationForms = item._origin.relation_forms || [];

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

@@ -321,6 +321,24 @@ export interface ReplaceTempOrderOptions {
     saveDraft?: boolean;
 }
 export type AddProductBookingInput = Record<string, any>;
+/**
+ * 添加商品行时的顺序控制。
+ * 默认追加到 products 尾部；预约数量同步可插入到既有预约组的最新行之后，
+ * 避免步进器修改数量改变该组展示位置。
+ */
+export interface AddProductToOrderOptions {
+    insertAfterProductUid?: string;
+}
+/**
+ * 删除商品后的可选位置保持策略。
+ * 预约合并行减量时仍删除最新真实行，再把剩余代表行移动到被删除代表行原位置。
+ */
+export interface RemoveProductsFromOrderOptions {
+    preserveDisplayPosition?: {
+        remainingProductUid: string;
+        anchorProductUid: string;
+    };
+}
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
 export interface UpdateOrderProductParams {
     product_id: number | null;
@@ -396,7 +414,6 @@ export interface CommitOrderParams {
         type: 'virtual' | 'appointment_booking';
         platform?: string;
         extraData?: Record<string, any>;
-        business_code?: string;
     };
 }
 export interface OrderSubmitBooking {
@@ -572,12 +589,6 @@ export interface SyncPaymentsToOrderParams {
     payments: OrderPaymentSource[];
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
     submitWhenPaid?: boolean;
-    /**
-     * Whether the checkout should be queued as the local `sync_sales` task.
-     * Defaults to true to preserve the WebPOS retry path. Set to false when
-     * the caller must wait for the cloud checkout response before proceeding.
-     */
-    checkoutSyncTaskEnabled?: boolean;
     smallTicketDataFlag?: number;
     businessCode?: string;
     channel?: string;
@@ -722,15 +733,15 @@ export interface OrderModuleAPI {
     updateTempOrderCustomer: (customer: UpdateTempOrderCustomerInput) => OrderSnapshot['customer'];
     updateTempOrderBuzzer: (buzzer: string) => string;
     updateTempOrderContactsInfo: (contactsInfo: Record<string, any> | null) => Record<string, any> | null;
-    addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput) => Promise<OrderProduct[]>;
+    addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions) => Promise<OrderProduct[]>;
     updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
     /** 批量更新购物车行，末尾仅触发一次促销重算与 summary 刷新 */
     updateOrderProducts: (paramsList: UpdateOrderProductParams[]) => Promise<OrderProduct[]>;
     updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<OrderProduct[]>;
     updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
-    removeProductFromOrder: (identity: OrderProductIdentity) => Promise<OrderProduct[]>;
+    removeProductFromOrder: (identity: OrderProductIdentity, options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** 批量删除购物车行，末尾仅触发一次促销重算与 summary 刷新 */
-    removeProductsFromOrder: (identities: OrderProductIdentity[]) => Promise<OrderProduct[]>;
+    removeProductsFromOrder: (identities: OrderProductIdentity[], options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** @deprecated no-op；OrderModule 不再负责 tempOrder localStorage 持久化。 */
     persistTempOrder: () => void;
     /**
@@ -740,8 +751,6 @@ export interface OrderModuleAPI {
     setEnableTempOrderPersist: (enabled: boolean) => void;
     /** 是否允许 saveDraft 写入 IndexedDB 草稿。 */
     isTempOrderPersistEnabled: () => boolean;
-    /** 提交 tempOrder 变更并触发 `{moduleName}:changed` 事件 */
-    notifyTempOrderChanged: () => void;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
         platform?: string;

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

@@ -15,7 +15,6 @@ export interface OrderProductsDepositSummary {
     deposit_policy_ids: number[];
     hasDeposit: boolean;
 }
-import type { WindowPlugin } from '../../plugins';
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -178,15 +177,6 @@ export declare const mergeRelationForms: (relationForms: {
     form_id: number;
     form_record_ids: number[];
 }[];
-export interface CartOrderHolder {
-    customer_id?: number;
-    form_id: number | string;
-    form_record: (number | string)[] | null;
-}
-/**
- * 为购物车行补齐订单所需的 holder 信息（与 cartAccount 结构保持一致）
- */
-export declare function ensureCartItemOriginHolder(cartItem: CartItem, window?: WindowPlugin): void;
 export declare const getAllDiscountList: (cartItem: CartItem) => any;
 export { createUuidV4 };
 export declare function isTempOrder(data: any): data is OrderTempOrder;