@pisell/pisellos 2.2.164 → 2.2.165

package/lib/modules/Order/utils.js

@@ -47,6 +47,8 @@ __export(utils_exports, {
   normalizeBookingSubType: () => normalizeBookingSubType,
   normalizeSubmitBooking: () => normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue: () => normalizeSubmitCollectPaxValue,
+  resolveManualOverrideLineOriginalPrice: () => resolveManualOverrideLineOriginalPrice,
+  resolveRulesManualDiscountFlag: () => resolveRulesManualDiscountFlag,
   resolveSubmitCollectPax: () => resolveSubmitCollectPax,
   sumOptionUnitPrice: () => sumOptionUnitPrice
 });
@@ -80,6 +82,36 @@ function sumOptionUnitPrice(options) {
   }
   return total;
 }
+function resolveRulesManualDiscountFlag(metadata) {
+  if (!metadata)
+    return void 0;
+  if (metadata.is_manual_discount === true || metadata.is_manual_discount === 1) {
+    return true;
+  }
+  const priceOverride = metadata.price_override;
+  if (priceOverride !== void 0 && priceOverride !== null && priceOverride !== "") {
+    return true;
+  }
+  return void 0;
+}
+function resolveManualOverrideLineOriginalPrice(params, fallbackCompositeOriginal) {
+  var _a, _b;
+  const metadata = params.metadata || {};
+  const priceOverride = metadata.price_override;
+  if (priceOverride === void 0 || priceOverride === null || priceOverride === "") {
+    return fallbackCompositeOriginal;
+  }
+  const refTotal = (_b = (_a = metadata.origin) == null ? void 0 : _a._extend) == null ? void 0 : _b.origin_total;
+  if (refTotal === void 0 || refTotal === null || refTotal === "") {
+    return fallbackCompositeOriginal;
+  }
+  const parsed = Number(refTotal);
+  if (!Number.isFinite(parsed)) {
+    return fallbackCompositeOriginal;
+  }
+  const num = Number(params.num) > 0 ? Number(params.num) : 1;
+  return new import_decimal.default(parsed).dividedBy(num).toDecimalPlaces(2).toFixed(2);
+}
 function createDefaultOrderRulesHooks() {
   const toUnitPriceString = (totalLike, num) => {
     const effectiveNum = Number(num) > 0 ? Number(num) : 1;
@@ -87,7 +119,7 @@ function createDefaultOrderRulesHooks() {
   };
   return {
     getProduct: (product) => {
-      var _a, _b, _c, _d, _e, _f;
+      var _a, _b, _c, _d, _e;
       const metadataAny = product.metadata || {};
       const optionSum = sumOptionUnitPrice(product.product_option_item);
       let sourcePrice;
@@ -135,9 +167,11 @@ function createDefaultOrderRulesHooks() {
         bundle: product.product_bundle || [],
         booking_id: ((_b = product.metadata) == null ? void 0 : _b.booking_id) || null,
         isClient: false,
-        isManualDiscount: ((_c = product.metadata) == null ? void 0 : _c.is_manual_discount) || false,
-        holder_id: (_d = product.metadata) == null ? void 0 : _d.holder_id,
-        startDate: ((_e = product.metadata) == null ? void 0 : _e.start_date) || ((_f = product.metadata) == null ? void 0 : _f.startDate)
+        // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
+        // 无券时会把 bundle 价还原成 original_price（手动改价套餐会从 20 回到 30）。
+        isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
+        holder_id: (_c = product.metadata) == null ? void 0 : _c.holder_id,
+        startDate: ((_d = product.metadata) == null ? void 0 : _d.start_date) || ((_e = product.metadata) == null ? void 0 : _e.startDate)
       };
     },
     setProduct: (product, values) => {
@@ -160,10 +194,14 @@ function createDefaultOrderRulesHooks() {
         bundle: nextBundle,
         useOriginalBundle: true
       });
+      const finalOriginalPrice = resolveManualOverrideLineOriginalPrice(
+        { num: nextNum, metadata: metadataAny },
+        composedOriginalPrice
+      );
       return {
         ...product,
         selling_price: composedSellingPrice,
-        original_price: composedOriginalPrice,
+        original_price: finalOriginalPrice,
         discount_list: values.discount_list ?? product.discount_list,
         num: values.quantity ?? product.num,
         product_bundle: nextBundle,
@@ -428,8 +466,8 @@ function createDefaultTempOrder(params) {
     order_number: null,
     shop_order_number: null,
     shop_full_order_number: null,
-    type: "appointment_booking",
-    business_code: "appointment_booking",
+    type: "",
+    business_code: void 0,
     platform: "h5",
     sales_channel: "my_pisel",
     order_sales_channel: "online_store",
@@ -471,6 +509,7 @@ function createDefaultTempOrder(params) {
   };
 }
 function buildSubmitPayload(params) {
+  var _a;
   const {
     tempOrder,
     cacheId,
@@ -503,6 +542,14 @@ function buildSubmitPayload(params) {
     holder_id: _holderId,
     ...tempOrderRest
   } = tempOrder;
+  let submitType = type ?? tempOrder.type;
+  if (!submitType) {
+    if ((_a = tempOrder == null ? void 0 : tempOrder.bookings) == null ? void 0 : _a.length) {
+      submitType = "appointment_booking";
+    } else {
+      submitType = "virtual";
+    }
+  }
   const payload = {
     ...tempOrderRest,
     order_number: null,
@@ -510,8 +557,8 @@ function buildSubmitPayload(params) {
     shop_full_order_number: null,
     platform: normalizeSubmitPlatform(platform),
     request_unique_idempotency_token: tempOrder.request_unique_idempotency_token || `${tempOrder.external_sale_number}_${now.getTime()}`,
-    type: type ?? tempOrder.type ?? "table-order",
-    business_code: businessCode ?? tempOrder.business_code ?? "table-order",
+    type: submitType,
+    business_code: businessCode ?? tempOrder.business_code,
     sales_channel: tempOrder.sales_channel || "my_pisel",
     order_sales_channel: channel ?? tempOrder.order_sales_channel ?? "online_store",
     status: tempOrder.status || "normal",
@@ -632,6 +679,8 @@ function formatV1Product(products) {
   normalizeBookingSubType,
   normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue,
+  resolveManualOverrideLineOriginalPrice,
+  resolveRulesManualDiscountFlag,
   resolveSubmitCollectPax,
   sumOptionUnitPrice
 });

package/lib/server/index.js

@@ -1870,6 +1870,7 @@ var Server = class {
         return;
       searchParams.append("with[]", String(field));
     });
+    searchParams.append("lookup_mode", "multi");
     const query = searchParams.toString();
     return `/shop/order/sales/${encodeURIComponent(orderId)}${query ? `?${query}` : ""}`;
   }

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

@@ -1,6 +1,6 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesCalculateProductBookingPriceParams, BaseSalesProductBookingPriceResult, BaseSalesScanCodeResult } from './types';
+import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesProductBookingPriceResult, BaseSalesScanCodeResult } from './types';
 import { OrderModule } from '../../modules/Order';
 import type { AddProductBookingInput, LoadSalesDetailParams, OrderPaymentData, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
@@ -110,15 +110,22 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     updateTempOrderNote(note: string): string;
     updateTempOrderNote(note: string, sync: true): Promise<string>;
     updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
+    updateRemoteOrderNote(orderId: number | string, note: string): void;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     private ensureTempOrder;
     addNewOrder(): Promise<OrderTempOrder>;
     saveDraft(): Promise<void>;
     restoreOrder(): Promise<OrderTempOrder>;
+    /**
+     * 仅清空 tempOrder 购物车行（products / bookings / discount_list）。
+     * 同步清空内存中的 salesDetail 商品/预约视图，避免编辑态仍读到旧 bookings。
+     */
+    clearOrderCartLines(): Promise<OrderTempOrder>;
     getOrderProducts(): import("../../modules/Order/types").OrderProduct[];
     getSummary(): Promise<import("../../modules/Order/types").OrderSummary>;
     private getHistoricalProductDiscountList;
+    private isPersistedOrderProduct;
     private mergeHistoricalDiscountList;
     loadDiscountConfig(params?: {
         customerId?: number;
@@ -215,6 +222,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     calculateProductBookingPrice(params: BaseSalesCalculateProductBookingPriceParams): Promise<BaseSalesProductBookingPriceResult>;
     addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProduct(params: UpdateOrderProductParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
+    updateOrderProductQuantity(params: BaseSalesUpdateOrderProductQuantityParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderBooking(params: UpdateOrderBookingParams): any[];
     /**
      * 设置单行商品备注（与整单 `updateTempOrderNote` 区分）。

package/lib/solution/BaseSales/index.js

@@ -401,6 +401,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  updateRemoteOrderNote(orderId, note) {
+    if (!this.store.order)
+      throw new Error("order 模块未初始化");
+    this.store.order.syncTempOrderNoteToRemote(orderId, note);
+  }
   updateTempOrderShopDiscount(amount) {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
@@ -444,6 +449,37 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         throw new Error("scanOrder 解决方案需要 order 模块支持");
       }
       const tempOrder = this.store.order.restoreOrder();
+      this.currentSalesDetail = null;
+      await this.effectsEmit("onTempOrderReplaced", { tempOrder });
+      if (this.syncAppDataToTempOrder(tempOrder)) {
+        this.store.order.persistTempOrder();
+        await this.store.order.saveDraft();
+      }
+      return tempOrder;
+    } catch (error) {
+      throw error;
+    }
+  }
+  /**
+   * 仅清空 tempOrder 购物车行（products / bookings / discount_list）。
+   * 同步清空内存中的 salesDetail 商品/预约视图，避免编辑态仍读到旧 bookings。
+   */
+  async clearOrderCartLines() {
+    try {
+      if (!this.store.order)
+        throw new Error("order 模块未初始化");
+      const tempOrder = await this.store.order.clearOrderCartLines();
+      if (this.currentSalesDetail) {
+        this.currentSalesDetail = {
+          ...this.currentSalesDetail,
+          products: [],
+          bookings: [],
+          rootBooking: null,
+          bookingsByProductUid: {},
+          discount_list: []
+        };
+      }
+      await this.effectsEmit("onTempOrderReplaced", { tempOrder });
       if (this.syncAppDataToTempOrder(tempOrder)) {
         this.store.order.persistTempOrder();
         await this.store.order.saveDraft();
@@ -472,6 +508,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   getHistoricalProductDiscountList(products) {
     const historyDiscountList = [];
     products.forEach((item) => {
+      if (!this.isPersistedOrderProduct(item))
+        return;
       (item.discount_list || []).forEach((discount) => {
         var _a, _b, _c, _d, _e, _f;
         const discountId = ((_a = discount.discount) == null ? void 0 : _a.resource_id) || discount.id;
@@ -506,6 +544,14 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     });
     return historyDiscountList;
   }
+  isPersistedOrderProduct(product) {
+    const orderDetailId = product.order_detail_id ?? product.orderDetailId;
+    if (orderDetailId !== void 0 && orderDetailId !== null && orderDetailId !== "") {
+      return true;
+    }
+    const bookingId = product.booking_id ?? product.bookingId;
+    return bookingId !== void 0 && bookingId !== null && bookingId !== "";
+  }
   mergeHistoricalDiscountList(discountList, products) {
     const historyDiscountList = this.getHistoricalProductDiscountList(products);
     const historyIds = new Set(historyDiscountList.map((discount) => discount.id));
@@ -791,7 +837,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   async syncPaymentsToOrder(params) {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    return this.store.order.syncPaymentsToOrder(params);
+    const channel = params.channel ?? this.getSubmitOrderSalesChannel();
+    return this.store.order.syncPaymentsToOrder({
+      ...params,
+      ...channel !== void 0 ? { channel } : {}
+    });
   }
   /** 读取当前 BaseSales 订单上下文中的 Sales 协议支付项。 */
   getOrderPayments() {
@@ -858,8 +908,10 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           const bundleMetadata = bundle.metadata || {};
           return {
             is_price_include_tax: tempOrder.is_price_include_tax,
-            bundle_id: bundle.bundle_id,
-            bundle_product_id: bundle.bundle_product_id,
+            // 套餐子项在 tempOrder 上常为 id（如 1718），prepare/deduction 协议要求 bundle_id
+            bundle_id: bundle.bundle_id ?? bundle.id,
+            bundle_product_id: bundle.bundle_product_id ?? bundle._bundle_product_id,
+            bundle_group_id: bundle.bundle_group_id ?? bundle.group_id,
             bundle_variant_id: bundle.bundle_variant_id,
             price_type: bundle.price_type,
             price_type_ext: bundle.price_type_ext,
@@ -1032,6 +1084,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  async updateOrderProductQuantity(params) {
+    try {
+      if (!this.store.order)
+        throw new Error("order 模块未初始化");
+      const products = await this.store.order.updateOrderProductQuantity(params);
+      return products;
+    } catch (error) {
+      throw error;
+    }
+  }
   updateOrderBooking(params) {
     try {
       if (!this.store.order)

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

@@ -42,6 +42,9 @@ export interface BaseSalesOrderProductIdentity {
     product_option_item?: any[];
     product_bundle?: any[];
 }
+export interface BaseSalesUpdateOrderProductQuantityParams extends BaseSalesOrderProductIdentity {
+    num: number;
+}
 export interface BaseSalesOrderProduct extends BaseSalesOrderProductIdentity {
     order_detail_id: number | null;
     num: number;

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

@@ -62,13 +62,23 @@ function normalizeOptionItems(optionItems) {
     };
   });
 }
-function normalizeBundleItems(bundleItems) {
+function normalizeBundleItems(bundleItems, preferPriceField = false) {
   if (!Array.isArray(bundleItems))
     return [];
-  return bundleItems.map((bundleItem) => ({
-    ...bundleItem,
-    option: normalizeOptionItems(bundleItem == null ? void 0 : bundleItem.option)
-  }));
+  return bundleItems.map((bundleItem) => {
+    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 {
+      ...bundleItem,
+      num,
+      quantity: (bundleItem == null ? void 0 : bundleItem.quantity) ?? num,
+      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)
+    };
+  });
 }
 function findVariantById(origin, variantId) {
   if (!origin || !variantId || variantId <= 0)
@@ -77,7 +87,7 @@ function findVariantById(origin, variantId) {
   return variants.find((variant) => Number(variant == null ? void 0 : variant.id) === variantId) || null;
 }
 function transformBaseProductToOrderProduct(params) {
-  var _a, _b;
+  var _a, _b, _c;
   const { payload, fallbackProductId = null } = params;
   if (!payload || typeof payload !== "object")
     return null;
@@ -101,11 +111,17 @@ function transformBaseProductToOrderProduct(params) {
     payload.price ?? payload.selling_price ?? (matchedVariant == null ? void 0 : matchedVariant.price) ?? (matchedVariant == null ? void 0 : matchedVariant.base_price) ?? (origin == null ? void 0 : origin.price) ?? (origin == null ? void 0 : origin.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price) ?? (sourceProduct == null ? void 0 : sourceProduct.selling_price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price),
     "0.00"
   );
+  const lineCompositeTotal = toPriceString(
+    payload.line_total ?? payload.total ?? ((_c = payload._extend) == null ? void 0 : _c.total),
+    sourceProductPrice
+  );
+  const hasPriceOverride = payload.price_override !== void 0 && payload.price_override !== null && payload.price_override !== "";
   const productOptionItem = normalizeOptionItems(
     payload.option ?? payload.options ?? payload.product_option_item
   );
   const productBundle = normalizeBundleItems(
-    payload.bundle ?? payload.product_bundle
+    payload.bundle ?? payload.product_bundle,
+    hasPriceOverride
   );
   const uniqueIdentificationNumber = payload.unique_identification_number ?? payload.unique;
   const metadata = {
@@ -119,7 +135,11 @@ function transformBaseProductToOrderProduct(params) {
     policy_id: payload.policy_id,
     source_shop_id: payload.source_shop_id,
     origin,
-    source_product_price: sourceProductPrice
+    source_product_price: sourceProductPrice,
+    main_product_selling_price: sourceProductPrice,
+    main_product_original_price: sourceProductPrice,
+    ...hasPriceOverride ? { price_override: String(payload.price_override) } : {},
+    ...payload.bundle_edit !== void 0 ? { bundle_edit: payload.bundle_edit } : {}
   };
   if (uniqueIdentificationNumber) {
     metadata.unique_identification_number = String(uniqueIdentificationNumber);
@@ -131,8 +151,9 @@ function transformBaseProductToOrderProduct(params) {
     num: toSafePositiveInt(payload.quantity ?? payload.num, 1),
     product_option_item: productOptionItem,
     product_bundle: productBundle,
-    selling_price: sourceProductPrice,
-    original_price: sourceProductPrice,
+    // 折后行价由 normalizeOrderProduct 按 main + bundle 合成；手动改价时 bundle 已为分摊后单价
+    selling_price: lineCompositeTotal,
+    original_price: lineCompositeTotal,
     tax_fee: toPriceString(
       payload.tax_fee ?? (matchedVariant == null ? void 0 : matchedVariant.tax_fee) ?? (origin == null ? void 0 : origin.tax_fee) ?? (sourceProduct == null ? void 0 : sourceProduct.tax_fee),
       "0.00"

package/lib/solution/BaseSales/utils.js

@@ -102,12 +102,40 @@ function isSkuOnlyDeleteIdentity(x) {
   return !("product_option_item" in x) && !("product_bundle" in x);
 }
 function normalizeOrderProduct(product) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e, _f;
   const metadata = { ...product.metadata || {} };
   const resolvedIdentityKey = ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? String(product.metadata.unique_identification_number) : product.unique_identification_number && String(product.unique_identification_number).length > 0 ? String(product.unique_identification_number) : product.identity_key && String(product.identity_key).length > 0 ? String(product.identity_key) : (0, import_utils.createUuidV4)();
   metadata.unique_identification_number = resolvedIdentityKey;
-  const normalizedBundle = (product.product_bundle || []).map((item) => ({
+  const priceOverride = metadata.price_override;
+  const originOtherBundle = (_d = (_c = (_b = metadata.origin) == null ? void 0 : _b._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.bundle;
+  let bundleInput = product.product_bundle || [];
+  if (priceOverride !== void 0 && priceOverride !== null && priceOverride !== "" && Array.isArray(originOtherBundle) && originOtherBundle.length > 0) {
+    const priceById = /* @__PURE__ */ new Map();
+    originOtherBundle.forEach((item) => {
+      if ((item == null ? void 0 : item.id) == null)
+        return;
+      const unit = item.price ?? item.bundle_selling_price;
+      if (unit === void 0 || unit === null)
+        return;
+      priceById.set(String(item.id), String(unit));
+    });
+    const base = Array.isArray(bundleInput) && bundleInput.length > 0 ? bundleInput : originOtherBundle;
+    bundleInput = base.map((item) => {
+      const unit = priceById.get(String(item == null ? void 0 : item.id));
+      if (unit === void 0)
+        return item;
+      return {
+        ...item,
+        price: unit,
+        bundle_selling_price: unit
+      };
+    });
+  }
+  const normalizedBundle = bundleInput.map((item) => ({
     ...item,
+    bundle_id: item.bundle_id ?? item.id,
+    bundle_product_id: item.bundle_product_id ?? item._bundle_product_id,
+    bundle_group_id: item.bundle_group_id ?? item.group_id,
     bundle_selling_price: item.bundle_selling_price ?? item.price ?? "0.00",
     price: item.price ?? item.custom_price ?? item.bundle_selling_price ?? "0.00",
     price_type: item.price_type ?? item.custom_price_type ?? "",
@@ -117,8 +145,8 @@ function normalizeOrderProduct(product) {
   const optionSum = (0, import_utils.sumOptionUnitPrice)(normalizedOptions);
   const isV2 = metadata.price_schema_version === 2 || metadata.price_schema_version === "2";
   const variantId = Number(product.product_variant_id || 0);
-  const variantList = variantId ? (_b = metadata == null ? void 0 : metadata.origin) == null ? void 0 : _b.variant : null;
-  const variantPrice = Array.isArray(variantList) ? (_c = variantList.find((v) => Number(v == null ? void 0 : v.id) === variantId)) == null ? void 0 : _c.price : void 0;
+  const variantList = variantId ? (_e = metadata == null ? void 0 : metadata.origin) == null ? void 0 : _e.variant : null;
+  const variantPrice = Array.isArray(variantList) ? (_f = variantList.find((v) => Number(v == null ? void 0 : v.id) === variantId)) == null ? void 0 : _f.price : void 0;
   const resolvedSource = (() => {
     var _a2, _b2;
     if (metadata.source_product_price !== void 0) {
@@ -174,6 +202,10 @@ function normalizeOrderProduct(product) {
     bundle: normalizedBundle,
     useOriginalBundle: true
   });
+  const finalOriginalPrice = (0, import_utils.resolveManualOverrideLineOriginalPrice)(
+    { num: product.num, metadata },
+    composedOriginalPrice
+  );
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
@@ -181,7 +213,7 @@ function normalizeOrderProduct(product) {
     product_variant_id: product.product_variant_id,
     product_option_item: normalizedOptions,
     selling_price: composedSellingPrice,
-    original_price: composedOriginalPrice,
+    original_price: finalOriginalPrice,
     tax_fee: product.tax_fee || "0.00",
     is_charge_tax: product.is_charge_tax ?? 0,
     discount_list: product.discount_list || [],

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

@@ -21,6 +21,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private platform;
     private scan;
     private productCatalog;
+    private orderCustomerDiscountRefreshInFlight;
+    private orderCustomerDiscountRefreshCustomerId;
     /**
      * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
      * bookingContext 是 SalesSdk 加车下沉所需的「预约 UI 上下文」（bookingConfig / resourcesOrigin / date）。
@@ -205,6 +207,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     restoreOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     /** 内部：基于 OrderModule 当前状态构造一份 OrderCustomerChangePayload。 */
     private buildOrderCustomerPayload;
+    private refreshDiscountConfigAfterOrderCustomerChange;
     /**
      * 获取客户分页信息
      * @returns 分页信息

package/lib/solution/BookingTicket/index.js

@@ -58,6 +58,8 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
      */
     this.store = {};
     this.productCatalog = [];
+    this.orderCustomerDiscountRefreshInFlight = null;
+    this.orderCustomerDiscountRefreshCustomerId = null;
   }
   /**
    * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
@@ -104,19 +106,30 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     console.log(sales, "1234sales");
     const customerModule = this.store.customer;
     const detailCustomer = sales == null ? void 0 : sales.customer;
-    if (customerModule && detailCustomer) {
-      const { id: detailCustomerId, ...detailCustomerRest } = detailCustomer ?? {};
+    const orderCustomerSnapshot = this.store.order.getOrderCustomerSnapshot();
+    const protocolCustomerId = sales == null ? void 0 : sales.customer_id;
+    const protocolCustomer = protocolCustomerId !== void 0 && protocolCustomerId !== null ? {
+      id: protocolCustomerId,
+      name: String((sales == null ? void 0 : sales.customer_name) || ""),
+      phone: sales == null ? void 0 : sales.phone,
+      email: sales == null ? void 0 : sales.email,
+      country_calling_code: sales == null ? void 0 : sales.country_calling_code
+    } : null;
+    const selectedCustomer = detailCustomer ?? orderCustomerSnapshot ?? protocolCustomer;
+    if (customerModule && selectedCustomer) {
+      const { id: detailCustomerId, ...detailCustomerRest } = selectedCustomer ?? {};
       const rawId = detailCustomerId ?? "";
       const customer = {
         ...detailCustomerRest,
         id: rawId == null ? "" : rawId,
-        name: (detailCustomer == null ? void 0 : detailCustomer.name) ?? "",
-        phone: detailCustomer == null ? void 0 : detailCustomer.phone,
-        email: detailCustomer == null ? void 0 : detailCustomer.email,
-        country_calling_code: detailCustomer == null ? void 0 : detailCustomer.country_calling_code
+        name: (selectedCustomer == null ? void 0 : selectedCustomer.name) ?? "",
+        phone: selectedCustomer == null ? void 0 : selectedCustomer.phone,
+        email: selectedCustomer == null ? void 0 : selectedCustomer.email,
+        country_calling_code: selectedCustomer == null ? void 0 : selectedCustomer.country_calling_code
       };
       customerModule.setSelectedCustomer(customer);
       this.setOrderCustomer(customer);
+      await this.store.order.saveDraft();
     }
     return sales;
   }
@@ -400,6 +413,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     this.store.order.setOrderCustomer(patch, customer);
     const next = this.buildOrderCustomerPayload();
     this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next);
+    this.refreshDiscountConfigAfterOrderCustomerChange(patch.customer_id);
   }
   /**
    * 读取 tempOrder 上的下单客户协议字段；customer_id 缺失时返回 null。
@@ -446,6 +460,34 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       snapshot: this.store.order.getOrderCustomerSnapshot()
     };
   }
+  refreshDiscountConfigAfterOrderCustomerChange(customerId) {
+    if (!customerId || customerId === 1)
+      return;
+    if (this.orderCustomerDiscountRefreshInFlight && this.orderCustomerDiscountRefreshCustomerId === customerId) {
+      return;
+    }
+    const previousRefresh = this.orderCustomerDiscountRefreshInFlight;
+    const refreshTask = (async () => {
+      if (previousRefresh) {
+        await previousRefresh.catch(() => void 0);
+      }
+      const currentCustomer = this.store.order.getOrderCustomer();
+      if (!currentCustomer || Number(currentCustomer.customer_id) !== customerId) {
+        return;
+      }
+      await this.loadDiscountConfig({ customerId });
+    })();
+    this.orderCustomerDiscountRefreshInFlight = refreshTask;
+    this.orderCustomerDiscountRefreshCustomerId = customerId;
+    refreshTask.catch((error) => {
+      console.error("Failed to load discount config after customer change:", error);
+    }).finally(() => {
+      if (this.orderCustomerDiscountRefreshInFlight !== refreshTask)
+        return;
+      this.orderCustomerDiscountRefreshInFlight = null;
+      this.orderCustomerDiscountRefreshCustomerId = null;
+    });
+  }
   /**
    * 获取客户分页信息
    * @returns 分页信息

package/lib/solution/BookingTicket/utils/addProductDecision.js

@@ -200,7 +200,8 @@ function buildCacheItemFromCartDetail(item, ctx) {
     item,
     {
       start_date: (ctx == null ? void 0 : ctx.date) || void 0,
-      quantity: (cartDetailValue == null ? void 0 : cartDetailValue.quantity) || (ctx == null ? void 0 : ctx.quantity) || 1,
+      /** 列表连点 / 防抖合并时以 ctx.quantity 为准，避免 cartDetailValue 默认 1 盖掉合并数量 */
+      quantity: (ctx == null ? void 0 : ctx.quantity) ?? (cartDetailValue == null ? void 0 : cartDetailValue.quantity) ?? 1,
       product_name: item.title,
       other,
       isNormalProduct: !(0, import_BookingContext.isBookingProduct)(item),
@@ -229,7 +230,7 @@ function buildCacheItemFromDetail(item, detailResult, ctx) {
     mergedItem,
     {
       start_date: (ctx == null ? void 0 : ctx.date) || void 0,
-      quantity: ((_b = detailResult.e) == null ? void 0 : _b.quantity) || (ctx == null ? void 0 : ctx.quantity) || 1,
+      quantity: (ctx == null ? void 0 : ctx.quantity) ?? ((_b = detailResult.e) == null ? void 0 : _b.quantity) ?? 1,
       price: _detail == null ? void 0 : _detail.price,
       product_name: _currentItem.title,
       other,
@@ -267,22 +268,29 @@ function transformDetailToProductAndBooking(cacheItem, ctx) {
   return { product: productInput, booking, cacheItem: preparedCacheItem };
 }
 function buildBasePayloadFromCacheItem(cacheItem, ctx) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d;
   const other = ((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.other) || {};
-  const quantity = ((_b = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _b.quantity) ?? (ctx == null ? void 0 : ctx.quantity) ?? 1;
+  const quantity = (ctx == null ? void 0 : ctx.quantity) != null && ctx.quantity > 0 ? ctx.quantity : ((_b = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _b.quantity) ?? 1;
   const resolvedPid = (cacheItem == null ? void 0 : cacheItem.product_id) ?? (cacheItem == null ? void 0 : cacheItem.id);
+  const extend = (cacheItem == null ? void 0 : cacheItem._extend) || {};
   return {
     id: (cacheItem == null ? void 0 : cacheItem.id) ?? (cacheItem == null ? void 0 : cacheItem.product_id),
     product_id: resolvedPid,
     variant_id: (other == null ? void 0 : other.product_variant_id) ?? (other == null ? void 0 : other.variant_id) ?? 0,
     quantity,
     option: (other == null ? void 0 : other.option) || [],
-    bundle: (other == null ? void 0 : other.bundle) || [],
+    bundle: (other == null ? void 0 : other.bundle) || ((_c = extend == null ? void 0 : extend.skuValue) == null ? void 0 : _c.bundle) || ((_d = extend == null ? void 0 : extend._skuValue) == null ? void 0 : _d.bundle) || [],
     unique: other == null ? void 0 : other.unique,
     session: other == null ? void 0 : other.session,
-    note: (_c = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _c.note,
-    price: ((_d = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _d.price) ?? (cacheItem == null ? void 0 : cacheItem.price),
-    selling_price: ((_e = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _e.price) ?? (cacheItem == null ? void 0 : cacheItem.price)
+    note: extend == null ? void 0 : extend.note,
+    price: (extend == null ? void 0 : extend.price) ?? (cacheItem == null ? void 0 : cacheItem.price),
+    selling_price: (extend == null ? void 0 : extend.price) ?? (cacheItem == null ? void 0 : cacheItem.price),
+    line_total: extend == null ? void 0 : extend.total,
+    total: extend == null ? void 0 : extend.total,
+    origin_total: extend == null ? void 0 : extend.origin_total,
+    price_override: extend == null ? void 0 : extend.priceOverride,
+    bundle_edit: extend == null ? void 0 : extend.bundle_edit,
+    _extend: extend
   };
 }
 // Annotate the CommonJS export names for ESM import in node: