@pisell/pisellos 2.2.272 → 2.2.274

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

@@ -319,6 +319,24 @@ export interface ReplaceTempOrderOptions {
     saveDraft?: boolean;
 }
 export type AddProductBookingInput = Record<string, any>;
+/**
+ * 添加商品行时的顺序控制。
+ * 默认追加到 products 尾部；预约数量同步可插入到既有预约组的最新行之后，
+ * 避免步进器修改数量改变该组展示位置。
+ */
+export interface AddProductToOrderOptions {
+    insertAfterProductUid?: string;
+}
+/**
+ * 删除商品后的可选位置保持策略。
+ * 预约合并行减量时仍删除最新真实行，再把剩余代表行移动到被删除代表行原位置。
+ */
+export interface RemoveProductsFromOrderOptions {
+    preserveDisplayPosition?: {
+        remainingProductUid: string;
+        anchorProductUid: string;
+    };
+}
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
 export interface UpdateOrderProductParams {
     product_id: number | null;
@@ -468,8 +486,6 @@ export interface SubmitSalesOrderParams {
 export interface PaymentItemData {
     /** 当前支付项的唯一 ID */
     uuid: string;
-    /** 支付项稳定唯一号 */
-    payment_number?: string;
     /** 当前支付方式付出去多少钱 */
     amount: string;
     /** 支付类型代码 */
@@ -492,22 +508,13 @@ export interface PaymentItemData {
 export interface OrderPaymentMetadata {
     rounding_rule?: Record<string, any>;
     unique_payment_number?: string;
-    /** 刷卡机设备快照；OS 不解析内部字段，仅透传并持久化 */
-    card_reader_snapshot?: Record<string, unknown>;
     shop_wallet_pass_id?: number | string;
     actual_paid_amount?: number | string;
     change_given_amount?: number | string;
-    transactions?: OrderPaymentTransaction[];
     [key: string]: any;
 }
-export interface OrderPaymentTransaction {
-    number: string;
-    status: 'success' | 'fail';
-}
 export interface OrderPaymentData {
     order_payment_id?: number | string;
-    /** 支付项稳定唯一号；历史支付项允许缺失 */
-    payment_number?: string;
     amount: string;
     code: string;
     custom_payment_id: number;
@@ -534,15 +541,6 @@ export interface OrderPaymentData {
     created_at?: string;
     updated_at?: string;
 }
-export interface OrderPaymentUpdateOptions {
-    matchBy?: 'payment_number' | 'compat' | 'legacy';
-}
-export interface OrderPaymentUpdateResult {
-    updated: boolean;
-    payment: OrderPaymentData | null;
-    payments: OrderPaymentData[];
-    summary: OrderSummary | null;
-}
 export type OrderPaymentSource = PaymentItem | OrderPaymentData | Record<string, any>;
 export interface MapOrderPaymentsOptions {
     includeVoided?: boolean;
@@ -693,14 +691,6 @@ export interface OrderModuleAPI {
         channel?: string;
         type?: string;
     }) => OrderSubmitPayload;
-    saveTempOrderAsDraft: <T = any>(params?: {
-        cacheId?: string;
-        platform?: string;
-        businessCode?: string;
-        channel?: string;
-        type?: string;
-        enhancePayload?: SubmitPayloadEnhancer;
-    }) => Promise<T>;
     applyLocalPrintOrderNumbers: (order?: Record<string, any> | null) => Promise<OrderTempOrder>;
     getTempOrderNote: () => string;
     updateTempOrderNote: {
@@ -713,15 +703,15 @@ export interface OrderModuleAPI {
     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[]>;
+    addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions) => Promise<OrderProduct[]>;
     updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
     /** 批量更新购物车行，末尾仅触发一次促销重算与 summary 刷新 */
     updateOrderProducts: (paramsList: UpdateOrderProductParams[]) => Promise<OrderProduct[]>;
     updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<OrderProduct[]>;
     updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
-    removeProductFromOrder: (identity: OrderProductIdentity) => Promise<OrderProduct[]>;
+    removeProductFromOrder: (identity: OrderProductIdentity, options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** 批量删除购物车行，末尾仅触发一次促销重算与 summary 刷新 */
-    removeProductsFromOrder: (identities: OrderProductIdentity[]) => Promise<OrderProduct[]>;
+    removeProductsFromOrder: (identities: OrderProductIdentity[], options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** @deprecated no-op；OrderModule 不再负责 tempOrder localStorage 持久化。 */
     persistTempOrder: () => void;
     /**
@@ -758,15 +748,11 @@ export interface OrderModuleAPI {
     getOrderPayments: () => OrderPaymentData[];
     setOrderPayments: (payments: OrderPaymentSource[]) => OrderPaymentData[];
     addOrderPayment: (payment: OrderPaymentSource) => OrderPaymentData[];
-    addOrderPaymentAsync: (payment: OrderPaymentSource) => Promise<OrderPaymentData[]>;
-    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[];
     updateVoucherOrderPayments: (payments: OrderPaymentSource[], options?: {
         status?: 'paid' | 'payment_pending';
     }) => OrderPaymentData[];
-    updateVoucherOrderPaymentsAsync: (payments: OrderPaymentSource[], options?: {
-        status?: 'paid' | 'payment_pending';
-    }) => Promise<OrderPaymentData[]>;
     confirmPendingVoucherPayments: (options?: {
         persist?: boolean;
         recalculateSummary?: boolean;

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

@@ -220,9 +220,6 @@ function normalizeOrderCollection(kind, items, options) {
     const persistentId = getOrderCollectionPersistentId(kind, item);
     let uid = getOrderCollectionUid(kind, item);
     if (!uid) {
-      if (kind === "payment" && !isBlankOrderCollectionIdentity(item == null ? void 0 : item.payment_number)) {
-        continue;
-      }
       uid = persistentId ? buildOrderCollectionFallbackUid(kind, persistentId) : allocateAnonymousUid(occupiedUids, createAnonymousUid);
       item = setOrderCollectionUid(kind, item, uid);
       result[index] = item;

package/lib/modules/Order/utils.js

@@ -444,12 +444,7 @@ function resolveEffectivePerUnitDiscount(product) {
     (sum, discount) => sum + Number((discount == null ? void 0 : discount.amount) || 0),
     0
   );
-  const hasPromoDiscountItem = discountList.some(
-    (item) => {
-      var _a, _b;
-      return (item == null ? void 0 : item.type) === "promotion" || (item == null ? void 0 : item.type) === "product" && ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.source) === "promotion" && ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.actionType) === "ITEM_REWARD";
-    }
-  );
+  const hasPromoDiscountItem = discountList.some((item) => (item == null ? void 0 : item.type) === "promotion");
   if (hasPromoDiscountItem)
     return fromList;
   const metadata = (product == null ? void 0 : product.metadata) || {};
@@ -970,9 +965,6 @@ function buildSubmitPayload(params) {
     ...tempOrderRest,
     customer_id: tempOrder.customer_id ?? 1,
     customer_name: tempOrder.customer_name || "Walk-In",
-    country_calling_code: String(tempOrder.country_calling_code ?? ""),
-    phone: String(tempOrder.phone ?? ""),
-    email: String(tempOrder.email ?? ""),
     order_number: tempOrder.order_number ?? null,
     shop_order_number: tempOrder.shop_order_number ?? null,
     shop_full_order_number: tempOrder.shop_full_order_number ?? null,
@@ -1028,7 +1020,9 @@ function mapPaymentItemToOrderPayment(paymentItem) {
   const item = paymentItem;
   const customPaymentId = item.custom_payment_id ?? item.id;
   const metadata = item.metadata && typeof item.metadata === "object" ? { ...item.metadata } : {};
-  const paymentNumber = item.payment_number;
+  if (item.uuid && !metadata.unique_payment_number) {
+    metadata.unique_payment_number = String(item.uuid);
+  }
   const paymentMetadataKeys = [
     "rounding_rule",
     "shop_wallet_pass_id",
@@ -1045,7 +1039,6 @@ function mapPaymentItemToOrderPayment(paymentItem) {
   const createdAt = item.created_at ?? timestamp;
   return {
     ...item.order_payment_id !== void 0 ? { order_payment_id: item.order_payment_id } : {},
-    ...paymentNumber !== void 0 && paymentNumber !== null && paymentNumber !== "" ? { payment_number: String(paymentNumber) } : {},
     amount: String(item.amount ?? "0.00"),
     code: String(item.code || ""),
     custom_payment_id: Number(customPaymentId ?? 0),

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

@@ -20,7 +20,6 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     protected defaultVersion: string;
     request: RequestPlugin;
     private app;
-    private appPlugin;
     private store;
     window: WindowPlugin;
     private dbManager;
@@ -41,7 +40,6 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      * paymentModule.updateOtherParams({ fatherModule: 'bookingTicket' });
      */
     updateOtherParams(params: Record<string, any>): void;
-    private getPaymentNumberAppData;
     /**
      * 记录信息日志
      */

package/lib/modules/Payment/index.js

@@ -31,9 +31,6 @@ var import_cash = require("./cash");
 var import_eftpos = require("./eftpos");
 var import_walletpass = require("./walletpass");
 var import_decimal = require("decimal.js");
-var import_payment_utils = require("../Order/payment-utils");
-var import_utils2 = require("../Order/utils");
-var import_payment_number = require("../../utils/payment-number");
 __reExport(Payment_exports, require("./types"), module.exports);
 function formatAmount(amount) {
   try {
@@ -115,15 +112,15 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     this.store = options.store;
     this.otherParams = options.otherParams || {};
     this.request = core.getPlugin("request");
-    this.appPlugin = core.getPlugin("app");
+    const appPlugin = core.getPlugin("app");
     this.window = core.getPlugin("window");
     if (!this.request) {
       throw new Error("支付模块需要 request 插件支持");
     }
-    if (!this.appPlugin) {
+    if (!appPlugin) {
       throw new Error("支付模块需要 app 插件支持");
     }
-    this.app = this.appPlugin.getApp();
+    this.app = appPlugin.getApp();
     this.dbManager = this.app.dbManager;
     this.logger = this.app.logger;
     this.registerNetworkHandlers();
@@ -139,14 +136,6 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
   updateOtherParams(params) {
     this.otherParams = params || {};
   }
-  getPaymentNumberAppData(key) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    const getData = (_b = (_a = this.appPlugin) == null ? void 0 : _a.getData) == null ? void 0 : _b.call(_a);
-    if (typeof getData === "function")
-      return getData(key);
-    const coreData = (_g = (_e = (_d = (_c = this.app) == null ? void 0 : _c.models) == null ? void 0 : _d.getStore) == null ? void 0 : (_f = _e.call(_d)).getDataByModel) == null ? void 0 : _g.call(_f, "core", "core");
-    return coreData == null ? void 0 : coreData[key];
-  }
   /**
    * 记录信息日志
    */
@@ -532,20 +521,15 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         });
         throw new Error(warningMessage);
       }
-      const paymentUuid = paymentItem.uuid || ((_a = paymentItem.metadata) == null ? void 0 : _a.unique_payment_number) || (0, import_utils.getUniqueId)("payment_");
+      let paymentUuid;
+      if ((_a = paymentItem.metadata) == null ? void 0 : _a.unique_payment_number) {
+        paymentUuid = paymentItem.metadata.unique_payment_number;
+      } else {
+        paymentUuid = (0, import_utils.getUniqueId)("payment_");
+      }
       const currentTime = formatDateTime(/* @__PURE__ */ new Date());
-      const hasPaymentNumber = String(paymentItem.payment_number || "").trim() !== "";
-      const paymentNumberDevicePrefix = hasPaymentNumber ? "LOCAL" : await (0, import_payment_number.resolvePaymentNumberDevicePrefix)(
-        (key) => this.getPaymentNumberAppData(key)
-      );
-      const paymentNumber = (0, import_payment_utils.ensureOrderPaymentNumber)(
-        paymentItem,
-        paymentNumberDevicePrefix,
-        import_utils2.createUuidV4
-      ).payment_number;
       const newPaymentItem = {
         uuid: paymentUuid,
-        payment_number: paymentNumber,
         custom_payment_id: normalizeCustomPaymentId(paymentItem),
         name: paymentItem.name,
         code: paymentItem.code,
@@ -565,8 +549,10 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         updated_at: currentTime,
         // 更新时间
         metadata: {
-          ...paymentItem.metadata
+          ...paymentItem.metadata,
           // 保留传入的所有 metadata 字段
+          unique_payment_number: paymentUuid
+          // 设置唯一支付号为支付项的 uuid
         }
       };
       order.payment.push(newPaymentItem);
@@ -781,12 +767,6 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         if ("amount" in formattedParams && formattedParams.amount !== void 0) {
           formattedParams.amount = formatAmount(formattedParams.amount);
         }
-        if (formattedParams.metadata && typeof formattedParams.metadata === "object") {
-          formattedParams.metadata = {
-            ...paymentItem.metadata || {},
-            ...formattedParams.metadata
-          };
-        }
         Object.assign(paymentItem, formattedParams);
         this.recalculateOrderAmount(order);
         await this.dbManager.update("order", order);
@@ -844,7 +824,6 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       const paymentData = {
         payments: order.payment.map((payment) => ({
           uuid: payment.uuid,
-          payment_number: payment.payment_number,
           amount: payment.amount,
           code: payment.code,
           custom_payment_id: payment.custom_payment_id,
@@ -1088,7 +1067,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           roundedValue = this.standardRound(baseValue, true);
           break;
         case import_types.RoundingRule.StandardDown:
-        case "standard_down":
+        case "standard_rounding_midpoint_down":
           roundedValue = this.standardRound(baseValue, false);
           break;
         case import_types.RoundingRule.AlwaysUp:

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

@@ -40,11 +40,11 @@ export declare enum RoundingRule {
     /** 标准舍入（中点向上） */
     Standard = "standard_rounding",
     /** 标准舍入（中点向下） */
-    StandardDown = "standard_down",
+    StandardDown = "standard_rounding_midpoint_down",
     /** 总是向上舍入 */
-    AlwaysUp = "always_up",
+    AlwaysUp = "round_up",
     /** 总是向下舍入 */
-    AlwaysDown = "always_down"
+    AlwaysDown = "round_down"
 }
 /**
  * 舍入结果
@@ -87,30 +87,12 @@ export interface PaymentMethod {
     /** 其他配置信息 */
     [key: string]: any;
 }
-/** 支付项扩展元数据 */
-export interface PaymentItemMetadata {
-    /** 钱箱 ID */
-    shop_wallet_pass_id?: string;
-    /** 三方支付交易流水号 */
-    unique_payment_number?: string;
-    /** 刷卡机设备快照；PaymentModule 不解析内部字段 */
-    card_reader_snapshot?: Record<string, unknown>;
-    /** rounding 规则 */
-    rounding_rule?: any;
-    /** 实付金额（现金支付时的实际给出金额） */
-    actual_paid_amount?: number;
-    /** 找零金额（现金支付时的找零金额） */
-    change_given_amount?: number;
-    [key: string]: unknown;
-}
 /**
  * 支付项
  */
 export interface PaymentItem {
     /** 当前支付项的唯一 ID */
     uuid: string;
-    /** 支付项稳定唯一号 */
-    payment_number?: string;
     /** 当前支付方式付出去多少钱 */
     amount: string;
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
@@ -128,7 +110,18 @@ export interface PaymentItem {
     /** Wallet Pass 本次使用值 */
     wallet_pass_use_value?: string | number | null;
     /** 拓展参数字段 */
-    metadata?: PaymentItemMetadata;
+    metadata?: {
+        /** 钱箱 ID */
+        shop_wallet_pass_id?: string;
+        /** 唯一支付号 */
+        unique_payment_number?: string;
+        /** rouding规则 */
+        rounding_rule?: any;
+        /** 实付金额（现金支付时的实际给出金额） */
+        actual_paid_amount?: number;
+        /** 找零金额（现金支付时的找零金额） */
+        change_given_amount?: number;
+    };
     /** rouding金额 */
     rounding_amount?: string;
     /** 三方支付手续费 */
@@ -235,10 +228,6 @@ export interface UpdateOrderParams {
  * 支付项输入类型（允许 amount 为数字）
  */
 export interface PaymentItemInput {
-    /** 调用方已有的支付项运行态 UUID；存在时复用为 payment_number 的唯一号段 */
-    uuid?: string;
-    /** 支付项稳定唯一号 */
-    payment_number?: string;
     /** 当前支付方式付出去多少钱 */
     amount: string | number;
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
@@ -267,7 +256,18 @@ export interface PaymentItemInput {
     /** 订单支付类型 */
     order_payment_type?: 'normal' | 'deposit';
     /** 扩展参数字段 */
-    metadata?: PaymentItemMetadata;
+    metadata?: {
+        /** 钱箱 ID */
+        shop_wallet_pass_id?: string;
+        /** 唯一支付号 */
+        unique_payment_number?: string;
+        /** rounding规则 */
+        rounding_rule?: any;
+        /** 实付金额（现金支付时的实际给出金额） */
+        actual_paid_amount?: number;
+        /** 找零金额（现金支付时的找零金额） */
+        change_given_amount?: number;
+    };
     /** 支付项创建时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
     created_at?: string;
     /** 支付项更新时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
@@ -302,8 +302,6 @@ export interface PaymentUpdateFields {
     voucher_id?: string;
     /** 该支付项是否已经同步给后端服务器（只有网络请求成功后才为true） */
     isSynced?: boolean;
-    /** 支付项扩展元数据；更新时与原 metadata 浅合并 */
-    metadata?: PaymentItemMetadata;
     /** 同步错误信息（业务错误时记录错误信息，用于区分"未同步"和"同步失败"） */
     syncError?: {
         error: string;

package/lib/modules/Payment/types.js

@@ -51,9 +51,9 @@ var TaskRunStatus = /* @__PURE__ */ ((TaskRunStatus2) => {
 })(TaskRunStatus || {});
 var RoundingRule = /* @__PURE__ */ ((RoundingRule2) => {
   RoundingRule2["Standard"] = "standard_rounding";
-  RoundingRule2["StandardDown"] = "standard_down";
-  RoundingRule2["AlwaysUp"] = "always_up";
-  RoundingRule2["AlwaysDown"] = "always_down";
+  RoundingRule2["StandardDown"] = "standard_rounding_midpoint_down";
+  RoundingRule2["AlwaysUp"] = "round_up";
+  RoundingRule2["AlwaysDown"] = "round_down";
   return RoundingRule2;
 })(RoundingRule || {});
 var RoundingInterval = /* @__PURE__ */ ((RoundingInterval2) => {

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

@@ -35,7 +35,6 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     excludeDiscountListByType(discountList: Discount[], type: string): Discount[];
     /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
     resolveDiscountListForManualOverride(discountList: Discount[]): Discount[];
-    private isItemRewardProductDiscount;
     private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];

package/lib/modules/Rules/index.js

@@ -167,16 +167,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   resolveDiscountListForManualOverride(discountList) {
     return this.excludeDiscountListByType(discountList, "promotion");
   }
-  isItemRewardProductDiscount(product) {
-    var _a;
-    const discountList = Array.isArray(product == null ? void 0 : product.discount_list) ? product.discount_list : [];
-    return ((_a = product == null ? void 0 : product._promotion) == null ? void 0 : _a.actionType) === "ITEM_REWARD" && discountList.some(
-      (item) => {
-        var _a2, _b;
-        return (item == null ? void 0 : item.type) === "product" && ((_a2 = item == null ? void 0 : item.metadata) == null ? void 0 : _a2.source) === "promotion" && ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.actionType) === "ITEM_REWARD";
-      }
-    );
-  }
   // 获取券不可用的原因
   getUnavailableReason(discountList, productList) {
     var _a;
@@ -238,7 +228,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const discountType = selectedDiscount.tag || selectedDiscount.type;
       return selectedDiscount.isEditMode === true && selectedDiscount.isSelected === true && ["good_pass", "discount_card", "product_discount_card"].includes(discountType);
     };
-    const resolveReapplyEditModeDiscountPercent = (originProduct, selectedDiscount) => {
+    const resolveReapplyBookingDiscountPercent = (originProduct, selectedDiscount) => {
       var _a2;
       if (!shouldReapplyBookingDiscount(originProduct, selectedDiscount))
         return void 0;
@@ -312,7 +302,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               bundleIndex,
               // 虚拟商品属性
               price: Number(bundleItem.price || 0),
-              id: bundleItem.bundle_product_id ?? bundleItem._bundle_product_id ?? bundleItem.product_id,
+              // 新增商品运行态通常带 _bundle_product_id；订单 hydrate 后只有
+              // bundle_product_id。Change time 必须兼容两种结构，否则 bundle
+              // 子项无法命中折扣卡的 limited_relation_product_data.product_ids。
+              id: bundleItem._bundle_product_id ?? bundleItem.bundle_product_id ?? bundleItem.product_id,
               _id: `${product._id}_bundle_${bundleIndex}`,
               parentId: product._id,
               num: bundleItem.num || 1,
@@ -509,9 +502,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           startDate: (_a2 = flatItem.parentProduct) == null ? void 0 : _a2.startDate
         };
       }
-      if (this.isItemRewardProductDiscount(product)) {
-        return false;
-      }
       const isAvailableProduct = flatItem.type === "main" ? !((product == null ? void 0 : product.booking_id) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.length) && ((_c = product == null ? void 0 : product.discount_list) == null ? void 0 : _c.every((d) => d.id && ["good_pass", "discount_card", "product_discount_card"].includes(d.tag || d.type)))) : !((flatItem == null ? void 0 : flatItem.booking_id) && !!((_e = (_d = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _d.discount_list) == null ? void 0 : _e.length) && ((_g = (_f = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _f.discount_list) == null ? void 0 : _g.every((d) => d.id)));
       if (!isAvailableProduct) {
         return false;
@@ -637,7 +627,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         };
         originProduct = flatItem.originProduct;
       }
-      const isItemRewardProductDiscount = this.isItemRewardProductDiscount(product);
       addModeDiscount.forEach((discount) => {
         var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
@@ -661,7 +650,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           ].includes(discount2.tag || discount2.type)
         ))) : !((flatItem == null ? void 0 : flatItem.booking_id) && !!((_d = (_c = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _c.discount_list) == null ? void 0 : _d.length) && ((_f = (_e = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _e.discount_list) == null ? void 0 : _f.every((discount2) => discount2.id)));
         const isBundleAvailable = this.checkPackageSubItemUsageRules(discount, flatItem);
-        if (isAvailableProduct && !isItemRewardProductDiscount && isLimitedProduct && timeLimit && isBundleAvailable && ((_g = discount.config) == null ? void 0 : _g.isAvailable)) {
+        if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && ((_g = discount.config) == null ? void 0 : _g.isAvailable)) {
           (_h = discountApplicability.get(discount.id)) == null ? void 0 : _h.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           const discountType = discount.tag || discount.type;
@@ -772,20 +761,11 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       if (isPersistedProduct && hasExistingWalletDiscount) {
         if (flatItem.type === "main") {
           processedProductsMap.set(product._id, [originProduct]);
-        } else {
-          processedFlatItemsMap.set(flatItem._id, [
-            {
-              ...flatItem,
-              processed: true
-            }
-          ]);
         }
         return;
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
         var _a3, _b2, _c2, _d2;
-        if (this.isItemRewardProductDiscount(product))
-          return false;
         const discountType = discount.tag || discount.type;
         const currentOriginUid = getOriginProductUid(originProduct);
         const isReapplyEditModeDiscountForProduct = discount.isEditMode && reapplyBookingDiscountProductUids.size > 0 && currentOriginUid && reapplyBookingDiscountProductUids.has(String(currentOriginUid)) && discount.isSelected === true;
@@ -855,17 +835,11 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         return false;
       });
-      const explicitlySelectedDiscountCard = (options == null ? void 0 : options.isSelected) === true && options.discountId !== void 0 ? applicableDiscounts.find((discount) => {
-        const discountType = discount.tag || discount.type;
-        return String(discount.id) === String(options.discountId) && ["discount_card", "product_discount_card"].includes(discountType);
-      }) : void 0;
-      const scannedSelectedDiscountCard = applicableDiscounts.find(
+      const selectedDiscountCard = applicableDiscounts.find(
         (n) => n.isScan && n.isSelected && (n.tag || n.type) !== "good_pass"
       );
-      const selectedDiscountCard = explicitlySelectedDiscountCard || scannedSelectedDiscountCard;
       const selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
       let isManualDiscount = false;
-      let isItemRewardProductDiscount = false;
       if (flatItem.type === "main") {
         isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : ((_g = product.discount_list) == null ? void 0 : _g.some((item) => item.type === "product")) || product.total != product.origin_total && (product.bundle || []).every(
           (item) => {
@@ -876,8 +850,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           _i,
           (item) => item.type === "product"
         )));
-        isItemRewardProductDiscount = this.isItemRewardProductDiscount(product);
-        if (product.inPromotion && !isItemRewardProductDiscount) {
+        if (product.inPromotion) {
           isManualDiscount = false;
         }
       } else {
@@ -991,7 +964,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           } else {
             let total = product.inPromotion ? ((_w = product == null ? void 0 : product._promotion) == null ? void 0 : _w.finalPrice) ?? product.origin_total ?? product.total : product.origin_total ?? product.total;
             let main_product_selling_price = product.price;
-            if ((product.discount_list || []).some((item) => item.type === "promotion") || isItemRewardProductDiscount || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
+            if ((product.discount_list || []).some((item) => item.type === "promotion") || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
               total = product.total ?? product.origin_total;
               main_product_selling_price = product.main_product_selling_price ?? main_product_selling_price;
             }
@@ -999,8 +972,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               this.hooks.setProduct(originProduct, {
                 ...isManualDiscount ? {
                   price: product.price,
-                  main_product_selling_price: isItemRewardProductDiscount ? main_product_selling_price : product.price,
-                  ...isItemRewardProductDiscount ? { total } : {}
+                  main_product_selling_price: product.price
                 } : {
                   _id: product._id.split("___")[0] + "___" + index,
                   total,
@@ -1084,8 +1056,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount = productAllocation.discountAmount;
             productDiscountDifference = productAllocation.difference;
             mainProductSellingPrice = Math.max(new import_decimal.default(product.price).minus(amount).toNumber(), 0);
-          } else if (resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount2) !== void 0) {
-            const percent = resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount2);
+          } else if (resolveReapplyBookingDiscountPercent(originProduct, selectedDiscount2) !== void 0) {
+            const percent = resolveReapplyBookingDiscountPercent(originProduct, selectedDiscount2);
             reapplyDiscountPercent = new import_decimal.default(percent).toFixed(2);
             mainProductSellingPrice = new import_decimal.default(product.price || 0).mul(new import_decimal.default(100).minus(percent)).div(100).toDecimalPlaces(2).toNumber();
             amount = new import_decimal.default(product.price).minus(mainProductSellingPrice).toNumber();
@@ -1258,10 +1230,19 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           let targetProductTotal;
           let fixedAmountPerItem;
           let productDiscountDifference;
+          let reapplyDiscountPercent;
           if (isOrderLevel && productAllocation) {
             fixedAmountPerItem = productAllocation.discountAmount;
             productDiscountDifference = productAllocation.difference;
             targetProductTotal = Math.max(new import_decimal.default(productOriginTotal).minus(fixedAmountPerItem).toNumber(), 0);
+          } else if (resolveReapplyBookingDiscountPercent(originProduct, selectedDiscount2) !== void 0) {
+            const percent = resolveReapplyBookingDiscountPercent(
+              originProduct,
+              selectedDiscount2
+            );
+            reapplyDiscountPercent = new import_decimal.default(percent).toFixed(2);
+            targetProductTotal = new import_decimal.default(productOriginTotal).mul(new import_decimal.default(100).minus(percent)).div(100).toDecimalPlaces(2).toNumber();
+            fixedAmountPerItem = new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber();
           } else {
             targetProductTotal = (0, import_utils.getDiscountAmount)(
               selectedDiscount2,
@@ -1283,7 +1264,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
               product_id: product.id || product.product_id,
-              percent: selectedDiscount2.par_value,
+              percent: reapplyDiscountPercent ?? selectedDiscount2.par_value,
               discount_product_id: selectedDiscount2.product_id
             },
             metadata: {

package/lib/modules/SalesSummary/utils.js

@@ -99,7 +99,11 @@ function getUnitOriginalTotal(product) {
 function isGeneratedVoucherProduct(product) {
   const record = product;
   const metadata = (record == null ? void 0 : record.metadata) || {};
-  return (record == null ? void 0 : record.extension_type) === "product_voucher" || metadata.parent_order_detail_id !== void 0 || metadata.gift_card_type !== void 0;
+  const isGeneratedChild = metadata.parent_order_detail_id !== void 0 || metadata.gift_card_type !== void 0;
+  if (isGeneratedChild)
+    return true;
+  const isPersisted = (record == null ? void 0 : record.order_detail_id) !== void 0 && (record == null ? void 0 : record.order_detail_id) !== null;
+  return (record == null ? void 0 : record.extension_type) === "product_voucher" && !isPersisted;
 }
 function buildSurchargeServiceItems(products) {
   return products.map((product) => {

package/lib/server/index.d.ts

@@ -57,7 +57,6 @@ declare class Server {
     private readonly BOOKING_REMOTE_CACHE_MAX_ENTRIES;
     private salesSearchSubscribers;
     private deviceTaskActionsRegistered;
-    private localPaymentUpdateQueues;
     private floorPlanQuerySubscribers;
     private moduleRegistry;
     constructor(core: PisellCore);
@@ -121,8 +120,6 @@ declare class Server {
     private handleSyncSalesTask;
     private runCheckoutSync;
     private omitCheckoutSyncMode;
-    private buildRemoteCheckoutData;
-    private mergeCheckoutSyncPayments;
     private persistSyncedCheckoutOrder;
     /**
      * 将普通层 QuotationModule 的报价单计算能力桥接到 Server Products 模块。
@@ -456,18 +453,6 @@ declare class Server {
      */
     private handleUpdateLocalOrder;
     private handleOrderSalesCheckout;
-    private handleOrderSalesDraft;
-    private createLocalPaymentOperationId;
-    private buildLocalPaymentOrderLogContext;
-    private isValidLocalPaymentDecimal;
-    private getInvalidLocalPaymentSurchargeFields;
-    private buildLocalPaymentSurchargeUpdate;
-    private handleGetLocalPayment;
-    private handleUpdateLocalPayment;
-    private runLocalPaymentUpdateInQueue;
-    private processLocalPaymentUpdate;
-    private processSuccessfulLocalPayment;
-    private sanitizeLocalRecoveryOrder;
     private handleOrderCheckout;
     private getDeviceTaskPlugin;
     private getIdGeneratorPlugin;
@@ -495,7 +480,6 @@ declare class Server {
     private syncMachinecodeRedeemStatusToLocalOrder;
     private handleOrderCheckoutSubmit;
     private handleSyncCheckoutSubmit;
-    private handleOrderDraftSubmit;
     private handlePendingSyncCheckoutOrder;
     private buildPendingSyncCheckoutOrder;
     private shouldBuildSmallTicketData;