@pisell/pisellos 2.2.198 → 2.2.200

package/lib/modules/SalesSummary/utils.js

@@ -78,8 +78,8 @@ function getBundleUnitPrice(product, useOriginal = false) {
   const bundleItems = product.product_bundle || [];
   return bundleItems.reduce((sum, item) => {
     const quantity = getSafeNum(item == null ? void 0 : item.num);
-    const price = useOriginal ? toDecimal((item == null ? void 0 : item.original_price) ?? (item == null ? void 0 : item.product_price) ?? (item == null ? void 0 : item.price)) : toDecimal((item == null ? void 0 : item.bundle_selling_price) ?? (item == null ? void 0 : item.price));
-    return sum.plus(price.times(quantity));
+    const signedUnit = (0, import_utils2.getBundleSignedUnit)(item, { useOriginal });
+    return sum.plus(signedUnit.times(quantity));
   }, new import_decimal.default(0));
 }
 function getUnitPaymentTotal(product) {
@@ -607,20 +607,28 @@ function calculateSingleItemTax(params) {
     return new import_decimal.default(0);
   return price.dividedBy(divisor).times(rate);
 }
-function getMainProductPaymentTotal(product) {
+function getMainAttachedBundleSellingTotal(product) {
   var _a, _b;
   const mainSelling = ((_a = product.metadata) == null ? void 0 : _a.main_product_selling_price) ?? ((_b = product.metadata) == null ? void 0 : _b.main_product_original_price) ?? 0;
   let total = toDecimal(mainSelling);
   const bundleItems = product.product_bundle || [];
   for (const bundleItem of bundleItems) {
     if (isBundleMarkupOrDiscount(bundleItem)) {
-      const unit = toDecimal(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
+      const unit = (0, import_utils2.getBundleSignedUnit)(bundleItem);
       const qty = getSafeNum(bundleItem.num ?? bundleItem.quantity);
       total = total.plus(unit.times(qty));
     }
   }
   return import_decimal.default.max(total, 0);
 }
+function getMainProductPaymentTotal(product) {
+  var _a;
+  const attachedPayment = (_a = product.metadata) == null ? void 0 : _a.main_product_attached_bundle_payment_price;
+  if (attachedPayment !== void 0 && attachedPayment !== null && attachedPayment !== "") {
+    return import_decimal.default.max(toDecimal(attachedPayment), 0);
+  }
+  return getMainAttachedBundleSellingTotal(product);
+}
 function getExplicitTaxRemainder(item) {
   var _a;
   const value = (item == null ? void 0 : item.tax_fee_rounding_remainder) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.tax_fee_rounding_remainder);
@@ -805,51 +813,44 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
     originTax: totalOriginTax.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP)
   };
 }
-function applyShopDiscountToSurchargeBase(products, productAmount, shopDiscountAmount) {
-  if (productAmount.lte(0) || shopDiscountAmount.lte(0))
-    return () => {
-    };
-  const effectiveDiscount = import_decimal.default.min(productAmount, shopDiscountAmount);
-  if (effectiveDiscount.lte(0))
-    return () => {
-    };
-  const snapshots = products.map((product) => {
-    var _a;
-    return {
-      product,
-      metadata: product.metadata,
-      attachedBundleSellingPrice: (_a = product.metadata) == null ? void 0 : _a.main_product_attached_bundle_selling_price
-    };
-  });
+function allocateShopDiscountToPayment(products, productAmount, shopDiscountAmount) {
+  const effectiveDiscount = productAmount.lte(0) ? new import_decimal.default(0) : import_decimal.default.max(import_decimal.default.min(productAmount, shopDiscountAmount), 0);
   let allocatedDiscount = new import_decimal.default(0);
   products.forEach((product, index) => {
     const quantity = new import_decimal.default(getSafeNum(product.num));
-    const lineAmount = getUnitPaymentTotal(product).times(quantity);
-    const lineDiscount = index === products.length - 1 ? effectiveDiscount.minus(allocatedDiscount) : toAmountFormat(lineAmount.div(productAmount).times(effectiveDiscount));
+    const sellingUnit = getUnitPaymentTotal(product);
+    const lineSellingTotal = sellingUnit.times(quantity);
+    const lineDiscount = effectiveDiscount.lte(0) ? new import_decimal.default(0) : index === products.length - 1 ? import_decimal.default.max(effectiveDiscount.minus(allocatedDiscount), 0) : toAmountFormat(lineSellingTotal.div(productAmount).times(effectiveDiscount));
     allocatedDiscount = allocatedDiscount.plus(lineDiscount);
     const unitDiscount = quantity.lte(0) ? new import_decimal.default(0) : lineDiscount.div(quantity);
-    const currentBase = getMainSurchargeUnitAmount(product);
-    const adjustedBase = import_decimal.default.max(currentBase.minus(unitDiscount), 0);
+    const paymentUnit = import_decimal.default.max(sellingUnit.minus(unitDiscount), 0);
+    const rate = sellingUnit.lte(0) ? new import_decimal.default(1) : toBcScale(paymentUnit.div(sellingUnit), 6);
+    const mainSellingTotal = getMainAttachedBundleSellingTotal(product);
+    const mainPaymentTotal = toAmountFormat(bcMul(mainSellingTotal, rate, 6));
     product.metadata = {
       ...product.metadata || {},
-      main_product_attached_bundle_selling_price: adjustedBase.toFixed(2)
+      average_discount_amount_rate: rate.toString(),
+      main_product_attached_bundle_selling_price: mainSellingTotal.toFixed(2),
+      main_product_attached_bundle_payment_price: mainPaymentTotal.toFixed(2)
     };
-  });
-  return () => {
-    for (const snapshot of snapshots) {
-      if (!snapshot.metadata) {
-        delete snapshot.product.metadata;
+    for (const bundle of product.product_bundle || []) {
+      if (isBundleOriginalPrice(bundle)) {
+        const bundleSelling = toDecimal(
+          bundle.bundle_selling_price ?? bundle.bundle_sum_price ?? bundle.price ?? 0
+        );
+        bundle.bundle_payment_price = toAmountFormat(bcMul(bundleSelling, rate, 6)).toFixed(2);
         continue;
       }
-      snapshot.product.metadata = {
-        ...snapshot.product.metadata,
-        main_product_attached_bundle_selling_price: snapshot.attachedBundleSellingPrice
-      };
-      if (snapshot.attachedBundleSellingPrice === void 0) {
-        delete snapshot.product.metadata.main_product_attached_bundle_selling_price;
+      if ((0, import_utils2.isMarkdownBundle)(bundle)) {
+        const magnitude = (0, import_utils2.getBundleSellingMagnitude)(bundle);
+        bundle.custom_price = bundle.custom_price ?? bundle.price;
+        bundle.price = magnitude.toFixed(2);
+        bundle.bundle_selling_price = magnitude.toFixed(2);
+        bundle.bundle_payment_price = toAmountFormat(bcMul(magnitude, rate, 6)).toFixed(2);
       }
     }
-  };
+    product.payment_price = paymentUnit.toFixed(2);
+  });
 }
 function createEmptySalesSummary() {
   return {
@@ -907,12 +908,9 @@ function calculateSalesSummary(params) {
     var _a;
     return (_a = getPersistedMainSurchargeFee(product)) == null ? void 0 : _a.gt(0);
   });
-  const restoreSurchargeBase = hasPersistedSurchargeSnapshot ? () => {
-  } : applyShopDiscountToSurchargeBase(
-    summaryProducts,
-    productAmount,
-    shopDiscountAmount
-  );
+  if (!hasPersistedSurchargeSnapshot) {
+    allocateShopDiscountToPayment(summaryProducts, productAmount, shopDiscountAmount);
+  }
   const surchargeServiceItems = buildSurchargeServiceItems(summaryProducts);
   (0, import_utils.getSurcharge)(
     {
@@ -933,7 +931,6 @@ function calculateSalesSummary(params) {
     sourceItems: surchargeServiceItems,
     surchargeList
   });
-  restoreSurchargeBase();
   const surchargeAmount = new import_decimal.default(
     (0, import_utils.getSurchargeAmount)(
       { bookingDetail: null, bookingId: void 0 },

package/lib/server/index.d.ts

@@ -287,6 +287,8 @@ declare class Server {
     private handleOrderSalesCheckout;
     private handleOrderCheckout;
     private handleOrderCheckoutSubmit;
+    private handlePendingSyncCheckoutOrder;
+    private buildPendingSyncCheckoutOrder;
     private handleOrderSalesDetail;
     /**
      * 解析 order_ids 入参，兼容 url query / data 字段、字符串(csv) / 数组两种形态。
@@ -320,6 +322,7 @@ declare class Server {
     private extractOrderDataFromCheckoutResponse;
     private normalizeCheckoutResponse;
     private extractBackendErrorResponse;
+    private isExplicitBackendErrorResponse;
     /**
      * 从 url 或路由 path 解析 pathname（不含 query，去掉末尾 /）
      */

package/lib/server/index.js

@@ -1749,7 +1749,12 @@ var Server = class {
     });
     if (!((_a = this.app) == null ? void 0 : _a.request)) {
       this.logError(`${title}: app.request 不可用`);
-      return { code: 500, status: false, message: "app.request 不可用", data: null };
+      return this.handlePendingSyncCheckoutOrder({
+        backendPath,
+        data,
+        title,
+        reason: "app.request 不可用"
+      });
     }
     try {
       const response = await this.app.request.post(backendPath, data, {
@@ -1759,7 +1764,8 @@ var Server = class {
       });
       const fresh = this.extractOrderDataFromCheckoutResponse(response);
       if (fresh && this.order) {
-        await this.order.upsertOrdersFromRemote([fresh]);
+        const syncedOrder = { ...fresh, need_sync: 0 };
+        await this.order.upsertOrdersFromRemote([syncedOrder]);
         this.logInfo(`${title}: 订单已同步到本地`, {
           order_id: fresh.order_id,
           external_sale_number: fresh.external_sale_number,
@@ -1778,9 +1784,77 @@ var Server = class {
       const backendError = this.extractBackendErrorResponse(error);
       if (backendError)
         return backendError;
+      return this.handlePendingSyncCheckoutOrder({
+        backendPath,
+        data,
+        title,
+        reason: errorMessage
+      });
+    }
+  }
+  async handlePendingSyncCheckoutOrder(params) {
+    const { backendPath, data, title, reason } = params;
+    const pendingOrder = this.buildPendingSyncCheckoutOrder(data);
+    if (!pendingOrder) {
+      this.logError(`${title}: checkout 失败且订单缺少本地存储标识`, {
+        backendPath,
+        reason
+      });
+      return {
+        code: 500,
+        status: false,
+        message: "订单缺少本地存储标识，无法写入待同步队列",
+        data: null
+      };
+    }
+    if (!this.order || typeof this.order.upsertPendingSyncOrders !== "function") {
+      this.logError(`${title}: Order 模块不支持本地待同步写入`, {
+        backendPath,
+        reason
+      });
+      return {
+        code: 500,
+        status: false,
+        message: "Order 模块不支持本地待同步写入",
+        data: null
+      };
+    }
+    try {
+      await this.order.upsertPendingSyncOrders([pendingOrder]);
+      this.logWarning(`${title}: 后端未明确报错，订单已写入本地待同步`, {
+        backendPath,
+        reason,
+        order_id: pendingOrder.order_id,
+        external_sale_number: pendingOrder.external_sale_number,
+        order_number: pendingOrder.order_number
+      });
+      return {
+        code: 200,
+        status: true,
+        message: "",
+        data: pendingOrder
+      };
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      this.logError(`${title}: 写入本地待同步订单失败`, {
+        backendPath,
+        reason,
+        error: errorMessage
+      });
       return { code: 500, status: false, message: errorMessage, data: null };
     }
   }
+  buildPendingSyncCheckoutOrder(data) {
+    if (!data || typeof data !== "object")
+      return null;
+    const hasStorageKey = data.external_sale_number !== void 0 && data.external_sale_number !== null && data.external_sale_number !== "" ? true : data.order_id !== void 0 && data.order_id !== null && data.order_id !== "";
+    if (!hasStorageKey)
+      return null;
+    return {
+      ...data,
+      need_sync: 1
+    };
+  }
   /**
    * 解析 order_ids 入参，兼容 url query / data 字段、字符串(csv) / 数组两种形态。
    * 自动 trim、去空、按字符串去重，输出归一化后的字符串数组。
@@ -1993,9 +2067,14 @@ var Server = class {
       error == null ? void 0 : error.body
     ];
     return candidates.find(
-      (candidate) => candidate && typeof candidate === "object"
+      (candidate) => this.isExplicitBackendErrorResponse(candidate)
     ) || null;
   }
+  isExplicitBackendErrorResponse(candidate) {
+    if (!candidate || typeof candidate !== "object")
+      return false;
+    return candidate.code !== void 0 || candidate.status !== void 0 || typeof candidate.message === "string";
+  }
   /**
    * 从 url 或路由 path 解析 pathname（不含 query，去掉末尾 /）
    */

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

@@ -92,6 +92,11 @@ export declare class OrderModule extends BaseModule implements Module {
      * 供 /update/localOrder 等在「本地尚无该单」时写入新建单。
      */
     upsertOrdersFromRemote(freshOrders: OrderData[]): Promise<void>;
+    /**
+     * 将本地待同步订单按 SQLite storage key 合并进 store 并落库。
+     * checkout 离线兜底可能没有 order_id，但通常会有 external_sale_number。
+     */
+    upsertPendingSyncOrders(pendingOrders: OrderData[]): Promise<void>;
     /**
      * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
      */
@@ -172,6 +177,9 @@ export declare class OrderModule extends BaseModule implements Module {
     private getStorageItem;
     private setStorageItem;
     private loadOrdersFromSQLite;
+    private isPendingSyncOrder;
+    private normalizeRemoteSyncedOrder;
+    private mergeRemoteSnapshotWithPendingOrders;
     /**
      * 串行执行订单 SQLite 写入任务，避免快照替换与增量 upsert 并发交错。
      *

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

@@ -44,6 +44,7 @@ var ORDER_SQLITE_DEDUPE_MS = 15e3;
 var ORDER_SILENT_REFRESH_MIN_INTERVAL_MS = 3e4;
 var ORDER_BUSINESS_WRITE_SOURCES = /* @__PURE__ */ new Set([
   "upsertOrdersFromRemote",
+  "upsertPendingSyncOrders",
   "overwriteExistingOrder"
 ]);
 var OrderModule = class extends import_BaseModule.BaseModule {
@@ -484,6 +485,53 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.logInfo("upsertOrdersFromRemote-开始", { count: freshOrders.length });
     await this.mergeOrdersToStore(freshOrders, "upsertOrdersFromRemote");
   }
+  /**
+   * 将本地待同步订单按 SQLite storage key 合并进 store 并落库。
+   * checkout 离线兜底可能没有 order_id，但通常会有 external_sale_number。
+   */
+  async upsertPendingSyncOrders(pendingOrders) {
+    if (!(pendingOrders == null ? void 0 : pendingOrders.length)) {
+      this.logInfo("upsertPendingSyncOrders-订单列表为空", {});
+      return;
+    }
+    const pendingMap = /* @__PURE__ */ new Map();
+    for (const order of pendingOrders) {
+      const storageKey = this.getOrderStorageKey(order);
+      if (!storageKey)
+        continue;
+      pendingMap.set(storageKey, order);
+    }
+    if (pendingMap.size === 0) {
+      this.logError("upsertPendingSyncOrders-订单缺少可落库标识", {
+        count: pendingOrders.length
+      });
+      return;
+    }
+    this.logInfo("upsertPendingSyncOrders-开始", { count: pendingMap.size });
+    const patchedOrders = [...pendingMap.values()];
+    const mergeActions = {};
+    const updatedList = this.store.list.map((order) => {
+      const storageKey = this.getOrderStorageKey(order);
+      if (!storageKey || !pendingMap.has(storageKey))
+        return order;
+      const pendingOrder = pendingMap.get(storageKey);
+      pendingMap.delete(storageKey);
+      mergeActions[storageKey] = "update";
+      return pendingOrder;
+    });
+    for (const [storageKey, order] of pendingMap.entries()) {
+      mergeActions[storageKey] = "insert";
+      updatedList.push(order);
+    }
+    this.store.list = updatedList;
+    this.syncOrdersMap();
+    await this.patchOrdersInSQLite(patchedOrders, "upsertPendingSyncOrders", mergeActions);
+    this.logInfo("upsertPendingSyncOrders-结束", {
+      count: patchedOrders.length,
+      storeOrderCountAfter: this.store.list.length
+    });
+    this.core.effects.emit(import_types.OrderHooks.onOrdersChanged, this.store.list);
+  }
   /**
    * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
    */
@@ -778,12 +826,32 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const id = order == null ? void 0 : order.order_id;
       if (id === void 0 || id === null)
         continue;
-      freshMap.set(this.getIdKey(id), order);
+      freshMap.set(this.getIdKey(id), this.normalizeRemoteSyncedOrder(order));
+    }
+    const freshStorageKeyMap = /* @__PURE__ */ new Map();
+    for (const order of freshMap.values()) {
+      const storageKey = this.getOrderStorageKey(order);
+      if (!storageKey)
+        continue;
+      freshStorageKeyMap.set(storageKey, order);
     }
     const uniqueFreshCount = freshMap.size;
     const patchedOrders = [...freshMap.values()];
     const mergeActions = {};
     const updatedList = this.store.list.map((order) => {
+      const storageKey = this.getOrderStorageKey(order);
+      if (storageKey && freshStorageKeyMap.has(storageKey)) {
+        const fresh2 = freshStorageKeyMap.get(storageKey);
+        freshStorageKeyMap.delete(storageKey);
+        const freshId = fresh2.order_id;
+        if (freshId !== void 0 && freshId !== null) {
+          freshMap.delete(this.getIdKey(freshId));
+          mergeActions[this.getIdKey(freshId)] = "update";
+        } else {
+          mergeActions[storageKey] = "update";
+        }
+        return fresh2;
+      }
       const id = order.order_id;
       if (id === void 0 || id === null)
         return order;
@@ -960,6 +1028,33 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return [];
     }
   }
+  isPendingSyncOrder(order) {
+    return Number(order == null ? void 0 : order.need_sync) === 1;
+  }
+  normalizeRemoteSyncedOrder(order) {
+    if (this.isPendingSyncOrder(order))
+      return order;
+    return {
+      ...order,
+      need_sync: 0
+    };
+  }
+  mergeRemoteSnapshotWithPendingOrders(remoteOrders, existingOrders) {
+    const merged = remoteOrders.map((order) => this.normalizeRemoteSyncedOrder(order));
+    const remoteStorageKeys = new Set(
+      merged.map((order) => this.getOrderStorageKey(order)).filter(Boolean)
+    );
+    for (const order of existingOrders) {
+      if (!this.isPendingSyncOrder(order))
+        continue;
+      const storageKey = this.getOrderStorageKey(order);
+      if (!storageKey || remoteStorageKeys.has(storageKey))
+        continue;
+      merged.push(order);
+      remoteStorageKeys.add(storageKey);
+    }
+    return merged;
+  }
   /**
    * 串行执行订单 SQLite 写入任务，避免快照替换与增量 upsert 并发交错。
    *
@@ -1083,12 +1178,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!this.dbManager) {
       return;
     }
-    const orderListSnapshot = (0, import_lodash_es.cloneDeep)(orderList);
+    const remoteSnapshot = (0, import_lodash_es.cloneDeep)(orderList);
     try {
       await this.runInOrderSQLiteSaveQueue(async () => {
+        const existingOrders = typeof this.dbManager.getAll === "function" ? await this.dbManager.getAll(INDEXDB_STORE_NAME) : [];
+        const orderListSnapshot = this.mergeRemoteSnapshotWithPendingOrders(
+          remoteSnapshot,
+          existingOrders || []
+        );
         this.logInfo("replaceOrdersSnapshotInSQLite-开始", {
           source,
-          count: orderListSnapshot.length
+          count: orderListSnapshot.length,
+          remoteCount: remoteSnapshot.length,
+          preservedPendingCount: orderListSnapshot.length - remoteSnapshot.length
         });
         await this.dbManager.clear(INDEXDB_STORE_NAME);
         this.logInfo("replaceOrdersSnapshotInSQLite-clear完成", {
@@ -1107,7 +1209,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     } catch (error) {
       this.logError("全量保存订单到 SQLite 失败", {
         error: error instanceof Error ? error.message : String(error),
-        orderList: orderListSnapshot.length
+        orderList: remoteSnapshot.length
       });
     }
   }

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

@@ -393,6 +393,8 @@ export interface OrderData {
     /** 本地辅助字段 */
     shop_id?: number;
     create_date?: string;
+    /** 本地待同步标记：1 表示需要后续同步到云端 */
+    need_sync?: 0 | 1 | number;
     /** 兼容：部分场景仍使用顶层 total_amount */
     total_amount?: OrderMoneyString | number;
     /** 扩展字段（物流、标签等）；使用 any 以便筛选与数据源扩展 */

package/lib/solution/BaseSales/index.js

@@ -1301,7 +1301,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (!((_b = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _b.length))
       return [];
     const products = (_c = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _c.filter((n) => n.product_id);
-    return products.map((product) => {
+    const walletProducts = products.map((product) => {
       const metadata = product.metadata || {};
       return {
         product_id: product.product_id,
@@ -1345,6 +1345,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         })
       };
     });
+    return walletProducts;
   }
   async initWalletData(params) {
     if (!this.store.order)

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

@@ -126,6 +126,7 @@ export interface BaseSalesSummary {
     shipping_tax_fee: string;
     tax_fee: string;
     surcharge_fee: string;
+    surcharges?: any[];
     discount_amount: string;
     deposit_amount: string;
     deposit?: {

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -73,15 +73,29 @@ function normalizeBundleItems(bundleItems, preferPriceField = false) {
     const unitSelling = preferPriceField ? bundleItem.price ?? bundleItem.bundle_selling_price ?? bundleItem.custom_price ?? bundleItem.product_price ?? "0" : bundleItem.bundle_selling_price ?? bundleItem.price ?? bundleItem.custom_price ?? bundleItem.product_price ?? "0";
     const unitStr = toPriceString(unitSelling, "0.00");
     const num = toSafePositiveInt((bundleItem == null ? void 0 : bundleItem.num) ?? (bundleItem == null ? void 0 : bundleItem.quantity), 1);
-    return {
+    const magnitudeSource = {
+      ...bundleItem,
+      option: normalizeOptionItems(bundleItem == null ? void 0 : bundleItem.option),
+      bundle_selling_price: unitStr,
+      // 计算 markdown 净额时，只传真实毛价；仅有 bundle_selling_price 时按历史净额兜底。
+      price: bundleItem.price ?? bundleItem.custom_price
+    };
+    const normalizedItem = {
       ...bundleItem,
       num,
       quantity: (bundleItem == null ? void 0 : bundleItem.quantity) ?? num,
+      // price 保留毛价（markdown 仍为正），由 price_type 决定符号。
       price: bundleItem.price ?? unitStr,
       bundle_selling_price: unitStr,
       original_price: bundleItem.original_price ?? bundleItem.product_price ?? bundleItem.price ?? unitStr,
       option: normalizeOptionItems(bundleItem == null ? void 0 : bundleItem.option)
     };
+    normalizedItem.bundle_selling_price = (0, import_utils.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
+    if ((normalizedItem.price_type ?? normalizedItem.custom_price_type) === "markdown" && (normalizedItem.price_type_ext === "" || normalizedItem.price_type_ext === void 0 || normalizedItem.price_type_ext === null)) {
+      normalizedItem.custom_price = normalizedItem.custom_price ?? normalizedItem.price;
+      normalizedItem.price = normalizedItem.bundle_selling_price;
+    }
+    return normalizedItem;
   });
 }
 function findVariantById(origin, variantId) {

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

@@ -12,6 +12,8 @@ import { AddProductDecideContext, AddProductRequiresDetailPayload } from './util
 import { type BuildCacheItemFromOrderLineInput } from '../../modules/BookingContext/utils/buildCacheItemFromOrderLine';
 import { type BuildNormalProductCacheItemFromOrderLineInput } from '../../modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine';
 import type { AddProductBookingInput, OrderProduct, OrderProductIdentity, UpdateOrderProductParams } from '../../modules/Order/types';
+import { type TransitionChildBookingParams } from './utils/bookingStatus';
+export type { BookingTransitionAction, TransitionChildBookingParams, } from './utils/bookingStatus';
 export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -68,6 +70,27 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * @returns 接口返回的 data
      */
     setBookingStatus(status: string): Promise<any>;
+    /**
+     * 子预约状态机转移（POST /schedule/booking-transition/{schedule_event_id}）。
+     *
+     * 与 `setBookingStatus`（父预约 PUT appointment-status）不同，本方法按子预约
+     * `schedule_event_id` 调用状态转移接口，body 为 `{ action }`。
+     *
+     * 流程：能解析出目标状态时先乐观更新对应子预约的 `appointment_status`，
+     * 再调 POST；成功后强制刷新销售详情；失败则回滚该子预约本地状态并抛错。
+     * `reschedule` 暂未启用状态矩阵，跳过乐观更新仅调接口。
+     *
+     * @param params.schedule_event_id 子预约 schedule_event_id
+     * @param params.action 转移动作：confirm | reject | arrive | start | complete | cancel | no_show | reschedule
+     * @returns 接口返回的 data
+     *
+     * @example
+     * await bookingTicket.transitionChildBooking({
+     *   schedule_event_id: 301,
+     *   action: 'confirm',
+     * });
+     */
+    transitionChildBooking(params: TransitionChildBookingParams): Promise<any>;
     /**
      * 基于当前 tempOrder.order_id 强制从远端重新拉取销售详情。
      *

package/lib/solution/BookingTicket/index.js

@@ -274,6 +274,66 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       throw error;
     }
   }
+  /**
+   * 子预约状态机转移（POST /schedule/booking-transition/{schedule_event_id}）。
+   *
+   * 与 `setBookingStatus`（父预约 PUT appointment-status）不同，本方法按子预约
+   * `schedule_event_id` 调用状态转移接口，body 为 `{ action }`。
+   *
+   * 流程：能解析出目标状态时先乐观更新对应子预约的 `appointment_status`，
+   * 再调 POST；成功后强制刷新销售详情；失败则回滚该子预约本地状态并抛错。
+   * `reschedule` 暂未启用状态矩阵，跳过乐观更新仅调接口。
+   *
+   * @param params.schedule_event_id 子预约 schedule_event_id
+   * @param params.action 转移动作：confirm | reject | arrive | start | complete | cancel | no_show | reschedule
+   * @returns 接口返回的 data
+   *
+   * @example
+   * await bookingTicket.transitionChildBooking({
+   *   schedule_event_id: 301,
+   *   action: 'confirm',
+   * });
+   */
+  async transitionChildBooking(params) {
+    var _a, _b;
+    const { schedule_event_id, action } = params;
+    if (schedule_event_id === void 0 || schedule_event_id === null || schedule_event_id === "") {
+      throw new Error("transitionChildBooking: schedule_event_id 不能为空");
+    }
+    if (!action) {
+      throw new Error("transitionChildBooking: action 不能为空");
+    }
+    const tempOrder = (_b = (_a = this.store.order) == null ? void 0 : _a.getTempOrder) == null ? void 0 : _b.call(_a);
+    if (!tempOrder) {
+      throw new Error("transitionChildBooking: tempOrder 未加载");
+    }
+    const orderId = tempOrder.order_id;
+    if (orderId === void 0 || orderId === null) {
+      throw new Error("transitionChildBooking: tempOrder.order_id 缺失");
+    }
+    const bookings = Array.isArray(tempOrder.bookings) ? tempOrder.bookings : [];
+    const targetStatus = (0, import_bookingStatus.resolveStatusAfterTransition)(action);
+    const previous = targetStatus !== null ? (0, import_bookingStatus.applyChildBookingStatus)(bookings, schedule_event_id, targetStatus) : void 0;
+    try {
+      const res = await this.request.post(
+        `/schedule/booking-transition/${schedule_event_id}`,
+        { action }
+      );
+      await this.refreshSalesDetail();
+      this.core.effects.emit(`${this.name}:onChildBookingStatusChange`, {
+        orderId,
+        schedule_event_id,
+        action,
+        status: targetStatus
+      });
+      return (res == null ? void 0 : res.data) ?? res;
+    } catch (error) {
+      if (previous !== void 0) {
+        (0, import_bookingStatus.restoreChildBookingStatus)(bookings, schedule_event_id, previous);
+      }
+      throw error;
+    }
+  }
   /**
    * 基于当前 tempOrder.order_id 强制从远端重新拉取销售详情。
    *