@pisell/pisellos 2.2.266 → 2.2.268

package/dist/model/strategy/adapter/promotion/type.d.ts

@@ -12,8 +12,6 @@ export declare const PROMOTION_ACTION_TYPES: {
     readonly X_ITEMS_FOR_Y_PRICE: "X_ITEMS_FOR_Y_PRICE";
     /** 买X送Y（买X件送Y件，可累计） */
     readonly BUY_X_GET_Y_FREE: "BUY_X_GET_Y_FREE";
-    /** 商品奖励（满足条件后，订单内指定目标商品享优惠） */
-    readonly ITEM_REWARD: "ITEM_REWARD";
     /** 固定折扣 */
     readonly DISCOUNT_RATE: "DISCOUNT_RATE";
     /** 固定减价 */
@@ -68,59 +66,6 @@ export interface BuyXGetYFreeConfig {
     /** 可选的赠品列表 */
     giftProducts?: ProductIdentifier[];
 }
-/**
- * 商品奖励优惠方式
- *
- * - free: 目标商品最终价为 0
- * - percent_off: 目标商品按百分比折扣，rewardValue 为 0-100
- * - amount_off: 每个目标商品固定减免 rewardValue
- * - fixed_price: 目标商品改为固定价 rewardValue
- */
-export type ItemRewardMethod = 'free' | 'percent_off' | 'amount_off' | 'fixed_price';
-/**
- * 商品奖励数量规则
- *
- * - per_condition_quantity: 每满足 N 个条件商品，奖励 Y 个目标商品
- * - all_targets: 满足条件后奖励全部目标商品
- * - max_per_order: 满足条件后每单最多奖励固定数量目标商品
- */
-export type ItemRewardQuantityRule = 'per_condition_quantity' | 'all_targets' | 'max_per_order';
-/** 商品奖励目标选择规则 */
-export type ItemRewardTargetSelection = 'consumer_best';
-/**
- * 商品奖励 - Action Value
- *
- * @example
- * value: {
- *   rewardMethod: 'free',
- *   quantityRule: 'per_condition_quantity',
- *   triggerQuantity: 1,
- *   rewardQuantity: 1,
- * }
- */
-export interface ItemRewardValue {
-    /** 奖励方式 */
-    rewardMethod: ItemRewardMethod;
-    /** 奖励值：percent_off/amount_off/fixed_price 使用，free 可省略 */
-    rewardValue?: number;
-    /** 奖励数量规则 */
-    quantityRule: ItemRewardQuantityRule;
-    /** 每满足 N 个条件商品；默认 1 */
-    triggerQuantity?: number;
-    /** 奖励 Y 个目标商品；默认 1 */
-    rewardQuantity?: number;
-    /** 每单最多奖励 Y 个目标商品；max_per_order 使用 */
-    maxRewardQuantity?: number;
-}
-/**
- * 商品奖励 - Action Config
- */
-export interface ItemRewardConfig {
-    /** 奖励对象，本期支持指定商品/变体；product_variant_id=0 表示任意变体 */
-    rewardTargets?: ProductIdentifier[];
-    /** 目标商品超额时的选择规则；本期支持 consumer_best */
-    targetSelection?: ItemRewardTargetSelection;
-}
 /**
  * 商品标识
  *
@@ -157,19 +102,10 @@ export interface BuyXGetYFreeAction extends Omit<ActionEffect, 'type' | 'value'
     valueType: 'object';
     config?: BuyXGetYFreeConfig;
 }
-/**
- * 商品奖励 Action
- */
-export interface ItemRewardAction extends Omit<ActionEffect, 'type' | 'value' | 'config'> {
-    type: typeof PROMOTION_ACTION_TYPES.ITEM_REWARD;
-    value: ItemRewardValue;
-    valueType: 'object';
-    config?: ItemRewardConfig;
-}
 /**
  * 促销活动 Action 联合类型
  */
-export type PromotionAction = XItemsForYPriceAction | BuyXGetYFreeAction | ItemRewardAction;
+export type PromotionAction = XItemsForYPriceAction | BuyXGetYFreeAction;
 /**
  * 促销相关运算符
  */
@@ -234,8 +170,6 @@ export interface PromotionProduct {
     quantity: number;
     /** 原价 */
     original_price?: number;
-    /** 内部字段：编辑态订单行只允许参与 ITEM_REWARD，避免旧促销误算历史行 */
-    _promotionOnlyForItemReward?: boolean;
 }
 /**
  * 促销活动适配器转换结果
@@ -261,7 +195,7 @@ export interface PromotionTransformResult {
 /**
  * Action 详情联合类型
  */
-export type PromotionActionDetail = XItemsForYPriceActionDetail | BuyXGetYFreeActionDetail | ItemRewardActionDetail;
+export type PromotionActionDetail = XItemsForYPriceActionDetail | BuyXGetYFreeActionDetail;
 /**
  * X件Y元 Action 详情
  */
@@ -292,28 +226,6 @@ export interface BuyXGetYFreeActionDetail {
     /** 可选的赠品列表 */
     giftProducts: ProductIdentifier[];
 }
-/**
- * 商品奖励 Action 详情
- */
-export interface ItemRewardActionDetail {
-    type: typeof PROMOTION_ACTION_TYPES.ITEM_REWARD;
-    /** 奖励方式 */
-    rewardMethod: ItemRewardMethod;
-    /** 奖励值：percent_off/amount_off/fixed_price 使用，free 为 0 */
-    rewardValue: number;
-    /** 奖励数量规则 */
-    quantityRule: ItemRewardQuantityRule;
-    /** 每满足 N 个条件商品；默认 1 */
-    triggerQuantity: number;
-    /** 奖励 Y 个目标商品；默认 1 */
-    rewardQuantity: number;
-    /** 每单最多奖励 Y 个目标商品；max_per_order 使用 */
-    maxRewardQuantity?: number;
-    /** 奖励对象，本期支持指定商品/变体 */
-    rewardTargets: ProductIdentifier[];
-    /** 目标商品超额时的选择规则 */
-    targetSelection: ItemRewardTargetSelection;
-}
 /**
  * X件Y元 - 业务层计算结果
  *

package/dist/model/strategy/adapter/promotion/type.js

@@ -16,8 +16,6 @@ export var PROMOTION_ACTION_TYPES = {
   X_ITEMS_FOR_Y_PRICE: 'X_ITEMS_FOR_Y_PRICE',
   /** 买X送Y（买X件送Y件，可累计） */
   BUY_X_GET_Y_FREE: 'BUY_X_GET_Y_FREE',
-  /** 商品奖励（满足条件后，订单内指定目标商品享优惠） */
-  ITEM_REWARD: 'ITEM_REWARD',
   /** 固定折扣 */
   DISCOUNT_RATE: 'DISCOUNT_RATE',
   /** 固定减价 */
@@ -56,41 +54,6 @@ export var PROMOTION_ACTION_TYPES = {
  * 买X送Y - Action Config
  */
 
-/**
- * 商品奖励优惠方式
- *
- * - free: 目标商品最终价为 0
- * - percent_off: 目标商品按百分比折扣，rewardValue 为 0-100
- * - amount_off: 每个目标商品固定减免 rewardValue
- * - fixed_price: 目标商品改为固定价 rewardValue
- */
-
-/**
- * 商品奖励数量规则
- *
- * - per_condition_quantity: 每满足 N 个条件商品，奖励 Y 个目标商品
- * - all_targets: 满足条件后奖励全部目标商品
- * - max_per_order: 满足条件后每单最多奖励固定数量目标商品
- */
-
-/** 商品奖励目标选择规则 */
-
-/**
- * 商品奖励 - Action Value
- *
- * @example
- * value: {
- *   rewardMethod: 'free',
- *   quantityRule: 'per_condition_quantity',
- *   triggerQuantity: 1,
- *   rewardQuantity: 1,
- * }
- */
-
-/**
- * 商品奖励 - Action Config
- */
-
 // ============================================
 // 商品标识
 // ============================================
@@ -115,10 +78,6 @@ export var PROMOTION_ACTION_TYPES = {
  * 买X送Y Action
  */
 
-/**
- * 商品奖励 Action
- */
-
 /**
  * 促销活动 Action 联合类型
  */
@@ -187,10 +146,6 @@ var obj = {
  * 买X送Y Action 详情
  */
 
-/**
- * 商品奖励 Action 详情
- */
-
 // ============================================
 // 业务层输出类型（供参考）
 // ============================================

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

@@ -190,7 +190,7 @@ function synthesizeProductResourceFromBooking(booking) {
  * 调用方须传入与该行关联的 booking（通常 bookings[].product_uid === product.metadata.unique_identification_number）。
  */
 export function buildCacheItemFromOrderLine(input) {
-  var _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$product_vari, _product$num, _ref10, _product$note, _booking$detail2, _product$metadata, _product$metadata2, _ref11, _extension_type, _booking$product2, _booking$product3, _price, _product$order_detail, _ref12, _booking$id;
+  var _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$product_vari, _product$num, _ref10, _product$note, _booking$detail2, _product$metadata, _product$metadata2, _ref11, _extension_type, _booking$product2, _booking$product3, _price, _product$product_sku, _product$order_detail, _ref12, _booking$id;
   var product = input.product,
     booking = input.booking,
     sourceProduct = input.sourceProduct;
@@ -257,7 +257,7 @@ export function buildCacheItemFromOrderLine(input) {
   if (Array.isArray(booking.relation_forms)) {
     extend.relation_forms = booking.relation_forms;
   }
-  var base = _objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
+  var base = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
     id: resolvedId,
     product_id: resolvedId,
     extension_type: (_ref11 = (_extension_type = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type) !== null && _extension_type !== void 0 ? _extension_type : booking === null || booking === void 0 || (_booking$product2 = booking.product) === null || _booking$product2 === void 0 ? void 0 : _booking$product2.extension_type) !== null && _ref11 !== void 0 ? _ref11 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type,
@@ -265,7 +265,9 @@ export function buildCacheItemFromOrderLine(input) {
     price: (_price = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _price !== void 0 ? _price : selling,
     selling_price: product.selling_price,
     original_price: product.original_price
-  }, productOptionString ? {
+  }, Number(((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.open_sold_weight) || 0) === 1 ? {
+    product_sku: JSON.parse(JSON.stringify(product.product_sku))
+  } : {}), productOptionString ? {
     product_option_string: productOptionString
   } : {}), {}, {
     _extend: extend,

package/dist/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -75,7 +75,7 @@ function mapOrderBundleToOtherBundle(bundle) {
   });
 }
 export function buildNormalProductCacheItemFromOrderLine(input) {
-  var _product$product_id, _product$selling_pric2, _product$original_pri, _product$metadata, _product$metadata2, _product$product_vari, _originExtend$other, _product$num, _product$product_vari2, _product$num2, _title, _product$note, _originExtend$price, _originExtend$total, _originExtend$origin_, _product$metadata3, _ref6, _title2, _ref7, _cover, _price3, _product$order_detail;
+  var _product$product_id, _product$selling_pric2, _product$original_pri, _product$metadata, _product$metadata2, _product$product_vari, _originExtend$other, _product$num, _product$product_vari2, _product$num2, _title, _product$note, _originExtend$price, _originExtend$total, _originExtend$origin_, _product$metadata3, _ref6, _title2, _ref7, _cover, _price3, _product$order_detail, _product$product_sku;
   var product = input.product,
     sourceProduct = input.sourceProduct;
   var resolvedId = (_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id;
@@ -127,7 +127,7 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
     extend.skuValue = JSON.parse(JSON.stringify(originExtend.skuValue || originExtend._skuValue));
     extend._skuValue = JSON.parse(JSON.stringify(extend.skuValue));
   }
-  return _objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
     id: resolvedId,
     product_id: resolvedId,
     _id: uid,
@@ -141,7 +141,10 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
   } : {}), {}, {
     note: product.note,
     order_detail_id: (_product$order_detail = product.order_detail_id) !== null && _product$order_detail !== void 0 ? _product$order_detail : null,
-    discount_list: discountList,
+    discount_list: discountList
+  }, Number(((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.open_sold_weight) || 0) === 1 ? {
+    product_sku: JSON.parse(JSON.stringify(product.product_sku))
+  } : {}), {}, {
     new: 0,
     autoClose: true,
     _extend: extend

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

@@ -3,7 +3,7 @@ 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, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions } from './types';
+import type { OrderAmountSnapshot, AddProductBookingInput, AddProductToOrderOptions, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions } from './types';
 import type { ICustomer } from '../AccountList/types';
 import type { Discount } from '../Discount/types';
 import { UnavailableReason } from '../Rules/types';
@@ -14,7 +14,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private request;
     private logger;
     private window;
-    private appPlugin;
     private cacheId;
     private salesSummaryModuleName;
     private rulesHooksOverride?;
@@ -177,9 +176,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     };
     private calculateDepositPaidAmount;
     private resolveNextOrderPaymentType;
-    private getPaymentNumberAppData;
-    private getPaymentNumberDevicePrefixSync;
-    private getPaymentNumberDevicePrefixAsync;
     private normalizePaymentSource;
     private updateTempOrderPaymentStatus;
     private shouldKeepPaymentStatusAfterAmountRecalc;
@@ -311,20 +307,19 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * 用一组支付来源覆盖当前订单支付项。
      *
      * 入参允许来自 PaymentModule 的 PaymentItem，内部统一映射为 Sales 协议：
-     * 新支付来源的 uuid 会作为 payment_number 的唯一号段，id -> custom_payment_id，
+     * uuid -> metadata.unique_payment_number，id -> custom_payment_id，
      * isSynced 等运行态字段不会进入 tempOrder.payments。
      */
     setOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
-    /** 同步兼容入口：按调用当下的 device_id 或 LOCAL 生成支付编号。 */
+    /** 追加单个支付项，并立即持久化当前 tempOrder。 */
     addOrderPayment(payment: OrderPaymentSource): OrderPaymentData[];
-    /** 异步入口：创建支付项时读取最新 IoT 设备短号。 */
-    addOrderPaymentAsync(payment: OrderPaymentSource): Promise<OrderPaymentData[]>;
-    private addOrderPaymentWithDevicePrefix;
     /**
-     * 默认按支付唯一号精确更新；仅显式指定 legacy 时兼容历史支付标识。
-     * metadata 与 transactions 会分别合并，避免覆盖支付会话号和已有交易记录。
+     * 按支付唯一号、后端支付 ID、自定义支付方式 ID 或旧 uuid 更新支付项。
+     *
+     * 该方法服务 PaymentModal 的 void / 编辑场景；更新 metadata 时会做浅合并，
+     * 避免覆盖 unique_payment_number、现金实付/找零等已有元数据。
      */
-    updateOrderPayment(paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>, options?: OrderPaymentUpdateOptions): Promise<OrderPaymentUpdateResult>;
+    updateOrderPayment(paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>): OrderPaymentData[];
     /** 从当前订单支付项中移除指定支付项。 */
     deleteOrderPayment(paymentIdentity: string | number): OrderPaymentData[];
     private confirmPendingVoucherPaymentsInList;
@@ -347,11 +342,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     updateVoucherOrderPayments(payments: OrderPaymentSource[], options?: {
         status?: 'paid' | 'payment_pending';
-        devicePrefix?: string;
     }): OrderPaymentData[];
-    updateVoucherOrderPaymentsAsync(payments: OrderPaymentSource[], options?: {
-        status?: 'paid' | 'payment_pending';
-    }): Promise<OrderPaymentData[]>;
     private shouldMergeProductToOrder;
     private hasOrderProductLineNote;
     /**
@@ -383,7 +374,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * await order.addProductToOrder({ product_id: 1, num: 3 }, { start_time: '10:00' });
      * // → tempOrder.products 新增 3 行，每行 num=1，bookings 3 条
      */
-    addProductToOrder(product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput): Promise<OrderProduct[]>;
+    addProductToOrder(product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions): Promise<OrderProduct[]>;
     /**
      * 批量添加商品行，所有行追加完成后只触发一次促销、折扣、summary 重算与持久化。
      *
@@ -421,8 +412,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * @example
      * await order.removeProductsFromOrder([identityA, identityB]);
      */
-    removeProductsFromOrder(identities: OrderProductIdentity[]): Promise<OrderProduct[]>;
-    removeProductFromOrder(identity: OrderProductIdentity): Promise<OrderProduct[]>;
+    removeProductsFromOrder(identities: OrderProductIdentity[], options?: RemoveProductsFromOrderOptions): Promise<OrderProduct[]>;
+    removeProductFromOrder(identity: OrderProductIdentity, options?: RemoveProductsFromOrderOptions): Promise<OrderProduct[]>;
     /**
      * 仅清空购物车行（products / bookings），不重置整单。
      * 用于「仅清空商品」；客户、备注、支付等协议字段保持不变。
@@ -436,14 +427,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         type?: string;
     }): import("./types").OrderSubmitPayload;
     applyLocalPrintOrderNumbers(order?: Record<string, any> | null): Promise<OrderTempOrder>;
-    saveTempOrderAsDraft<T = any>(params?: {
-        cacheId?: string;
-        platform?: string;
-        businessCode?: string;
-        channel?: string;
-        type?: string;
-        enhancePayload?: SubmitPayloadEnhancer;
-    }): Promise<T>;
     /**
      * 提交当前 Sales tempOrder。
      *
@@ -485,7 +468,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     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;
@@ -548,8 +531,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     private seedAnonymousBookingUidsFromProducts;
     private normalizeTempOrderForRuntime;
-    private isSyntheticDraftOrderIdForRuntime;
-    private withoutSyntheticDraftOrderIdForRuntime;
     private hydrateLinkedBookingIdentity;
     private pickHydratedDisplayText;
     private formatHydratedNamePair;
@@ -560,4 +541,4 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     getOrderInfo(order_id: number): Promise<any>;
     getVouchers(): any[];
 }
-export type { UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';
+export type { AddProductToOrderOptions, RemoveProductsFromOrderOptions, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';