@pisell/pisellos 2.2.167 → 2.2.169

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

@@ -200,7 +200,7 @@ export function buildRequiresDetailPayload(item, ctx) {
       number: Boolean(item === null || item === void 0 ? void 0 : item.open_sold_weight)
     },
     isOnlySession: isOnlySession,
-    isEject: isEject,
+    isEject: isEject ? 1 : 0,
     customerId: ctx === null || ctx === void 0 ? void 0 : ctx.customerId,
     date: formatBookingDateForUI(ctx === null || ctx === void 0 ? void 0 : ctx.date),
     productData: item
@@ -339,6 +339,8 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
     origin_total: extend === null || extend === void 0 ? void 0 : extend.origin_total,
     price_override: extend === null || extend === void 0 ? void 0 : extend.priceOverride,
     bundle_edit: extend === null || extend === void 0 ? void 0 : extend.bundle_edit,
+    discount_reason: extend === null || extend === void 0 ? void 0 : extend.discount_reason,
+    discount_list: cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.discount_list,
     _extend: extend
   };
 }

package/dist/solution/ScanOrder/utils.js

@@ -14,6 +14,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import dayjs from 'dayjs';
 import Decimal from 'decimal.js';
 import { composeLinePrice, createUuidV4, resolveManualOverrideLineOriginalPrice, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { ensureManualProductDiscountList } from "../../modules/Order/utils/manualProductDiscount";
 
 /**
  * 构建金额全为 0 的空 summary。
@@ -605,8 +606,16 @@ export function normalizeOrderProduct(product) {
   });
   var finalOriginalPrice = resolveManualOverrideLineOriginalPrice({
     num: product.num,
-    metadata: metadata
+    metadata: metadata,
+    lineOriginalPrice: product.original_price
   }, composedOriginalPrice);
+  var discountList = ensureManualProductDiscountList({
+    discountList: product.discount_list,
+    metadata: metadata,
+    originalPrice: finalOriginalPrice,
+    sellingPrice: composedSellingPrice,
+    quantity: getSafeProductNum(product.num)
+  });
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
@@ -617,7 +626,7 @@ export function normalizeOrderProduct(product) {
     original_price: finalOriginalPrice,
     tax_fee: product.tax_fee || '0.00',
     is_charge_tax: (_product$is_charge_ta = product.is_charge_tax) !== null && _product$is_charge_ta !== void 0 ? _product$is_charge_ta : 0,
-    discount_list: product.discount_list || [],
+    discount_list: discountList,
     product_bundle: normalizedBundle,
     metadata: metadata,
     note: product.note != null ? String(product.note) : ''

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

@@ -150,12 +150,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
         customerId: number;
     }): Promise<void>;
     private recalculateOrderPricesFromQuotation;
-    scanCode(code: string, customerId?: number): Promise<{
-        isAvailable: boolean;
-        discountList: import("../../modules/Discount").Discount[];
-        type: "server" | "clientCalc";
-        unavailableReason?: import("../../modules/Rules/types").UnavailableReason | undefined;
-    }>;
+    scanCode(code: string, customerId?: number): Promise<import("../../modules/Order/types").OrderScanCodeResult>;
     /** 获取当前折扣列表（包装 order.getDiscountList） */
     getDiscountList(): import("../../modules/Discount").Discount[];
     /** 勾选/取消勾选某张折扣券，重新计算折扣并持久化 */

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

@@ -1,49 +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,
-  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,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

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

@@ -33,6 +33,7 @@ __export(buildCacheItemFromOrderLine_exports, {
 });
 module.exports = __toCommonJS(buildCacheItemFromOrderLine_exports);
 var import_dayjs = __toESM(require("dayjs"));
+var import_manualProductDiscount = require("../../Order/utils/manualProductDiscount");
 function safeFormat(value, fmt) {
   if (value === void 0 || value === null)
     return void 0;
@@ -79,10 +80,28 @@ function unflattenResourceMap(resources) {
   });
   return map;
 }
-function buildCapacityFromBooking(resources) {
-  if (!Array.isArray(resources))
-    return [];
-  return resources.filter((r) => (r == null ? void 0 : r.relation_id) !== void 0 && (r == null ? void 0 : r.relation_id) !== null && r.capacity !== void 0).map((r) => ({ id: r.relation_id, value: Number(r.capacity || 0) }));
+function resolveCapacityFromBooking(booking) {
+  var _a;
+  const metaCap = (_a = booking.metadata) == null ? void 0 : _a.capacity;
+  if (Array.isArray(metaCap) && metaCap.length > 0) {
+    return metaCap.map((item) => {
+      if (!item || typeof item !== "object")
+        return null;
+      if (item.id === void 0 || item.id === null)
+        return null;
+      const row = {
+        id: item.id,
+        value: Number(item.value ?? 0)
+      };
+      if (item.name !== void 0)
+        row.name = item.name;
+      return row;
+    }).filter((item) => item != null);
+  }
+  if (typeof metaCap === "number" && Number.isFinite(metaCap)) {
+    return [{ id: 0, value: metaCap, name: "" }];
+  }
+  return [];
 }
 function resolveDurationForExtend(booking) {
   const duration = booking.duration;
@@ -95,7 +114,7 @@ function resolveDurationForExtend(booking) {
   return duration;
 }
 function buildCacheItemFromOrderLine(input) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const { product, booking, sourceProduct } = input;
   const resolvedId = product.product_id ?? (sourceProduct == null ? void 0 : sourceProduct.id);
   const selling = Number(product.selling_price ?? 0);
@@ -105,7 +124,7 @@ function buildCacheItemFromOrderLine(input) {
   const startTime = normalizeTimeString(booking.start_time);
   const endTime = normalizeTimeString(booking.end_time);
   const resource = unflattenResourceMap(booking.resources);
-  const capacity = buildCapacityFromBooking(booking.resources);
+  const capacity = resolveCapacityFromBooking(booking);
   const holderId = ((_a = booking.metadata) == null ? void 0 : _a.holder_id) ?? booking.holder_id;
   const other = {
     product_variant_id: product.product_variant_id ?? 0,
@@ -131,8 +150,22 @@ function buildCacheItemFromOrderLine(input) {
     capacity,
     holder_id: holderId,
     other,
-    like_status: booking.like_status || "common"
+    like_status: booking.like_status || "common",
+    discount_reason: (0, import_manualProductDiscount.resolveManualDiscountMessage)(
+      product.discount_list,
+      (_e = product.metadata) == null ? void 0 : _e.product_discount_reason
+    ) || void 0
   };
+  const manualDiscount = (product.discount_list || []).find((d) => (d == null ? void 0 : d.type) === "product");
+  if (manualDiscount && extend.origin_total === selling) {
+    const manualAmount = Number(manualDiscount.amount ?? 0);
+    if (Number.isFinite(manualAmount) && manualAmount > 0) {
+      extend.origin_total = selling + manualAmount;
+    }
+  }
+  if (((_f = product.metadata) == null ? void 0 : _f.price_override) != null || manualDiscount) {
+    extend.priceOverride = selling;
+  }
   if (booking.holder !== void 0) {
     extend.holder = booking.holder;
   }
@@ -143,8 +176,8 @@ function buildCacheItemFromOrderLine(input) {
     ...sourceProduct || {},
     id: resolvedId,
     product_id: resolvedId,
-    extension_type: (sourceProduct == null ? void 0 : sourceProduct.extension_type) ?? ((_e = booking == null ? void 0 : booking.product) == null ? void 0 : _e.extension_type) ?? (sourceProduct == null ? void 0 : sourceProduct.extension_type),
-    title: (sourceProduct == null ? void 0 : sourceProduct.title) ?? ((_f = booking == null ? void 0 : booking.product) == null ? void 0 : _f.title),
+    extension_type: (sourceProduct == null ? void 0 : sourceProduct.extension_type) ?? ((_g = booking == null ? void 0 : booking.product) == null ? void 0 : _g.extension_type) ?? (sourceProduct == null ? void 0 : sourceProduct.extension_type),
+    title: (sourceProduct == null ? void 0 : sourceProduct.title) ?? ((_h = booking == null ? void 0 : booking.product) == null ? void 0 : _h.title),
     price: (sourceProduct == null ? void 0 : sourceProduct.price) ?? selling,
     selling_price: product.selling_price,
     original_price: product.original_price,

package/lib/modules/BookingContext/utils/cacheItemToBookingInput.d.ts

@@ -50,11 +50,21 @@ export interface BookingResourceInput {
     metadata?: Record<string, any>;
     children?: any[];
 }
+/** custom / package 人数维度快照，与 info2 `_extend.capacity` / `metadata.capacity` 对齐。 */
+export interface BookingCapacityMetadataItem {
+    id: string | number;
+    value: number;
+    name?: Record<string, any> | string;
+}
 export interface BookingMetadataInput {
     /** 由 OS createLinkedProductAndBooking 统一改写，这里不生成。 */
     unique_identification_number?: string;
     collect_pax?: number;
-    capacity?: number;
+    /**
+     * 资源容量快照：custom 多维度时为 `{ id, value, name? }[]`；
+     * 仅总和场景可为 number（capacity_snapshot 兼容）。
+     */
+    capacity?: number | BookingCapacityMetadataItem[];
     /** 协议要求始终提交（即使为 null）。 */
     holder_id: any;
     resource_select_type?: 'single' | 'multiple' | string;

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

@@ -36,6 +36,24 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_serviceTimes = require("./serviceTimes");
 var import_resources = require("./resources");
 var import_flexible = require("./flexible");
+function normalizeExtendCapacityForMetadata(capacity) {
+  if (!Array.isArray(capacity) || capacity.length === 0)
+    return void 0;
+  const normalized = capacity.map((item) => {
+    if (!item || typeof item !== "object")
+      return null;
+    if (item.id === void 0 || item.id === null)
+      return null;
+    const row = {
+      id: item.id,
+      value: Number(item.value ?? 0)
+    };
+    if (item.name !== void 0)
+      row.name = item.name;
+    return row;
+  }).filter((item) => item != null);
+  return normalized.length > 0 ? normalized : void 0;
+}
 function safeFormat(value, fmt) {
   if (value === void 0 || value === null)
     return void 0;
@@ -158,7 +176,10 @@ function cacheItemToBookingInput(cacheItem, options) {
   }
   if (ext.collect_pax !== void 0)
     metadata.collect_pax = ext.collect_pax;
-  if (ext.capacity_snapshot !== void 0) {
+  const extendCapacity = normalizeExtendCapacityForMetadata(ext.capacity);
+  if (extendCapacity) {
+    metadata.capacity = extendCapacity;
+  } else if (ext.capacity_snapshot !== void 0) {
     metadata.capacity = ext.capacity_snapshot;
   }
   const selectType = deriveResourceSelectType(cacheItem) || ((_b = options == null ? void 0 : options.bookingConfig) == null ? void 0 : _b.resource_select_type);

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

@@ -24,6 +24,12 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
      * @param operation 操作名称
      */
     private handleCustomerListError;
+    /**
+     * 查询客户列表但不写入 customerList / pagination 状态。
+     *
+     * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
+     */
+    queryCustomerList(params?: ShopGetCustomerListParams): Promise<ICustomerListResponse>;
     /**
      * 获取客户列表
      * @param params 查询参数

package/lib/modules/Customer/index.js

@@ -75,7 +75,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     } else {
       this.store.currentPage = 1;
     }
-    if (typeof ((_e = options == null ? void 0 : options.initialState) == null ? void 0 : _e.pageSize) === "number") {
+    if (typeof ((_e = options == null ? void 0 : options.initialState) == null ? void 0 : _e.pageSize) === "number" && options.initialState.pageSize > 1) {
       this.store.pageSize = options.initialState.pageSize;
     } else {
       this.store.pageSize = import_constants.DEFAULT_PAGE_SIZE;
@@ -152,6 +152,20 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       this.store.error
     );
   }
+  /**
+   * 查询客户列表但不写入 customerList / pagination 状态。
+   *
+   * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
+   */
+  async queryCustomerList(params = {}) {
+    const { customerList, total, page, pageSize } = await this.fetchCustomerListData(params);
+    return {
+      list: customerList,
+      total,
+      page,
+      pageSize
+    };
+  }
   /**
    * 获取客户列表
    * @param params 查询参数
@@ -352,12 +366,13 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     try {
       this.store.loadingMore = true;
       this.store.error = null;
-      const { customerList: newCustomers, total, page, pageSize } = await this.fetchCustomerListData({
+      const loadMoreParams = {
         skip: nextPage,
         num: this.store.pageSize,
         ...this.store.searchParams
         // 使用存储的搜索条件
-      });
+      };
+      const { customerList: newCustomers, total, page, pageSize } = await this.fetchCustomerListData(loadMoreParams);
       const updatedCustomerList = [...this.store.customerList, ...(0, import_lodash_es.cloneDeep)(newCustomers)];
       this.store.customerList = updatedCustomerList;
       this.store.currentPage = page;

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

@@ -110,6 +110,8 @@ export interface CustomerState {
 export interface CustomerModuleAPI {
     /** 获取客户列表 */
     getCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
+    /** 查询客户列表但不更新列表分页状态 */
+    queryCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
     /** 设置客户列表 */
     setCustomerList: (customers: ShopCustomer[], total?: number) => void;
     /** 设置当前选择的客户 */

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

@@ -135,6 +135,7 @@ export interface Discount {
     appliedProductDetails: ApplicableProductDetails[];
     isDisabledForProductUsed?: boolean;
     amount?: number;
+    customer_id?: number | string | null;
     extension_data?: ExtensionData[];
     total_order_behavior_count?: number;
     today_order_behavior_count?: number;

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

@@ -3,10 +3,9 @@ import { BaseModule } from '../BaseModule';
 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, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions } from './types';
+import type { OrderAmountSnapshot, AddProductBookingInput, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, OrderScanCodeResult, ReplaceTempOrderOptions } from './types';
 import type { ICustomer } from '../AccountList/types';
 import type { Discount } from '../Discount/types';
-import { UnavailableReason } from '../Rules/types';
 export declare class OrderModule extends BaseModule implements Module, OrderModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -48,12 +47,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         apply?: boolean;
     }): Promise<Discount[]>;
     getDiscountList(): Discount[];
-    scanCode(code: string, customerId?: number): Promise<{
-        isAvailable: boolean;
-        discountList: Discount[];
-        type: 'server' | 'clientCalc';
-        unavailableReason?: UnavailableReason;
-    }>;
+    scanCode(code: string, customerId?: number): Promise<OrderScanCodeResult>;
     applyDiscount(): void;
     initTempOrder(params: {
         cacheId?: string;
@@ -109,10 +103,11 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderBuzzer(buzzer: string): string;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
+    private buildTempOrderCustomer;
     /**
      * 更新当前 tempOrder 的客户协议字段。
      *
-     * PaymentModal 只需要修改订单里的客户字段；如果外部还有客户模块需要同步，
+     * PaymentModal 只需要修改订单里的客户事实；如果外部还有客户模块需要同步，
      * 应由调用方通过回调处理，不能把外部 UI 状态写进 tempOrder。
      */
     updateTempOrderCustomer(customer: UpdateTempOrderCustomerInput): OrderSnapshot['customer'];
@@ -190,7 +185,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -38,6 +38,7 @@ var import_utils = require("./utils");
 var import_utils2 = require("../Product/utils");
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils3 = require("../../solution/ScanOrder/utils");
+var import_manualProductDiscount = require("./utils/manualProductDiscount");
 var import_Discount = require("../Discount");
 var import_Rules = require("../Rules");
 var import_types2 = require("../Rules/types");
@@ -207,6 +208,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         type: "clientCalc",
         isAvailable: false,
         discountList: this.getDiscountList(),
+        scannedDiscountList: resultDiscountList,
         unavailableReason: import_types2.UnavailableReason.Unknown
       };
     }
@@ -214,7 +216,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return {
         type: "server",
         isAvailable: false,
-        discountList: this.getDiscountList()
+        discountList: this.getDiscountList(),
+        scannedDiscountList: resultDiscountList
       };
     }
     const withScanList = resultDiscountList.map((item) => ({
@@ -226,7 +229,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return {
         type: "clientCalc",
         isAvailable: true,
-        discountList: this.getDiscountList()
+        discountList: this.getDiscountList(),
+        scannedDiscountList: resultDiscountList
       };
     }
     const tempOrder = this.store.tempOrder;
@@ -247,6 +251,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       type: "clientCalc",
       isAvailable: isAvailable || false,
       discountList: newDiscountList || this.getDiscountList(),
+      scannedDiscountList: resultDiscountList,
       unavailableReason
     };
   }
@@ -268,7 +273,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       orderTotalAmount: Number(((_d = this.store.summary) == null ? void 0 : _d.total_amount) || 0)
     });
     if (result == null ? void 0 : result.productList) {
-      tempOrder.products = result.productList;
+      tempOrder.products = (result.productList || []).map((product) => ({
+        ...product,
+        discount_list: (0, import_manualProductDiscount.syncManualProductDiscountProductNum)(
+          product.discount_list,
+          product.num
+        )
+      }));
     }
     if (result == null ? void 0 : result.discountList) {
       OrderModule.populateSavedAmounts(
@@ -874,10 +885,29 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.persistTempOrder();
     return tempOrder.contacts_info;
   }
+  buildTempOrderCustomer(params) {
+    if (!params.customerId)
+      return null;
+    const source = params.source ? (0, import_lodash_es.cloneDeep)(params.source) : {};
+    const name = source.name ?? source.display_name ?? source.customerName ?? source.customer_name ?? params.customerName;
+    const customerName = source.customer_name ?? source.customerName ?? source.display_name ?? source.name ?? params.customerName;
+    return {
+      ...source,
+      id: source.id ?? params.customerId,
+      customer_id: source.customer_id ?? params.customerId,
+      name: String(name || ""),
+      customer_name: String(customerName || ""),
+      country_calling_code: String(
+        source.country_calling_code ?? source.countryCallingCode ?? params.countryCallingCode
+      ),
+      phone: String(source.phone ?? params.phone),
+      email: String(source.email ?? params.email)
+    };
+  }
   /**
    * 更新当前 tempOrder 的客户协议字段。
    *
-   * PaymentModal 只需要修改订单里的客户字段；如果外部还有客户模块需要同步，
+   * PaymentModal 只需要修改订单里的客户事实；如果外部还有客户模块需要同步，
    * 应由调用方通过回调处理，不能把外部 UI 状态写进 tempOrder。
    */
   updateTempOrderCustomer(customer) {
@@ -891,6 +921,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     );
     tempOrder.phone = String(customer.phone || "");
     tempOrder.email = String(customer.email || "");
+    tempOrder.customer = this.buildTempOrderCustomer({
+      source: customer,
+      customerId: tempOrder.customer_id,
+      customerName: tempOrder.customer_name,
+      countryCallingCode: tempOrder.country_calling_code,
+      phone: tempOrder.phone,
+      email: tempOrder.email
+    });
     this.persistTempOrder();
     return {
       customerId: tempOrder.customer_id,
@@ -910,6 +948,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     tempOrder.country_calling_code = String(patch.country_calling_code || "");
     tempOrder.phone = String(patch.phone || "");
     tempOrder.email = String(patch.email || "");
+    tempOrder.customer = this.buildTempOrderCustomer({
+      source: snapshot || null,
+      customerId: tempOrder.customer_id,
+      customerName: tempOrder.customer_name,
+      countryCallingCode: tempOrder.country_calling_code,
+      phone: tempOrder.phone,
+      email: tempOrder.email
+    });
     if (snapshot !== void 0) {
       const extend = this.ensureExtend(tempOrder);
       if (snapshot === null)
@@ -941,11 +987,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   clearOrderCustomer() {
     const tempOrder = this.ensureTempOrder();
-    tempOrder.customer_id = 0;
+    tempOrder.customer_id = null;
     tempOrder.customer_name = "";
     tempOrder.country_calling_code = "";
     tempOrder.phone = "";
     tempOrder.email = "";
+    tempOrder.customer = null;
     if (tempOrder._extend)
       delete tempOrder._extend.customerSnapshot;
     this.persistTempOrder();

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

@@ -2,6 +2,7 @@ import { CartItem } from '../Cart/types';
 import type { DiscountModule } from '../Discount';
 import type { RulesModule } from '../Rules';
 import type { Discount } from '../Discount/types';
+import type { UnavailableReason } from '../Rules/types';
 import type { SubmitPayloadEnhancer } from './utils';
 import type { PaymentItem } from '../Payment/types';
 import type { ICustomer } from '../AccountList/types';
@@ -48,6 +49,13 @@ export interface OrderCustomerChangePayload {
     patch: OrderCustomerView;
     snapshot: ICustomer | null;
 }
+export interface OrderScanCodeResult {
+    isAvailable: boolean;
+    discountList: Discount[];
+    scannedDiscountList: Discount[];
+    type: 'server' | 'clientCalc';
+    unavailableReason?: UnavailableReason;
+}
 export interface OrderProductIdentity {
     product_id: number | null;
     product_variant_id: number;

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

@@ -0,0 +1,106 @@
+/** 解析商品行数量（checkout 协议 product_num 语义 = 当前行 num） */
+export declare function resolveSafeProductNum(num?: number | null): number;
+/**
+ * 将 discount_list 中 type=product 项的 product_num 同步为当前商品数量。
+ *
+ * @example
+ * syncManualProductDiscountProductNum(line.discount_list, line.num);
+ */
+export declare function syncManualProductDiscountProductNum(discountList: any[] | undefined | null, productNum?: number | null): any[];
+/** 从多源解析改价前行总价（与 cacheItem._extend.origin_total 语义一致） */
+export declare function resolveManualDiscountOriginTotal(sources: {
+    originTotal?: unknown;
+    extendOriginTotal?: unknown;
+    originExtendOriginTotal?: unknown;
+    sourceExtendOriginTotal?: unknown;
+    catalogUnitPrice?: unknown;
+    quantity?: number;
+}): number;
+/** 从 payload / extend / origin 解析手动折扣原因 */
+export declare function resolveManualDiscountReasonFromSources(sources: {
+    discountReason?: unknown;
+    extendDiscountReason?: unknown;
+    originExtendDiscountReason?: unknown;
+}): string;
+/** 是否带手动改价标记（price_override / is_manual_discount） */
+export declare function hasManualProductDiscountFlag(metadata?: Record<string, any> | null): boolean;
+/**
+ * normalize 兜底：手动改价但 discount_list 缺 type=product 时，按行级原价/折后价补写。
+ *
+ * @example
+ * ensureManualProductDiscountList({
+ *   discountList: [],
+ *   metadata: { price_override: '5', is_manual_discount: 1 },
+ *   originalPrice: '11.00',
+ *   sellingPrice: '5.00',
+ *   quantity: 1,
+ * });
+ */
+export declare function ensureManualProductDiscountList(params: {
+    discountList?: any[] | null;
+    metadata?: Record<string, any> | null;
+    originalPrice: string | number;
+    sellingPrice: string | number;
+    quantity?: number;
+}): any[];
+/** 商品手动折扣 discount_list 项（checkout 协议，type = product） */
+export interface ManualProductDiscountItem {
+    amount: number;
+    type: 'product';
+    discount: {
+        message: string;
+        discountway: string;
+        product_num: number;
+        discount_per: string;
+        discount_type: 'discount' | 'change_price';
+    };
+}
+/**
+ * 从 discount_list 中取手动改价项（type = product）。
+ *
+ * @example
+ * const manual = findManualProductDiscountItem(product.discount_list);
+ * manual?.discount.message; // 折扣原因
+ */
+export declare function findManualProductDiscountItem(discountList?: any[] | null): ManualProductDiscountItem | undefined;
+/**
+ * 解析折扣原因：优先 discount_list[type=product].discount.message。
+ *
+ * @example
+ * resolveManualDiscountMessage(line.discount_list, line.metadata?.legacy_reason);
+ */
+export declare function resolveManualDiscountMessage(discountList?: any[] | null, fallback?: string): string;
+/** 去掉 discount_list 中已有的手动改价项，避免重复叠加 */
+export declare function stripManualProductDiscountItems(discountList?: any[] | null): any[];
+/**
+ * 由改价前后行总价构建手动折扣项；amount = |originTotal - sellingTotal|（行级差额）。
+ *
+ * @example
+ * buildManualProductDiscountItem({
+ *   originTotal: 11,
+ *   sellingTotal: 4,
+ *   quantity: 1,
+ *   message: 'VIP',
+ * });
+ */
+export declare function buildManualProductDiscountItem(params: {
+    originTotal: number;
+    sellingTotal: number;
+    quantity?: number;
+    message?: string;
+    discountway?: string;
+    discount_per?: string;
+}): ManualProductDiscountItem;
+/**
+ * 将手动改价项合并进 discount_list（替换已有 type=product 项）。
+ *
+ * @example
+ * mergeManualProductDiscountIntoList(coupons, manualItem);
+ */
+export declare function mergeManualProductDiscountIntoList(discountList: any[] | undefined | null, manualItem: ManualProductDiscountItem | null | undefined): any[];
+/** 是否应写入手动改价 discount_list 项 */
+export declare function shouldBuildManualProductDiscount(params: {
+    hasPriceOverride?: boolean;
+    originTotal?: number;
+    sellingTotal?: number;
+}): boolean;