@pisell/pisellos 0.0.568 → 0.0.569

package/lib/solution/ScanOrder/utils.js

@@ -13,6 +13,7 @@ exports.collectLinkProductIdsFromReservationRules = collectLinkProductIdsFromRes
 exports.computeResourceIsFull = computeResourceIsFull;
 exports.createEmptySummary = createEmptySummary;
 exports.extractStrategyModelIdsFromTableConfig = extractStrategyModelIdsFromTableConfig;
+exports.filterProductsForScanOrderMore = filterProductsForScanOrderMore;
 exports.findReservationRuleProductByResourceId = findReservationRuleProductByResourceId;
 exports.getProductIdentityIndex = getProductIdentityIndex;
 exports.getSafeProductNum = getSafeProductNum;
@@ -36,6 +37,7 @@ exports.toPriceString = toPriceString;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _utils = require("../../modules/Order/utils");
+var _manualProductDiscount = require("../../modules/Order/utils/manualProductDiscount");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * 构建金额全为 0 的空 summary。
@@ -52,10 +54,14 @@ function createEmptySummary() {
     shipping_tax_fee: '0.00',
     tax_fee: '0.00',
     surcharge_fee: '0.00',
+    surcharges: [],
     discount_amount: '0.00',
     deposit_amount: '0.00',
     expect_amount: '0.00',
     total_amount: '0.00',
+    total_refund_amount: '0.00',
+    customer_paid_amount: '0.00',
+    order_paid_amount: '0.00',
     amount_gap: '0.00',
     rounding_amount: '0.00',
     pay_service_charge_amount: '0.00'
@@ -154,6 +160,11 @@ function toPriceString(value, fallback = '0.00') {
 function buildProductKey(productId, productVariantId) {
   return `${productId}_${productVariantId}`;
 }
+
+/** 加餐接口只提交本次新增商品，过滤掉首单预约占位规则行。 */
+function filterProductsForScanOrderMore(products = []) {
+  return products.filter(product => product.metadata?.is_rule !== true);
+}
 function getTopLevelProductId(product) {
   const rawProductId = product.product_id ?? product.id;
   const productId = Number(rawProductId);
@@ -358,13 +369,13 @@ function attachItemRuleLimitsToTopLevelProducts(productList, limits) {
 function buildProductLineFingerprint(productOptionItem, productBundle) {
   const optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
   const normalizedOpts = optArr.map(item => ({
-    product_option_item_id: Number(item?.product_option_item_id) || 0,
+    option_group_item_id: Number(item?.option_group_item_id) || 0,
     option_group_id: Number(item?.option_group_id) || 0,
     num: typeof item?.num === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-    price: String(item?.price ?? '')
+    price: String(item?.add_price ?? item?.price ?? '')
   })).sort((p, q) => {
-    if (p.product_option_item_id !== q.product_option_item_id) {
-      return p.product_option_item_id - q.product_option_item_id;
+    if (p.option_group_item_id !== q.option_group_item_id) {
+      return p.option_group_item_id - q.option_group_item_id;
     }
     if (p.option_group_id !== q.option_group_id) return p.option_group_id - q.option_group_id;
     if (p.num !== q.num) return p.num - q.num;
@@ -385,15 +396,15 @@ function buildProductLineFingerprint(productOptionItem, productBundle) {
 
 /**
  * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
- * 与显式 `product_option_item: []` 区分：后者只匹配「无选项」行。
+ * 与显式 `product_sku: { option: [] }` 区分：后者只匹配「无选项」行。
  */
 function isSkuOnlyDeleteIdentity(x) {
-  if (x.identity_key) return false;
-  return !('product_option_item' in x) && !('product_bundle' in x);
+  if (x.unique_identification_number || x.identity_key) return false;
+  return !('product_sku' in x) && !('product_bundle' in x);
 }
 function fingerprintForIdentityWithOptionKeys(x) {
   const row = x;
-  const opts = 'product_option_item' in row ? Array.isArray(row.product_option_item) ? row.product_option_item : [] : [];
+  const opts = 'product_sku' in row ? (0, _utils.getProductSkuOptions)(row) : [];
   const buds = 'product_bundle' in row ? Array.isArray(row.product_bundle) ? row.product_bundle : [] : [];
   return buildProductLineFingerprint(opts, buds);
 }
@@ -410,9 +421,11 @@ function fingerprintForIdentityWithOptionKeys(x) {
  */
 function isIdentityMatch(a, b) {
   if (a.product_id !== b.product_id || a.product_variant_id !== b.product_variant_id) return false;
-  const aHasKey = typeof a.identity_key === 'string' && a.identity_key.length > 0;
-  const bHasKey = typeof b.identity_key === 'string' && b.identity_key.length > 0;
-  if (aHasKey && bHasKey) return a.identity_key === b.identity_key;
+  const aUid = a.metadata?.unique_identification_number ?? a.unique_identification_number ?? a.identity_key;
+  const bUid = b.metadata?.unique_identification_number ?? b.unique_identification_number ?? b.identity_key;
+  const aHasKey = typeof aUid === 'string' && aUid.length > 0;
+  const bHasKey = typeof bUid === 'string' && bUid.length > 0;
+  if (aHasKey && bHasKey) return aUid === bUid;
   if (isSkuOnlyDeleteIdentity(a) || isSkuOnlyDeleteIdentity(b)) return true;
   return fingerprintForIdentityWithOptionKeys(a) === fingerprintForIdentityWithOptionKeys(b);
 }
@@ -453,17 +466,64 @@ function normalizeOrderProduct(product) {
   };
   // 不透明 identity 契约：每条订单行必须带 identity_key。
   // 调用方未传时由 SDK 自动生成 UUID，后续 update/remove 只做严格比对，避免猜测合成 key。
-  const resolvedIdentityKey = product.identity_key && String(product.identity_key).length > 0 ? String(product.identity_key) : (0, _utils.createUuidV4)();
-  if (!metadata.unique_identification_number) {
-    metadata.unique_identification_number = resolvedIdentityKey;
+  const resolvedIdentityKey = product.metadata?.unique_identification_number ? String(product.metadata.unique_identification_number) : product.unique_identification_number && String(product.unique_identification_number).length > 0 ? String(product.unique_identification_number) : product.identity_key && String(product.identity_key).length > 0 ? String(product.identity_key) : (0, _utils.createUuidV4)();
+  metadata.unique_identification_number = resolvedIdentityKey;
+  const priceOverride = metadata.price_override;
+  const originOtherBundle = metadata.origin?._extend?.other?.bundle;
+  let bundleInput = product.product_bundle || [];
+  if (priceOverride !== undefined && priceOverride !== null && priceOverride !== '' && Array.isArray(originOtherBundle) && originOtherBundle.length > 0) {
+    const priceById = new Map();
+    originOtherBundle.forEach(item => {
+      if (item?.id == null) return;
+      const unit = item.price ?? item.bundle_selling_price;
+      if (unit === undefined || unit === null) return;
+      priceById.set(String(item.id), String(unit));
+    });
+    const base = Array.isArray(bundleInput) && bundleInput.length > 0 ? bundleInput : originOtherBundle;
+    bundleInput = base.map(item => {
+      const unit = priceById.get(String(item?.id));
+      if (unit === undefined) return item;
+      return {
+        ...item,
+        price: unit,
+        bundle_selling_price: unit
+      };
+    });
   }
-  const normalizedBundle = (product.product_bundle || []).map(item => ({
-    ...item,
-    bundle_selling_price: item.bundle_selling_price ?? item.price ?? '0.00'
-    // custom_price: item.custom_price ?? item.bundle_selling_price ?? item.price ?? '0.00',
-  }));
-  const normalizedOptions = product.product_option_item || [];
+  const normalizedBundle = bundleInput.map(item => {
+    const magnitudeSource = {
+      ...item,
+      // 计算 markdown 净额时，只把真实毛价交给 helper；若只有 bundle_selling_price，
+      // helper 会按历史净额兜底，避免 option 二次扣减。
+      price: item.price ?? item.custom_price
+    };
+    const normalizedItem = {
+      ...item,
+      bundle_id: item.bundle_id ?? item.id,
+      bundle_product_id: item.bundle_product_id ?? item._bundle_product_id,
+      bundle_group_id: item.bundle_group_id ?? item.group_id,
+      // price 保留毛价（markdown 仍为 5），由 price_type 决定符号。
+      price: item.price ?? item.custom_price ?? item.bundle_selling_price ?? '0.00',
+      price_type: item.price_type ?? item.custom_price_type ?? '',
+      price_type_ext: item.price_type_ext ?? item.custom_price_type_ext ?? ''
+    };
+    // bundle_selling_price 落「正净额」：markdown = |price| − Σoptions；markup/原价维持原值。
+    normalizedItem.bundle_selling_price = (0, _utils.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
+    if (normalizedItem.price_type === 'markdown' && (normalizedItem.price_type_ext === '' || normalizedItem.price_type_ext === undefined || normalizedItem.price_type_ext === null)) {
+      normalizedItem.custom_price = normalizedItem.custom_price ?? normalizedItem.price;
+      normalizedItem.price = normalizedItem.bundle_selling_price;
+    }
+    if ((normalizedItem.price_type === 'markdown' || normalizedItem.price_type === 'markup') && (normalizedItem.price_type_ext === '' || normalizedItem.price_type_ext === undefined || normalizedItem.price_type_ext === null)) {
+      delete normalizedItem.original_total;
+    }
+    return normalizedItem;
+  });
+  const normalizedOptions = (0, _utils.normalizeProductSkuOptions)(product.product_sku?.option);
   const optionSum = (0, _utils.sumOptionUnitPrice)(normalizedOptions);
+  const productSku = {
+    ...(0, _utils.ensureProductSku)(product),
+    option: normalizedOptions
+  };
 
   // 1) 解析 source_product_price。
   // 优先级：
@@ -543,22 +603,34 @@ function normalizeOrderProduct(product) {
     bundle: normalizedBundle,
     useOriginalBundle: true
   });
+  const finalOriginalPrice = (0, _utils.resolveManualOverrideLineOriginalPrice)({
+    num: product.num,
+    metadata,
+    lineOriginalPrice: product.original_price
+  }, composedOriginalPrice);
+  const hasManualProductDiscount = (product.discount_list || []).some(item => item?.type === 'product');
+  const manualOriginalPrice = hasManualProductDiscount && product.original_price != null ? String(product.original_price) : finalOriginalPrice;
+  const discountList = (0, _manualProductDiscount.ensureManualProductDiscountList)({
+    discountList: product.discount_list,
+    metadata,
+    originalPrice: manualOriginalPrice,
+    sellingPrice: composedSellingPrice,
+    quantity: getSafeProductNum(product.num)
+  });
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
     product_variant_id: product.product_variant_id,
-    identity_key: resolvedIdentityKey,
-    product_option_item: normalizedOptions,
+    product_sku: productSku,
     selling_price: composedSellingPrice,
-    original_price: composedOriginalPrice,
+    original_price: manualOriginalPrice,
     tax_fee: product.tax_fee || '0.00',
     is_charge_tax: product.is_charge_tax ?? 0,
-    discount_list: product.discount_list || [],
+    discount_list: discountList,
     product_bundle: normalizedBundle,
     metadata,
-    note: product.note != null ? String(product.note) : '',
-    _origin: product._origin
+    note: product.note != null ? String(product.note) : ''
   };
 }
 

package/lib/solution/ShopDiscount/index.js

@@ -365,7 +365,7 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
         this.setDiscountList(newDiscountList || []);
         this.store.originalDiscountList = newDiscountList || [];
         this.setProductList(newProductList || []);
-        if (this.isWalkIn() && resultDiscountList.length && this.options.otherParams?.platform === 'shop') {
+        if (this.isWalkIn() && resultDiscountList.length && this.options.otherParams?.platform === 'shop' && !((resultDiscountList[0].customer_id || 1) === 1)) {
           await this.getCustomerWallet(resultDiscountList[0].customer_id);
         }
       }
@@ -524,7 +524,7 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
       //   return
       // }
 
-      const prepareConfig = await this.store.discount?.loadPrepareConfig({
+      const prepareConfigResult = await this.store.discount?.loadPrepareConfig({
         customer_id: customerId,
         action: orderId ? 'edit' : 'create',
         with_good_pass: 1,
@@ -535,7 +535,7 @@ class ShopDiscountImpl extends _BaseModule.BaseModule {
           order_id: orderId
         } : {})
       });
-      const goodPassList = prepareConfig?.discountList || [];
+      const goodPassList = prepareConfigResult?.discountList || [];
       const scanDiscount = this.getDiscountList()?.filter(item => item.isScan);
 
       // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除

package/lib/solution/UnifiedBookingSales/index.d.ts

@@ -0,0 +1,183 @@
+import type { Module } from '../../types';
+import type { ProductData } from '../../modules';
+import type { OpenDataConfig } from '../../modules/OpenData';
+import type { LoadScheduleAvailableDateParams, ScheduleItem } from '../../modules/Schedule/types';
+import type { ProductListLoadProductsParams } from '../../modules/ProductList';
+import type { ResourcePlannerAssignment, ResourcePlannerAssignableSlotResult, ResourcePlannerEvent, ResourcePlannerProduct, ResourcePlannerProjection, ResourcePlannerQuery, ResourcePlannerResource, ResourcePlannerSelectionPatch, ResourcePlannerSnapshot, ResourcePlannerValidationResult } from '../../modules/ResourcePlanner';
+import type { UnifiedBookingSalesCommitPlannerSelectionParams, UnifiedBookingSalesCommitResult, UnifiedBookingSalesAddRetailProductParams, UnifiedBookingSalesApplyPlannerDiscountsParams, UnifiedBookingSalesDiscountResult, UnifiedBookingSalesLoadProductsByScheduleDateParams, UnifiedBookingSalesLoadPlannerContextParams, UnifiedBookingSalesLoadOpenDataParams, UnifiedBookingSalesStagePlannerProductsParams, UnifiedBookingSalesStageRetailProductsParams, UnifiedBookingSalesState } from './types';
+import { BookingTicket } from '../BookingTicket';
+export * from './types';
+/**
+ * Converts Rules/Order discount internals into a small UI-facing diagnostic. The result keeps
+ * candidate-card state separate from line-level applications: a selected card is not proof that
+ * it actually discounted a planner product.
+ */
+export declare function buildPlannerDiscountResult(params: {
+    customerId: number | null;
+    discountList: Record<string, any>[];
+    products: Record<string, any>[];
+    summaryBefore?: unknown;
+    summaryAfter?: unknown;
+    status: UnifiedBookingSalesDiscountResult['status'];
+    preferredDiscountId?: number | string;
+    preferredDiscountFound?: boolean;
+}): UnifiedBookingSalesDiscountResult;
+/** Converts a ProductList record into the pure input shape consumed by ResourcePlanner. */
+export declare function normalizeProductForPlanner(product: ProductData | Record<string, any>): ResourcePlannerProduct;
+/**
+ * Materializes resource work windows locally from v2's schedule ids, then keeps its flat
+ * event_list as planner events. This deliberately avoids the older API's times -> event_list
+ * response nesting and lets one resource response serve any requested date range.
+ */
+export declare function buildPlannerResourcesFromV2(params: {
+    rawResources: Record<string, any>[];
+    scheduleList: ScheduleItem[];
+    dateRange?: ResourcePlannerQuery['dateRange'];
+}): {
+    resources: ResourcePlannerResource[];
+    externalEvents: ResourcePlannerEvent[];
+};
+/** Combines URL-locked resources with every resource referenced by the selected products. */
+export declare function collectPlannerResourceIds(products: ResourcePlannerProduct[], explicitResourceIds?: Array<number | string>): Array<number | string>;
+/** Convenience wrapper for the usual one-resource booking case. */
+export declare function buildBookingFromAssignment(params: {
+    assignment: ResourcePlannerAssignment;
+    product: ResourcePlannerProduct;
+}): Record<string, any>;
+/**
+ * Converts all resources needed by one product/time interval into the one booking expected by
+ * OrderModule. Callers must group assignments before this function so a multi-form booking does
+ * not become several competing bookings.
+ */
+export declare function buildBookingFromAssignments(params: {
+    assignments: ResourcePlannerAssignment[];
+    product: ResourcePlannerProduct;
+}): Record<string, any>;
+/** Builds the exact identity BaseSales needs to remove only this solution's order lines. */
+export declare function buildPlannerLineIdentity(product: Record<string, any>): Record<string, any>;
+export declare class UnifiedBookingSalesImpl extends BookingTicket {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    protected store: UnifiedBookingSalesState;
+    private unifiedProductCatalog;
+    private openDataTarget;
+    private loadOpenDataInFlight;
+    private loadOpenDataInFlightTarget;
+    /**
+     * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
+     * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。
+     */
+    protected shouldUseCheckoutSyncTask(): boolean;
+    /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */
+    protected getDefaultCheckoutSmallTicketDataFlag(): number;
+    protected getRegisteredModuleNames(): readonly string[];
+    protected createSubModule(moduleName: string): Module | null;
+    /**
+     * Loads OpenData without borrowing BookingTicket. Cache ownership is tied to the exact
+     * business/channel target so a reused solution instance cannot leak another entry's menus.
+     */
+    loadOpenData(params: UnifiedBookingSalesLoadOpenDataParams): Promise<OpenDataConfig>;
+    getOpenData(): Promise<OpenDataConfig | null>;
+    /**
+     * Loads the product catalog used by both UI and Planner. Schedule data is requested with each
+     * product because session products carry their fixed intervals there.
+     */
+    loadProducts(params?: ProductListLoadProductsParams, options?: {
+        callback?: (result: any) => void;
+        subscriberId?: string;
+    }): Promise<ProductData[]>;
+    /** Date-first entry point. It delegates protocol details and cache ownership to ScheduleModule. */
+    loadScheduleAvailableDate(params: LoadScheduleAvailableDateParams): Promise<import("../../modules/Date/types").ITime[]>;
+    /**
+     * Implements the date-first product pool: the chosen date's product ids plus globally sellable
+     * other_product_ids. If a batch product query is unexpectedly empty, retry one id at a time so
+     * a partial backend incompatibility does not hide the entire date's catalog.
+     */
+    loadProductsByScheduleDate(params: UnifiedBookingSalesLoadProductsByScheduleDateParams): Promise<ProductData[]>;
+    /** Returns a copy so UI consumers cannot accidentally mutate the solution's product cache. */
+    getProductCatalog(): {
+        products: ProductData[];
+    };
+    /**
+     * Read-only compatibility view for salesSdk skins. It reconnects a booking to its product but
+     * must not be used to mutate tempOrder; all writes go through BaseSales / planner APIs.
+     */
+    getCart(): {
+        items: any[];
+        bookings: any[];
+    };
+    /**
+     * Loads the current customer's product coupons and discount cards after planner lines exist,
+     * then optionally lets the existing Rules engine select the best valid combination. This is a
+     * diagnostic boundary for new booking skins: no pricing logic is duplicated in the planner.
+     */
+    applyPlannerDiscounts(params?: UnifiedBookingSalesApplyPlannerDiscountsParams): Promise<UnifiedBookingSalesDiscountResult>;
+    /** ResourcePlanner is a required child module; fail early instead of producing partial availability. */
+    private getPlanner;
+    private buildUnifiedOrderProduct;
+    /** Replacing a staged selection is idempotent and never removes unrelated cart lines. */
+    private removeExistingStagedLines;
+    private stageProducts;
+    /**
+     * Adds the current product choice to an otherwise clean planner cart without creating bookings.
+     * This separates "what the customer wants" from the later time/resource confirmation step.
+     */
+    stagePlannerProducts(params: UnifiedBookingSalesStagePlannerProductsParams): Promise<Record<string, any> | null>;
+    /**
+     * Adds ordinary retail products without asking ResourcePlanner for booking facts.
+     * Its staged lines have separate ownership so planner and retail skins can coexist safely.
+     */
+    stageRetailProducts(params: UnifiedBookingSalesStageRetailProductsParams): Promise<Record<string, any> | null>;
+    /**
+     * Adds one retail line without replacing the cart's existing retail selection.
+     * This is intentionally separate from stageRetailProducts(), whose contract is
+     * "replace the staged selection" for demo and wizard-like callers.
+     */
+    addRetailProduct(params: UnifiedBookingSalesAddRetailProductParams): Promise<Record<string, any>[]>;
+    /** Normalizes caller-provided products or loads the catalog before any resource request is made. */
+    private loadPlannerProducts;
+    /** Loads the reusable store-level schedule catalog on demand. */
+    private ensurePlannerSchedulesLoaded;
+    /**
+     * v2 resources reference schedule ids rather than expanded work times. Refresh once when the
+     * cached schedule catalog cannot materialize all referenced ids.
+     */
+    private ensurePlannerSchedulesForResources;
+    /**
+     * Fetches resource metadata plus flat occupied events. Work windows are intentionally derived
+     * locally in buildPlannerResourcesFromV2 from /schedule, rather than requested from the legacy
+     * resource dates endpoint.
+     */
+    private fetchPlannerResourcesV2;
+    /**
+     * Resolves the Planner context in precedence order: explicit normalized context, test raw data,
+     * then the v2 resource API inferred from selected product requirements and any URL lock.
+     */
+    private loadPlannerResources;
+    /**
+     * Boundary between IO and pure planning. Once this returns, all later availability/slot calls
+     * operate on the ResourcePlanner snapshot and do not issue resource requests themselves.
+     */
+    loadPlannerContext(params?: UnifiedBookingSalesLoadPlannerContextParams): Promise<ResourcePlannerSnapshot>;
+    /** Returns cells, date summaries and a derived grid; cells are continuous ranges, not UI slots. */
+    queryPlannerAvailability(query?: ResourcePlannerQuery): Promise<ResourcePlannerProjection>;
+    /** Turns compatible availability ranges into user-selectable intervals and ready-to-commit assignments. */
+    resolveAssignableSlots(query?: ResourcePlannerQuery): ResourcePlannerAssignableSlotResult;
+    /** Stores a UI choice only. It is deliberately side-effect free with respect to tempOrder. */
+    setPlannerSelection(patch: ResourcePlannerSelectionPatch): ResourcePlannerSnapshot;
+    /**
+     * Legacy-friendly automatic assignment for already fixed intervals. Duration products without a
+     * start time intentionally remain unresolved; callers offering a picker should use slots.
+     */
+    autoAssignPlanner(query?: ResourcePlannerQuery): Promise<ResourcePlannerSnapshot>;
+    /** Rechecks remote events, capacity and conflicts among the current selection before committing. */
+    validatePlannerSelection(): ResourcePlannerValidationResult;
+    /** Read-only snapshot for UI diagnostics and progressive flow steps. */
+    getPlannerSnapshot(): ResourcePlannerSnapshot;
+    /**
+     * Validates then writes assignments to tempOrder. Real order submission is opt-in so UI callers
+     * can safely preview the cart; pass submitAfterCommit only after an explicit confirmation.
+     */
+    commitPlannerSelection(params?: UnifiedBookingSalesCommitPlannerSelectionParams): Promise<UnifiedBookingSalesCommitResult>;
+}
+export declare const UnifiedBookingSales: typeof UnifiedBookingSalesImpl;