@pisell/pisellos 2.2.171 → 2.2.172

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

@@ -2,9 +2,12 @@ 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';
+import type { OrderProductDiscountItem } from '../../server/modules/order/types';
+export type { OrderProductDiscountItem } from '../../server/modules/order/types';
 export declare enum OrderHooks {
     OnOrderCreate = "order:onOrderCreate",
     OnOrderUpdate = "order:onOrderUpdate",
@@ -48,6 +51,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;
@@ -66,7 +76,7 @@ export interface OrderProduct extends OrderProductIdentity {
     original_price: string;
     tax_fee: string;
     is_charge_tax: number;
-    discount_list: any[];
+    discount_list: OrderProductDiscountItem[];
     product_bundle: any[];
     booking_uid?: string;
     metadata: Record<string, any>;
@@ -103,11 +113,11 @@ export interface OrderSummary {
 export interface OrderTempOrder {
     order_id: number | null;
     external_sale_number: string;
-    order_number: string;
-    shop_order_number: string;
-    shop_full_order_number: string;
+    order_number: string | null;
+    shop_order_number: string | null;
+    shop_full_order_number: string | null;
     type: string;
-    business_code: string;
+    business_code?: string;
     platform: string;
     sales_channel: string;
     order_sales_channel: string;
@@ -141,7 +151,7 @@ export interface OrderTempOrder {
     bookings: any[];
     payments: any[];
     surcharges: any[];
-    discount_list: any[];
+    discount_list?: any[];
     relation_forms: any[];
     contacts: any[];
     contacts_info: Record<string, any> | null;
@@ -157,7 +167,7 @@ export interface OrderSubmitProduct extends Omit<OrderProduct, 'unique_identific
     payment_price: string;
     product_sku: Record<string, any>;
 }
-export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'products' | '_extend' | 'customer' | 'shop_full_order_number'> {
+export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'products' | '_extend' | 'customer' | 'discount_list'> {
     platform: string;
     request_unique_idempotency_token?: string;
     form_record_ids?: Array<{
@@ -176,16 +186,32 @@ export interface OrderState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
 }
+export interface ReplaceTempOrderOptions {
+    recalculateSummary?: boolean;
+    persist?: boolean;
+    saveDraft?: boolean;
+}
+export type AddProductBookingInput = Record<string, any>;
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
-export interface UpdateProductInOrderParams {
+export interface UpdateOrderProductParams {
     product_id: number | null;
     product_variant_id: number;
     updates: Partial<OrderProduct>;
     unique_identification_number?: string;
+    identity_key?: string;
     product_option_item?: any[];
     product_bundle?: any[];
+    booking?: AddProductBookingInput;
+}
+/** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */
+export interface UpdateOrderProductQuantityParams extends OrderProductIdentity {
+    num: number;
+    identity_key?: string;
+}
+export interface UpdateOrderBookingParams {
+    unique_identification_number: string;
+    updates: AddProductBookingInput;
 }
-export type AddProductBookingInput = Record<string, any>;
 export interface OrderProductMergeDecisionContext {
     incomingProduct: Partial<OrderProduct> & OrderProductIdentity;
     normalizedIncoming: OrderProduct;
@@ -236,10 +262,11 @@ export interface SubmitSalesOrderParams {
     query: {
         order_id: number | null;
         external_sale_number: string;
-        order_number: string;
-        shop_order_number: string;
+        order_number: string | null;
+        shop_order_number: string | null;
+        shop_full_order_number: string | null;
         type: string;
-        business_code: string;
+        business_code?: string;
         platform: string;
         request_unique_idempotency_token?: string;
         sales_channel: string;
@@ -271,7 +298,6 @@ export interface SubmitSalesOrderParams {
         bookings: OrderSubmitBooking[];
         payments: any[];
         surcharges?: any[];
-        discount_list: any[];
         relation_forms: any[];
         form_record_ids?: OrderSubmitFormRecord[];
         contacts: any[];
@@ -350,6 +376,7 @@ export interface SyncPaymentsToOrderParams {
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
     submitWhenPaid?: boolean;
     smallTicketDataFlag?: number;
+    channel?: string;
 }
 export interface SyncPaymentsToOrderResult<T = any> {
     isFullyPaid: boolean;
@@ -446,6 +473,7 @@ export interface OrderModuleAPI {
     }) => void;
     getTempOrder: () => OrderTempOrder | null;
     ensureTempOrder: () => OrderTempOrder;
+    replaceTempOrder: (tempOrder: OrderTempOrder, options?: ReplaceTempOrderOptions) => Promise<OrderTempOrder>;
     addNewOrder: () => Promise<OrderTempOrder>;
     restoreOrder: () => OrderTempOrder;
     getOrderProducts: () => OrderProduct[];
@@ -458,15 +486,25 @@ export interface OrderModuleAPI {
     getOrderSyncState: () => OrderSyncState;
     getOrderAmountSnapshot: () => OrderAmountSnapshot | null;
     getTempOrderNote: () => string;
-    updateTempOrderNote: (note: string) => string;
+    updateTempOrderNote: {
+        (note: string): string;
+        (note: string, sync: true): Promise<string>;
+        (note: string, sync: boolean): string | Promise<string>;
+    };
     updateTempOrderShopDiscount: (amount: string | number) => string;
     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[]>;
-    updateProductInOrder: (params: UpdateProductInOrderParams) => Promise<OrderProduct[]>;
+    updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
+    updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<OrderProduct[]>;
+    updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
     removeProductFromOrder: (identity: OrderProductIdentity) => Promise<OrderProduct[]>;
     persistTempOrder: () => void;
+    /** 运行时切换 tempOrder localStorage 持久化开关。 */
+    setEnableTempOrderPersist: (enabled: boolean) => void;
+    /** 当前是否启用 tempOrder localStorage 持久化。 */
+    isTempOrderPersistEnabled: () => boolean;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
         platform?: string;
@@ -516,8 +554,10 @@ export interface OrderModuleAPI {
     clearOrderCustomer: () => void;
     loadDiscountConfig: (params: {
         customerId: number;
-        action?: 'create';
-    }) => Promise<void>;
+        action?: 'create' | 'edit';
+        orderId?: number;
+        apply?: boolean;
+    }) => Promise<Discount[]>;
     getDiscountList: () => Discount[];
     applyDiscount: () => void;
     /**

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;

package/lib/modules/Order/utils/manualProductDiscount.js

@@ -0,0 +1,207 @@
+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/modules/Order/utils/manualProductDiscount.ts
+var manualProductDiscount_exports = {};
+__export(manualProductDiscount_exports, {
+  buildManualProductDiscountItem: () => buildManualProductDiscountItem,
+  ensureManualProductDiscountList: () => ensureManualProductDiscountList,
+  findManualProductDiscountItem: () => findManualProductDiscountItem,
+  hasManualProductDiscountFlag: () => hasManualProductDiscountFlag,
+  mergeManualProductDiscountIntoList: () => mergeManualProductDiscountIntoList,
+  resolveManualDiscountMessage: () => resolveManualDiscountMessage,
+  resolveManualDiscountOriginTotal: () => resolveManualDiscountOriginTotal,
+  resolveManualDiscountReasonFromSources: () => resolveManualDiscountReasonFromSources,
+  resolveSafeProductNum: () => resolveSafeProductNum,
+  shouldBuildManualProductDiscount: () => shouldBuildManualProductDiscount,
+  stripManualProductDiscountItems: () => stripManualProductDiscountItems,
+  syncManualProductDiscountProductNum: () => syncManualProductDiscountProductNum
+});
+module.exports = __toCommonJS(manualProductDiscount_exports);
+var import_decimal = __toESM(require("decimal.js"));
+function resolveSafeProductNum(num) {
+  const parsed = Number(num);
+  if (!Number.isFinite(parsed) || parsed <= 0)
+    return 1;
+  return Math.floor(parsed);
+}
+function syncManualProductDiscountProductNum(discountList, productNum) {
+  const quantity = resolveSafeProductNum(productNum);
+  return (discountList || []).map((item) => {
+    if ((item == null ? void 0 : item.type) !== "product")
+      return item;
+    return {
+      ...item,
+      discount: {
+        ...item.discount || {},
+        product_num: quantity
+      }
+    };
+  });
+}
+function resolveManualDiscountOriginTotal(sources) {
+  const candidates = [
+    sources.originTotal,
+    sources.extendOriginTotal,
+    sources.originExtendOriginTotal,
+    sources.sourceExtendOriginTotal
+  ];
+  for (const candidate of candidates) {
+    if (candidate === void 0 || candidate === null || candidate === "")
+      continue;
+    const parsed = Number(candidate);
+    if (Number.isFinite(parsed))
+      return parsed;
+  }
+  const unit = Number(sources.catalogUnitPrice);
+  const quantity = sources.quantity ?? 1;
+  if (Number.isFinite(unit) && unit > 0) {
+    return new import_decimal.default(unit).mul(quantity).toNumber();
+  }
+  return NaN;
+}
+function resolveManualDiscountReasonFromSources(sources) {
+  for (const candidate of [
+    sources.discountReason,
+    sources.extendDiscountReason,
+    sources.originExtendDiscountReason
+  ]) {
+    if (candidate != null && String(candidate).trim() !== "") {
+      return String(candidate);
+    }
+  }
+  return "";
+}
+function hasManualProductDiscountFlag(metadata) {
+  if (!metadata)
+    return false;
+  const override = metadata.price_override;
+  if (override !== void 0 && override !== null && override !== "") {
+    return true;
+  }
+  return metadata.is_manual_discount === 1 || metadata.is_manual_discount === true;
+}
+function ensureManualProductDiscountList(params) {
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  const list = params.discountList || [];
+  const quantity = resolveSafeProductNum(params.quantity);
+  if (findManualProductDiscountItem(list)) {
+    return syncManualProductDiscountProductNum(list, quantity);
+  }
+  const metadata = params.metadata || {};
+  const originalNum = Number(params.originalPrice);
+  const sellingNum = Number(params.sellingPrice);
+  const shouldBuild = hasManualProductDiscountFlag(metadata) || shouldBuildManualProductDiscount({ originTotal: originalNum, sellingTotal: sellingNum });
+  if (!shouldBuild) {
+    return list;
+  }
+  if (!Number.isFinite(originalNum) || !Number.isFinite(sellingNum) || originalNum === sellingNum) {
+    return list;
+  }
+  const message = resolveManualDiscountMessage(
+    list,
+    resolveManualDiscountReasonFromSources({
+      extendDiscountReason: (_b = (_a = metadata.origin) == null ? void 0 : _a._extend) == null ? void 0 : _b.discount_reason,
+      originExtendDiscountReason: (_d = (_c = metadata.origin) == null ? void 0 : _c._extend) == null ? void 0 : _d.discount_reason
+    })
+  );
+  return mergeManualProductDiscountIntoList(
+    list,
+    buildManualProductDiscountItem({
+      originTotal: originalNum,
+      sellingTotal: sellingNum,
+      quantity,
+      message,
+      discountway: (_f = (_e = metadata.origin) == null ? void 0 : _e._extend) == null ? void 0 : _f.discountway,
+      discount_per: (_h = (_g = metadata.origin) == null ? void 0 : _g._extend) == null ? void 0 : _h.discount_per
+    })
+  );
+}
+function findManualProductDiscountItem(discountList) {
+  return (discountList || []).find((item) => (item == null ? void 0 : item.type) === "product");
+}
+function resolveManualDiscountMessage(discountList, fallback) {
+  var _a, _b;
+  const message = (_b = (_a = findManualProductDiscountItem(discountList)) == null ? void 0 : _a.discount) == null ? void 0 : _b.message;
+  if (message != null && String(message).trim() !== "") {
+    return String(message);
+  }
+  return fallback ?? "";
+}
+function stripManualProductDiscountItems(discountList) {
+  return (discountList || []).filter((item) => (item == null ? void 0 : item.type) !== "product");
+}
+function buildManualProductDiscountItem(params) {
+  const origin = new import_decimal.default(Number(params.originTotal) || 0);
+  const selling = new import_decimal.default(Number(params.sellingTotal) || 0);
+  const diff = origin.minus(selling);
+  const quantity = resolveSafeProductNum(params.quantity);
+  return {
+    amount: diff.abs().toDecimalPlaces(2).toNumber(),
+    type: "product",
+    discount: {
+      message: params.message ?? "",
+      discountway: params.discountway ?? "num",
+      product_num: quantity,
+      discount_per: params.discount_per ?? "",
+      discount_type: diff.isNegative() ? "change_price" : "discount"
+    }
+  };
+}
+function mergeManualProductDiscountIntoList(discountList, manualItem) {
+  const base = stripManualProductDiscountItems(discountList);
+  if (!manualItem)
+    return base;
+  if (manualItem.amount === 0 && !manualItem.discount.message)
+    return base;
+  return [...base, manualItem];
+}
+function shouldBuildManualProductDiscount(params) {
+  if (params.hasPriceOverride)
+    return true;
+  const origin = Number(params.originTotal);
+  const selling = Number(params.sellingTotal);
+  if (!Number.isFinite(origin) || !Number.isFinite(selling))
+    return false;
+  return origin !== selling;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildManualProductDiscountItem,
+  ensureManualProductDiscountList,
+  findManualProductDiscountItem,
+  hasManualProductDiscountFlag,
+  mergeManualProductDiscountIntoList,
+  resolveManualDiscountMessage,
+  resolveManualDiscountOriginTotal,
+  resolveManualDiscountReasonFromSources,
+  resolveSafeProductNum,
+  shouldBuildManualProductDiscount,
+  stripManualProductDiscountItems,
+  syncManualProductDiscountProductNum
+});

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

@@ -1,6 +1,6 @@
 import Decimal from 'decimal.js';
 import { CartItem } from "../Cart";
-import type { OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
+import type { OrderProductDiscountItem, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
 import type { RulesParamsHooks } from '../Rules/types';
 import type { MapOrderPaymentsOptions, OrderPaymentData, OrderPaymentSource } from './types';
 /**
@@ -65,6 +65,26 @@ export declare function sumOptionUnitPrice(options?: Array<{
  *
  * 导出为纯函数方便单测直接驱动钩子，不依赖 OrderModule 实例。
  */
+/** Rules calcDiscount 用手动价标记；undefined 表示交给 Rules 用 total/origin_total 推断 */
+export declare function resolveRulesManualDiscountFlag(metadata: Record<string, any> | null | undefined): boolean | undefined;
+/**
+ * 商品行折扣只保留后端 OrderProductDiscountItem 协议字段。
+ * Rules/券计算过程中的 `_num`、`config` 等运行态字段不应进入 tempOrder 或提交 payload。
+ */
+export declare function normalizeOrderProductDiscountList(discountList?: unknown[] | null): OrderProductDiscountItem[];
+/**
+ * 手动改价（price_override）时行级 original_price（composite 单价）：
+ * 购物车划线价应对齐 metadata.origin._extend.origin_total（改价前单价 composite，如 40），
+ * 而非 bundle 子项 catalog 原价合成的 composedOriginalPrice（如 30）。
+ *
+ * origin_total 与 SkuDetailModal / cacheItem._extend 一致，为单价语义，不再除以 num。
+ */
+export declare function resolveManualOverrideLineOriginalPrice(params: {
+    num?: number;
+    metadata?: Record<string, any> | null;
+    /** 已有行级 original_price（origin 被裁剪时兜底划线价） */
+    lineOriginalPrice?: string | number | null;
+}, fallbackCompositeOriginal: string): string;
 export declare function createDefaultOrderRulesHooks(): RulesParamsHooks;
 /**
  * 通过 session 类商品的开始时间结束时间生成商品的时长
@@ -141,3 +161,5 @@ export declare function formatV1Product(products: OrderSubmitProduct[]): {
     unique: string;
 }[];
 export { createEmptySummary } from '../../solution/ScanOrder/utils';
+export { buildManualProductDiscountItem, ensureManualProductDiscountList, findManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountMessage, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, resolveSafeProductNum, shouldBuildManualProductDiscount, syncManualProductDiscountProductNum, stripManualProductDiscountItems, } from './utils/manualProductDiscount';
+export type { ManualProductDiscountItem } from './utils/manualProductDiscount';