@pisell/pisellos 2.3.43 → 2.3.45

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

@@ -1,6 +1,5 @@
 import { OrderModule, ProductList, SalesSummaryModule, ScanOrderLogInput, ScanOrderLoggerModule, ScanOrderLoggerProviderConfig, ScanOrderLoggerProviderType, DateModule, ScheduleModule, QuotationModule, OpenDataModule } from '../../modules';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
-import { HolderModule } from '../../modules/Holder';
 export type { ScanOrderOrderProductIdentity, ScanOrderOrderProduct, ScanOrderSubmitProduct, ScanOrderSummary, ScanOrderTempOrder, ScanOrderSubmitPayload, } from '../ScanOrder/types';
 export declare enum VenueBookingHooks {
     onInited = "venueBooking:onInited",
@@ -97,7 +96,6 @@ export interface VenueResourceRawData {
 export interface ResourceProductMapping {
     productId: number;
     productTitle: string;
-    formName?: string;
     resourceName: string;
     formId: number | string;
     price: string;
@@ -146,7 +144,6 @@ export interface VenueBookingState {
         passed: boolean | null;
         failures: QuantityCheckResult[];
     };
-    holder?: HolderModule;
 }
 export interface VenueBookingLoggerRuntimeConfig {
     provider?: ScanOrderLoggerProviderType;

package/dist/solution/VenueBooking/utils/resource.js

@@ -93,7 +93,6 @@ export function buildResourceProductMap(products) {
               var mapping = {
                 productId: product.id,
                 productTitle: product.title,
-                formName: resource.title,
                 resourceName: resource.title,
                 formId: resource.id,
                 price: product.price || '0.00',

package/dist/solution/VenueBooking/utils/slotMerge.d.ts

@@ -12,6 +12,10 @@ export declare function buildPriceBreakdown(params: {
         }) => number;
     };
 }): PriceBreakdownEntry[];
+export declare function buildVenueResourceMetadata(params: {
+    mapping: ResourceProductMapping;
+    rawResource: VenueResourceRawData | undefined;
+}): Record<string, any>;
 export interface BuildVenueBookingParams {
     group: MergedSlotGroup;
     resourceId: number | string;
@@ -25,10 +29,6 @@ export interface BuildVenueBookingParams {
      */
     childResources?: VenueResourceRawData[];
 }
-export declare function buildVenueResourceMetadata(params: {
-    mapping: ResourceProductMapping;
-    rawResource: VenueResourceRawData | undefined;
-}): Record<string, any>;
 export declare function buildVenueBookingEntry(params: BuildVenueBookingParams): Record<string, any>;
 /**
  * 从一条已合并的订单商品还原出独立的时段列表。

package/dist/solution/VenueBooking/utils/slotMerge.js

@@ -90,15 +90,13 @@ export function buildPriceBreakdown(params) {
   return entries;
 }
 export function buildVenueResourceMetadata(params) {
-  var _mapping$formName, _rawResource$main_fie;
+  var _rawResource$form_nam, _ref, _rawResource$main_fie, _rawResource$combined;
   var mapping = params.mapping,
     rawResource = params.rawResource;
-  var combined = rawResource === null || rawResource === void 0 ? void 0 : rawResource.combined_resource;
-  var isCombined = !!(combined && combined.status === 1 && Array.isArray(combined.resource_ids));
   return {
-    form_name: (_mapping$formName = mapping.formName) !== null && _mapping$formName !== void 0 ? _mapping$formName : mapping.resourceName,
-    resource_name: (_rawResource$main_fie = rawResource === null || rawResource === void 0 ? void 0 : rawResource.main_field) !== null && _rawResource$main_fie !== void 0 ? _rawResource$main_fie : mapping.resourceName,
-    combined_resource: isCombined ? combined : null
+    form_name: (_rawResource$form_nam = rawResource === null || rawResource === void 0 ? void 0 : rawResource.form_name) !== null && _rawResource$form_nam !== void 0 ? _rawResource$form_nam : '',
+    resource_name: (_ref = (_rawResource$main_fie = rawResource === null || rawResource === void 0 ? void 0 : rawResource.main_field) !== null && _rawResource$main_fie !== void 0 ? _rawResource$main_fie : mapping.resourceName) !== null && _ref !== void 0 ? _ref : '',
+    combined_resource: (_rawResource$combined = rawResource === null || rawResource === void 0 ? void 0 : rawResource.combined_resource) !== null && _rawResource$combined !== void 0 ? _rawResource$combined : null
   };
 }
 export function buildVenueBookingEntry(params) {
@@ -121,10 +119,7 @@ export function buildVenueBookingEntry(params) {
     form_id: (_rawResource$form_id = rawResource === null || rawResource === void 0 ? void 0 : rawResource.form_id) !== null && _rawResource$form_id !== void 0 ? _rawResource$form_id : mapping.formId,
     relation_id: resourceId,
     capacity: 1,
-    metadata: buildVenueResourceMetadata({
-      mapping: mapping,
-      rawResource: rawResource
-    })
+    metadata: {}
   };
   if (childResources && childResources.length) {
     resourceEntry.children = childResources.map(function (child) {

package/dist/solution/index.d.ts

@@ -8,4 +8,3 @@ export * from './Sales';
 export * from './ScanOrder';
 export * from './BaseSales';
 export * from './VenueBooking';
-export * from './UnifiedBookingSales';

package/dist/solution/index.js

@@ -7,5 +7,4 @@ export * from "./Checkout";
 export * from "./Sales";
 export * from "./ScanOrder";
 export * from "./BaseSales";
-export * from "./VenueBooking";
-export * from "./UnifiedBookingSales";
+export * from "./VenueBooking";

package/dist/types/index.d.ts

@@ -6,7 +6,6 @@ export interface Plugin {
     version: string;
     initialize: () => Promise<void> | void;
     destroy?: () => Promise<void> | void;
-    getLocalStorage?: (key: string) => string | null;
 }
 export interface PluginOptions {
     dependencies?: string[];

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

@@ -0,0 +1,51 @@
+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,
+  ITEM_REWARD_STRATEGY: () => import_examples.ITEM_REWARD_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,
+  ITEM_REWARD_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

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

@@ -32,7 +32,6 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         customerId?: number;
         orderId?: number;
     }): Promise<DiscountWithReason>;
-    batchSearchByProductIds(productIds: number[]): Promise<any>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
     private checkUsageCreditsLimit;
     filterEnabledDiscountListWithReason(discountList: Discount[]): DiscountWithReason;

package/lib/modules/Discount/index.js

@@ -147,15 +147,6 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     const resultDiscountWithReason = this.filterEnabledDiscountListWithReason((result == null ? void 0 : result.data) || []) || [];
     return resultDiscountWithReason;
   }
-  async batchSearchByProductIds(productIds) {
-    const result = await this.request.get(`/machinecode/batch-search`, {
-      ids: productIds,
-      translate_flag: 1,
-      tags: ["good_pass", "product_discount_card"],
-      relation_product: 1
-    });
-    return (result == null ? void 0 : result.data) || [];
-  }
   filterEnabledDiscountList(discountList) {
     return discountList.filter(
       (discount) => discount.limit_status === "enable" && new import_decimal.default((discount == null ? void 0 : discount.par_value) || 0).minus(new import_decimal.default((discount == null ? void 0 : discount.used_par_value) || 0)).greaterThan(0) && this.checkUsageCreditsLimit(discount)

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

@@ -157,7 +157,6 @@ export interface Discount {
     num?: number;
     start_date?: string;
     start_time?: string;
-    discount_rule_uncheck_flag?: boolean;
     usageLimitFailKey?: string | null;
     unified_available_status?: number | undefined | null;
 }

package/lib/modules/OpenData/index.js

@@ -73,7 +73,7 @@ var OpenDataModule = class extends import_BaseModule.BaseModule {
   }
   async fetchOpenData(params) {
     var _a, _b;
-    const getData = (_b = (_a = this.appPlugin) == null ? void 0 : _a.getData) == null ? void 0 : _b.call(_a);
+    const getData = (_b = (_a = this.appPlugin).getData) == null ? void 0 : _b.call(_a);
     const shopId = getData == null ? void 0 : getData("shop_id");
     if (!shopId)
       throw new Error("[OpenDataModule] 无法获取 shop_id");

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { OrderModuleAPI, CommitOrderParams, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, CancelOrderParams, ChangeBookingStatusParams, CheckoutOrderParams } from './types';
+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';
@@ -81,6 +81,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private ensureEditDiscountConfigForProductChange;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
+        isAccepted?: boolean;
         discountList: Discount[];
         type: 'server' | 'clientCalc';
         unavailableReason?: UnavailableReason;
@@ -146,7 +147,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     isTempOrderPersistEnabled(): boolean;
     /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化；草稿保存请使用 IndexedDB saveDraft。 */
     persistTempOrder(): void;
-    notifyTempOrderChanged(): void;
     private createDefaultTempOrderInstance;
     private createExternalSaleNumber;
     private ensureExternalSaleNumber;
@@ -496,7 +496,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         is_deposit: number;
         relation_products: any[];
         relation_forms: any[];
-        business_code: string | undefined;
     };
     checkBeforeSubmitOrder(params: {
         cartItems: CartItem[];

package/lib/modules/Order/index.js

@@ -70,6 +70,24 @@ function isManualProductDiscountProduct(product) {
 }
 var ORDER_PAYMENT_STATUS_PAID = "paid";
 var ORDER_PAYMENT_STATUS_PENDING = "payment_pending";
+var CUSTOMER_PROMOTION_DISCOUNT_TAGS = /* @__PURE__ */ new Set([
+  "good_pass",
+  "product_discount_card",
+  "discount_card"
+]);
+function isCustomerPromotionDiscount(discount) {
+  return CUSTOMER_PROMOTION_DISCOUNT_TAGS.has(
+    String((discount == null ? void 0 : discount.tag) || (discount == null ? void 0 : discount.type) || "").toLowerCase()
+  );
+}
+function markScannedDiscounts(discountList, scannedDiscountList) {
+  const scannedIds = new Set(
+    scannedDiscountList.map((discount) => discount == null ? void 0 : discount.id).filter((id) => id !== void 0 && id !== null).map(String)
+  );
+  return discountList.map(
+    (discount) => scannedIds.has(String(discount == null ? void 0 : discount.id)) ? { ...discount, isScan: true } : discount
+  );
+}
 function isVoucherPaymentRecord(payment) {
   return (payment == null ? void 0 : payment.voucher_id) !== void 0 && Number(payment.voucher_id) !== 0;
 }
@@ -122,6 +140,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         const type = (item == null ? void 0 : item.type) ?? (item == null ? void 0 : item.tag);
         if (!type || type === "product")
           continue;
+        const isDiscountCard = type === "discount_card" || type === "product_discount_card";
         const resourceId = ((_a = item == null ? void 0 : item.discount) == null ? void 0 : _a.resource_id) ?? (item == null ? void 0 : item.resource_id) ?? (item == null ? void 0 : item.discount_id) ?? (item == null ? void 0 : item.order_discount_id);
         if (resourceId === void 0 || resourceId === null || resourceId === "")
           continue;
@@ -144,7 +163,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         if (existed) {
           existed.amount = Number(existed.amount || 0) + amount;
           existed.used_par_value = String(Number(existed.used_par_value || 0) + amount);
-          existed.balance = String(Number(existed.balance || 0) + amount);
+          if (!isDiscountCard) {
+            existed.balance = String(Number(existed.balance || 0) + amount);
+          }
           const productIds = Array.isArray((_f = existed.limited_relation_product_data) == null ? void 0 : _f.product_ids) ? existed.limited_relation_product_data.product_ids : [];
           if ((product == null ? void 0 : product.product_id) !== void 0 && (product == null ? void 0 : product.product_id) !== null && !productIds.includes(product.product_id)) {
             existed.limited_relation_product_data = {
@@ -181,7 +202,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
             filter: 0,
             exclude_product_ids: []
           },
-          balance: String((item == null ? void 0 : item.amount) ?? "0"),
+          balance: isDiscountCard ? void 0 : String((item == null ? void 0 : item.amount) ?? "0"),
           format_title: title,
           product: {
             id: (product == null ? void 0 : product.product_id) ?? 0,
@@ -307,7 +328,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
   }
   async initialize(core, options) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     this.core = core;
     this.store = options.store;
     if (!this.store.tempOrder) {
@@ -320,19 +341,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       this.store.availableWalletIds = [];
     }
     this.request = this.core.getPlugin("request");
-    const appPlugin = this.core.getPlugin("app");
-    if (!appPlugin) {
-      console.error("Order 模块需要 app 插件支持");
+    this.appPlugin = this.core.getPlugin("app");
+    if (!this.appPlugin) {
+      throw new Error("Order 模块需要 app 插件支持");
     }
-    const app = (_a = appPlugin == null ? void 0 : appPlugin.getApp) == null ? void 0 : _a.call(appPlugin);
-    this.logger = app == null ? void 0 : app.logger;
+    const app = this.appPlugin.getApp();
+    this.logger = app.logger;
     this.window = this.core.getPlugin("window");
     const otherParams = options.otherParams || {};
     this.cacheId = otherParams.cacheId;
     this.salesSummaryModuleName = otherParams.salesSummaryModuleName;
-    this.rulesHooksOverride = (_b = otherParams.rules) == null ? void 0 : _b.hooks;
+    this.rulesHooksOverride = (_a = otherParams.rules) == null ? void 0 : _a.hooks;
     this.moduleHooksOverride = options.hooks;
-    this.orderHooks = this.moduleHooksOverride || ((_c = otherParams.order) == null ? void 0 : _c.hooks) || ((_d = otherParams.hooks) == null ? void 0 : _d.order);
+    this.orderHooks = this.moduleHooksOverride || ((_b = otherParams.order) == null ? void 0 : _b.hooks) || ((_c = otherParams.hooks) == null ? void 0 : _c.order);
     this.otherParams = otherParams;
     this.registerDiscountModules(options);
     this.logInfo("OrderModule initialized successfully");
@@ -528,7 +549,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
   }
   async scanCode(code, customerId) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const resultDiscountWithReason = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, { customerId })) || { discountList: [], unavailableReasonKey: null };
     const { discountList: resultDiscountList, unavailableReasonKey } = resultDiscountWithReason;
     const rulesModule = this.store.rules;
@@ -536,6 +557,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return {
         type: "clientCalc",
         isAvailable: false,
+        isAccepted: false,
         discountList: this.getDiscountList(),
         scannedDiscountList: resultDiscountList,
         unavailableReason: import_types2.UnavailableReason.Unknown
@@ -545,6 +567,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return {
         type: "server",
         isAvailable: false,
+        isAccepted: false,
         discountList: this.getDiscountList(),
         scannedDiscountList: resultDiscountList,
         unavailableReasonKey
@@ -560,13 +583,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return {
         type: "clientCalc",
         isAvailable: true,
+        isAccepted: true,
         discountList: this.getDiscountList(),
         scannedDiscountList: resultDiscountList
       };
     }
     const tempOrder = this.store.tempOrder;
     const holders = ((_b = tempOrder == null ? void 0 : tempOrder.holder) == null ? void 0 : _b.form_record) || [];
-    const { isAvailable, discountList: newDiscountList, unavailableReason } = rulesModule.isDiscountListAvailable({
+    const {
+      isAvailable,
+      discountList: newDiscountList,
+      evaluatedDiscountList,
+      unavailableReason
+    } = rulesModule.isDiscountListAvailable({
       productList: (tempOrder == null ? void 0 : tempOrder.products) || [],
       oldDiscountList: this.getDiscountList(),
       newDiscountList: withScanList,
@@ -574,15 +603,25 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       holders,
       isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product)
     }) || { isAvailable: false, discountList: this.getDiscountList() };
-    if (isAvailable && newDiscountList) {
-      (_d = this.store.discount) == null ? void 0 : _d.setDiscountList(newDiscountList);
+    const shouldRetainForLater = !isAvailable && unavailableReason === import_types2.UnavailableReason.ProductNotApplicable && withScanList.some(isCustomerPromotionDiscount);
+    const normalizedNewDiscountList = newDiscountList ? markScannedDiscounts(newDiscountList, withScanList) : void 0;
+    const retainedDiscountList = evaluatedDiscountList ? markScannedDiscounts(evaluatedDiscountList, withScanList) : normalizedNewDiscountList;
+    let resolvedDiscountList = normalizedNewDiscountList || this.getDiscountList();
+    if (isAvailable && normalizedNewDiscountList) {
+      await ((_d = this.store.discount) == null ? void 0 : _d.setDiscountList(normalizedNewDiscountList));
       this.applyDiscount();
       await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
+      resolvedDiscountList = this.getDiscountList();
+    } else if (shouldRetainForLater && retainedDiscountList) {
+      await ((_e = this.store.discount) == null ? void 0 : _e.setDiscountList(retainedDiscountList));
+      await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
+      resolvedDiscountList = this.getDiscountList();
     }
     return {
       type: "clientCalc",
       isAvailable: isAvailable || false,
-      discountList: newDiscountList || this.getDiscountList(),
+      isAccepted: Boolean(isAvailable || shouldRetainForLater),
+      discountList: resolvedDiscountList,
       scannedDiscountList: resultDiscountList,
       unavailableReason
     };
@@ -841,16 +880,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化；草稿保存请使用 IndexedDB saveDraft。 */
   persistTempOrder() {
   }
-  notifyTempOrderChanged() {
-    if (!this.store.tempOrder)
-      return;
-    this.store.tempOrder = {
-      ...this.store.tempOrder,
-      products: [...this.store.tempOrder.products],
-      bookings: this.store.tempOrder.bookings ? [...this.store.tempOrder.bookings] : []
-    };
-    this.persistTempOrder();
-  }
   // ─── TempOrder: 创建 & 获取 ───
   createDefaultTempOrderInstance() {
     return (0, import_utils.createDefaultTempOrder)({
@@ -3889,7 +3918,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder,
       effectivePayments
     );
-    const submitParams = {
+    const submitResult = await this.submitTempOrder({
       payments: effectivePayments,
       paymentStatus,
       smallTicketDataFlag: params.smallTicketDataFlag,
@@ -3903,8 +3932,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         };
         return nextPayload;
       }
-    };
-    const submitResult = params.checkoutSyncTaskEnabled === false ? await this.submitTempOrderAsync(submitParams) : await this.submitTempOrder(submitParams);
+    });
     return { ...completion, submitResult };
   }
   createOrder(params) {
@@ -3921,13 +3949,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       is_deposit: 0,
       relation_products: [],
       relation_forms: [],
-      business_code: params == null ? void 0 : params.business_code,
       ...(params == null ? void 0 : params.extraData) || {}
     };
     let is_deposit = 0;
     if (params.cartItems.length > 0) {
       params.cartItems.forEach((item) => {
-        var _a2;
         if (!item._origin.duration) {
           const { duration, durationType } = (0, import_utils.generateDuration)(item);
           item._origin.duration = duration;
@@ -3936,9 +3962,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         item._origin.sub_type = (0, import_utils.normalizeBookingSubType)(item._origin);
         const discountList = (0, import_utils.getAllDiscountList)(item);
         item._origin.product.discount_list = discountList;
-        if ((_a2 = params == null ? void 0 : params.extraData) == null ? void 0 : _a2.is_add_holder_info) {
-          (0, import_utils.ensureCartItemOriginHolder)(item, this.window);
-        }
         if ((0, import_utils2.isNormalProduct)(item._origin)) {
           order.relation_products.push(item._origin.product);
           const relationForms = item._origin.relation_forms || [];

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

@@ -165,6 +165,8 @@ export interface OrderCustomerChangePayload {
 }
 export interface OrderScanCodeResult {
     isAvailable: boolean;
+    /** 卡券已加入当前订单折扣列表，但不一定能立即应用。 */
+    isAccepted?: boolean;
     discountList: Discount[];
     scannedDiscountList: Discount[];
     type: 'server' | 'clientCalc';
@@ -394,7 +396,6 @@ export interface CommitOrderParams {
         type: 'virtual' | 'appointment_booking';
         platform?: string;
         extraData?: Record<string, any>;
-        business_code?: string;
     };
 }
 export interface OrderSubmitBooking {
@@ -570,12 +571,6 @@ export interface SyncPaymentsToOrderParams {
     payments: OrderPaymentSource[];
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
     submitWhenPaid?: boolean;
-    /**
-     * Whether the checkout should be queued as the local `sync_sales` task.
-     * Defaults to true to preserve the WebPOS retry path. Set to false when
-     * the caller must wait for the cloud checkout response before proceeding.
-     */
-    checkoutSyncTaskEnabled?: boolean;
     smallTicketDataFlag?: number;
     businessCode?: string;
     channel?: string;
@@ -738,8 +733,6 @@ export interface OrderModuleAPI {
     setEnableTempOrderPersist: (enabled: boolean) => void;
     /** 是否允许 saveDraft 写入 IndexedDB 草稿。 */
     isTempOrderPersistEnabled: () => boolean;
-    /** 提交 tempOrder 变更并触发 `{moduleName}:changed` 事件 */
-    notifyTempOrderChanged: () => void;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
         platform?: string;

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

@@ -15,7 +15,6 @@ export interface OrderProductsDepositSummary {
     deposit_policy_ids: number[];
     hasDeposit: boolean;
 }
-import type { WindowPlugin } from '../../plugins';
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -178,15 +177,6 @@ export declare const mergeRelationForms: (relationForms: {
     form_id: number;
     form_record_ids: number[];
 }[];
-export interface CartOrderHolder {
-    customer_id?: number;
-    form_id: number | string;
-    form_record: (number | string)[] | null;
-}
-/**
- * 为购物车行补齐订单所需的 holder 信息（与 cartAccount 结构保持一致）
- */
-export declare function ensureCartItemOriginHolder(cartItem: CartItem, window?: WindowPlugin): void;
 export declare const getAllDiscountList: (cartItem: CartItem) => any;
 export { createUuidV4 };
 export declare function isTempOrder(data: any): data is OrderTempOrder;

package/lib/modules/Order/utils.js

@@ -36,9 +36,8 @@ __export(utils_exports, {
   composeLinePrice: () => composeLinePrice,
   createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
   createDefaultTempOrder: () => createDefaultTempOrder,
-  createEmptySummary: () => import_utils3.createEmptySummary,
+  createEmptySummary: () => import_utils2.createEmptySummary,
   createUuidV4: () => import_orderCollectionIdentity.createUuidV4,
-  ensureCartItemOriginHolder: () => ensureCartItemOriginHolder,
   ensureManualProductDiscountList: () => import_manualProductDiscount.ensureManualProductDiscountList,
   ensureProductSku: () => ensureProductSku,
   findManualProductDiscountItem: () => import_manualProductDiscount.findManualProductDiscountItem,
@@ -86,10 +85,9 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
-var import_utils = require("../Holder/utils");
-var import_utils2 = require("../../solution/ScanOrder/utils");
+var import_utils = require("../../solution/ScanOrder/utils");
 var import_orderCollectionIdentity = require("./utils/orderCollectionIdentity");
-var import_utils3 = require("../../solution/ScanOrder/utils");
+var import_utils2 = require("../../solution/ScanOrder/utils");
 var import_manualProductDiscount = require("./utils/manualProductDiscount");
 function composeLinePrice(params) {
   const { mainPrice, bundle, useOriginalBundle } = params;
@@ -548,7 +546,7 @@ function createDefaultOrderRulesHooks() {
         // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
         // 不透明 identity 契约下，normalizeOrderProduct / hydrate 已保证唯一值存在；
         // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
-        _id: ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? `${product.product_id}_${product.product_variant_id}_${product.metadata.unique_identification_number}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils2.buildProductLineFingerprint)(
+        _id: ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? `${product.product_id}_${product.product_variant_id}_${product.metadata.unique_identification_number}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils.buildProductLineFingerprint)(
           getProductSkuOptions(product),
           product.product_bundle
         )}`,
@@ -640,34 +638,6 @@ var mergeRelationForms = (relationForms) => {
     }, {})
   ).filter((item) => item.form_record_ids.length > 0);
 };
-function getCustomerIdFromStorage(window) {
-  var _a;
-  try {
-    const customer = JSON.parse(((_a = window == null ? void 0 : window.getLocalStorage) == null ? void 0 : _a.call(window, "customer")) || "{}");
-    const customerId = Number(customer == null ? void 0 : customer.id);
-    return Number.isFinite(customerId) && customerId > 0 ? customerId : void 0;
-  } catch {
-    return void 0;
-  }
-}
-function ensureCartItemOriginHolder(cartItem, window) {
-  var _a;
-  if ((_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.holder) {
-    return;
-  }
-  const holderConfig = (0, import_utils.getProductHolderConfig)(
-    (cartItem == null ? void 0 : cartItem._productInit) ?? (cartItem == null ? void 0 : cartItem._productOrigin)
-  );
-  const formRecordId = cartItem == null ? void 0 : cartItem.holder_id;
-  if (!(holderConfig == null ? void 0 : holderConfig.resource_id) || formRecordId == null) {
-    return;
-  }
-  cartItem._origin.holder = {
-    customer_id: getCustomerIdFromStorage(window),
-    form_id: holderConfig.resource_id,
-    form_record: [formRecordId]
-  };
-}
 var getAllDiscountList = (cartItem) => {
   var _a, _b, _c, _d;
   let discountList = ((_b = (_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.product) == null ? void 0 : _b.discount_list) || [];
@@ -1033,7 +1003,7 @@ function buildSubmitPayload(params) {
     // contacts: tempOrder.contacts || [],
     contacts_info: tempOrder.contacts_info && !Array.isArray(tempOrder.contacts_info) ? tempOrder.contacts_info : null,
     // holder: tempOrder.holder || null,
-    summary: summary || tempOrder.summary || (0, import_utils2.createEmptySummary)(),
+    summary: summary || tempOrder.summary || (0, import_utils.createEmptySummary)(),
     metadata: (() => {
       const {
         collect_pax: _collectPax,
@@ -1282,7 +1252,6 @@ function indexOrderProductsByUid(products) {
   createDefaultTempOrder,
   createEmptySummary,
   createUuidV4,
-  ensureCartItemOriginHolder,
   ensureManualProductDiscountList,
   ensureProductSku,
   findManualProductDiscountItem,

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

@@ -21,11 +21,13 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     private emitEvent;
     private publishWalletAssetsState;
     private recalculateWalletAssets;
+    /** 获取当前缓存中所有支付类 Wallet 资产的扫码 code。 */
+    private getSearchedWalletAssetCodes;
     /**
-     * 使用最新订单参数重验扫码搜索过的支付类 Wallet 资产。
-     * 请求失败或暂时无匹配结果时保留旧资产，避免商品变化造成列表闪空。
+     * 用订单重算接口返回的数据更新扫码 Wallet 缓存。
+     * 接口暂时缺失某个扫码 code 时继续保留旧值，避免列表闪空。
      */
-    private revalidateSearchedWalletAssets;
+    private syncSearchedWalletAssets;
     /**
      * 生成钱包API默认参数
      * 根据业务数据生成标准的钱包API参数，并存储在模块中
@@ -67,6 +69,11 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
         noApplicableVoucher: any[];
         products: any[];
     }>;
+    /**
+     * 商品或订单金额变化后，使用聚合接口一次重算已选与剩余 WalletPass。
+     * Walk-In 不发送 customer_id；会员才携带真实 customer_id。
+     */
+    private aggregateRecalculateWalletAssetsAsync;
     getWalletPassRecommendListAsync(params: WalletDeductionRecommendParams): Promise<WalletRecommendItem[]>;
     formatWalletPassList2PreparePayments(list: WalletRecommendItem[]): {
         voucher_id: number;