@pisell/pisellos 0.10.68 → 0.10.70

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -5,8 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.transformBaseProductToOrderProduct = transformBaseProductToOrderProduct;
 var _weighedProduct = require("../../../modules/Order/utils/weighedProduct");
+var _utils = require("../../../modules/Holder/utils");
 var _serviceTimes = require("../../../modules/BookingContext/utils/serviceTimes");
-var _utils = require("../../../modules/Order/utils");
+var _utils2 = require("../../../modules/Order/utils");
 var _manualProductDiscount = require("../../../modules/Order/utils/manualProductDiscount");
 function toNumber(value, fallback = 0) {
   const parsedValue = Number(value);
@@ -109,7 +110,7 @@ function normalizeBundleItems(bundleItems, preferPriceField = false, preferBundl
       discount_list: preferPriceField ? [] : bundleItem.discount_list
     };
     // bundle_selling_price 落「正净额」：markdown = |price| − Σoptions；markup/原价维持原值。
-    normalizedItem.bundle_selling_price = (0, _utils.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
+    normalizedItem.bundle_selling_price = (0, _utils2.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
     if ((normalizedItem.price_type ?? normalizedItem.custom_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;
@@ -159,14 +160,14 @@ function transformBaseProductToOrderProduct(params) {
   const explicitLineTotal = payload.line_total ?? payload.total ?? payload._extend?.total;
   const hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
   const lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
-  const productOptionItem = (0, _utils.normalizeProductSkuOptions)(normalizeOptionItems(payload.product_sku?.option ?? payload.option ?? payload.options ?? payload.product_option_item, hasPriceOverride || weighedSourcePrice !== undefined));
+  const productOptionItem = (0, _utils2.normalizeProductSkuOptions)(normalizeOptionItems(payload.product_sku?.option ?? payload.option ?? payload.options ?? payload.product_option_item, hasPriceOverride || weighedSourcePrice !== undefined));
   const productBundle = normalizeBundleItems(payload.bundle ?? payload.product_bundle, hasPriceOverride, hasPriceOverride && weighedSourcePrice !== undefined);
   // `payload.unique` 是业务侧商品/票务标识，可能在连续加同一商品时重复；
   // 行级唯一值只接受显式协议字段，缺省交给 OrderModule 生成。
   const uniqueIdentificationNumber = payload.unique_identification_number;
   const resolvedQuantity = toSafePositiveInt(payload.quantity ?? payload.num, 1);
-  const originTotal = weighedSourcePrice !== undefined ? Number((0, _utils.composeLinePrice)({
-    mainPrice: Number(weighedSourcePrice) + (0, _utils.sumOptionUnitPrice)(productOptionItem).toNumber(),
+  const originTotal = weighedSourcePrice !== undefined ? Number((0, _utils2.composeLinePrice)({
+    mainPrice: Number(weighedSourcePrice) + (0, _utils2.sumOptionUnitPrice)(productOptionItem).toNumber(),
     bundle: hasPriceOverride ? (0, _weighedProduct.withOriginalBundleOptionPrices)(productBundle) : productBundle,
     useOriginalBundle: true
   })) : (0, _manualProductDiscount.resolveManualDiscountOriginTotal)({
@@ -198,9 +199,9 @@ function transformBaseProductToOrderProduct(params) {
   })) : payload.discount_list || [];
 
   // v2：source 不含 option；main_product_* 含 option（与 normalizeOrderProduct 一致）
-  const optionSum = (0, _utils.sumOptionUnitPrice)(productOptionItem).toNumber();
+  const optionSum = (0, _utils2.sumOptionUnitPrice)(productOptionItem).toNumber();
   const mainProductOriginalPrice = toPriceString(Number(sourceProductPrice) + optionSum);
-  const bundleOnlyComposite = (0, _utils.composeLinePrice)({
+  const bundleOnlyComposite = (0, _utils2.composeLinePrice)({
     mainPrice: 0,
     bundle: productBundle
   });
@@ -221,7 +222,7 @@ function transformBaseProductToOrderProduct(params) {
     main_product_selling_price: mainProductSellingPrice,
     main_product_original_price: mainProductOriginalPrice,
     price_schema_version: 2,
-    holder_config: sourceProduct?.holder_config,
+    holder_config: (0, _utils.resolveProductHolderConfig)(sourceProduct) ?? undefined,
     ...(dataVariantIds !== undefined ? {
       data_variant_ids: dataVariantIds
     } : {}),

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 6 | 5 | 1 | 2 | 3 | 4;
+        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.js

@@ -30,6 +30,7 @@ var _handleScan = require("./utils/scan/handleScan");
 var _scanCache = _interopRequireDefault(require("./utils/scan/scanCache"));
 var _formatGlobalScan = require("./utils/scan/formatGlobalScan");
 var _applyGlobalScan = require("./utils/scan/applyGlobalScan");
+var _applyProductVoucherCollectionScan = require("./utils/scan/applyProductVoucherCollectionScan");
 var _cartView = require("./utils/cartView");
 var _addProductDecision = require("./utils/addProductDecision");
 var _buildCacheItemFromOrderLine = require("../../modules/BookingContext/utils/buildCacheItemFromOrderLine");
@@ -1847,7 +1848,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
           reason: 'not_found'
         };
       }
-      const result = await (0, _applyGlobalScan.applyGlobalScan)({
+      const host = {
         setOrderCustomer: customer => {
           beforeScanCommit();
           this.setOrderCustomer(customer);
@@ -1868,10 +1869,29 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
           beforeScanCommit();
           return this.scanWalletAsset(scanCode);
         }
-      }, formatted, guardedBridge);
+      };
+      const result = guardedBridge?.scanScope === 'product-voucher-collection' ? await (0, _applyProductVoucherCollectionScan.applyProductVoucherCollectionScan)({
+        ...host,
+        waitForCustomerDiscounts: () => this.orderCustomerDiscountRefreshInFlight || Promise.resolve(),
+        loadCustomerDiscounts: async () => {
+          const customerId = Number(this.getOrderCustomer()?.customer_id || 0);
+          if (customerId <= 1) return [];
+          await this.refreshDiscountConfigAfterOrderCustomerChange(customerId);
+          return this.getDiscountList();
+        }
+      }, formatted, guardedBridge) : await (0, _applyGlobalScan.applyGlobalScan)(host, formatted, guardedBridge);
       bridge?.refresh?.();
       return result;
     } catch (error) {
+      if (bridge?.scanScope === 'product-voucher-collection') {
+        if (bridge.isCurrent?.() === false) return {
+          status: 'cancelled'
+        };
+        return {
+          status: 'failed',
+          reason: 'entry_resolution_failed'
+        };
+      }
       console.error('[BookingTicket] handleGlobalScanCode failed', error);
       bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
       return {

package/lib/solution/BookingTicket/types.d.ts

@@ -208,8 +208,10 @@ export interface AddAddTimeProductsToBookingInput {
 }
 /** 扫码宿主桥接：SalesSdk 在 pubsub 订阅回调里注入，OS 需要 UI 时直接调用 */
 export interface GlobalScanHostBridge {
-    /** Restrict redemption scans before customer/product side effects. */
-    scanScope?: 'all' | 'product-voucher';
+    /** product-voucher handles voucher codes only; product-voucher-collection also resolves wallet customer vouchers. */
+    scanScope?: 'all' | 'product-voucher' | 'product-voucher-collection';
+    /** A one-shot entry may outlive its page while requests are in flight. */
+    isCurrent?: () => boolean;
     openProductDetail?: (payload: Record<string, any>) => Promise<any | null>;
     openBookingEdit?: (payload: Record<string, any>) => Promise<any | null>;
     confirmDetail?: (input: {
@@ -234,11 +236,13 @@ export interface GlobalScanHostBridge {
      */
     applyPromotionCode?: (code: string, customerId?: number, options?: {
         suppressFailureNotification?: boolean;
+        productVouchersOnly?: boolean;
     }) => Promise<{
         isAvailable?: boolean;
         isAccepted?: boolean;
         type?: string;
         unavailableReason?: string;
+        scannedDiscountList?: Record<string, any>[];
     }>;
     /** 当前订单已有其他客户时，由宿主复用客户组件完成确认及切换。 */
     requestCustomerSwitch?: (customer: ICustomer) => Promise<boolean | null>;
@@ -246,7 +250,7 @@ export interface GlobalScanHostBridge {
     refresh?: () => void;
 }
 /** handleGlobalScanCode 结构化返回 */
-export type GlobalScanHandleResult = {
+export type GlobalScanHandleResult = ({
     status: 'success';
     kind: 'customer' | 'products' | 'promotion';
     meta?: {
@@ -259,5 +263,11 @@ export type GlobalScanHandleResult = {
     status: 'cancelled';
 } | {
     status: 'failed';
-    reason: 'empty_code' | 'not_found' | 'invalid_data' | 'no_bridge';
+    reason: 'empty_code' | 'not_found' | 'invalid_data' | 'no_bridge' | 'entry_resolution_failed';
+}) & {
+    /** product-voucher-collection returns voucher candidates; the caller decides how to use them. */
+    redemption?: {
+        source: 'wallet' | 'scan';
+        vouchers: Record<string, any>[];
+    };
 };

package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.js

@@ -289,6 +289,18 @@ async function applyGlobalScan(host, formatted, bridge) {
     // batch-search 可能返回来源门店客户；先映射到当前门店，确保 Wallet
     // 支付资产查询使用本店客户上下文。
     const bindResult = await bindWalletPassCustomer();
+    // Voucher collection prioritizes goods coupons resolved from the wristband/order.
+    // Only this opt-in flow checks them before selecting a payment wallet asset.
+    const collectionPromotion = bridge?.scanScope === 'product-voucher-collection' && bridge.applyPromotionCode ? await bridge.applyPromotionCode(scanCode, getRealCustomerId(activeCustomer), {
+      suppressFailureNotification: true,
+      productVouchersOnly: true
+    }) : undefined;
+    if (collectionPromotion?.isAccepted ?? collectionPromotion?.isAvailable) {
+      return {
+        status: 'success',
+        kind: 'promotion'
+      };
+    }
     const walletSelection = await trySelectWalletAsset();
     if (walletSelection) return walletSelection;
     if (!bridge?.applyPromotionCode) {
@@ -298,9 +310,9 @@ async function applyGlobalScan(host, formatted, bridge) {
       };
     }
     const promotionCustomerId = getRealCustomerId(activeCustomer);
-    const promotionResult = bindResult.customerBound ? await bridge.applyPromotionCode(scanCode, promotionCustomerId, {
+    const promotionResult = collectionPromotion ?? (bindResult.customerBound ? await bridge.applyPromotionCode(scanCode, promotionCustomerId, {
       suppressFailureNotification: true
-    }) : await bridge.applyPromotionCode(scanCode, promotionCustomerId);
+    }) : await bridge.applyPromotionCode(scanCode, promotionCustomerId));
     if (promotionResult?.isAccepted ?? promotionResult?.isAvailable) {
       return {
         status: 'success',

package/lib/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.d.ts

@@ -0,0 +1,10 @@
+import type { GlobalScanHandleResult, GlobalScanHostBridge } from '../../types';
+import { type GlobalScanApplyHost } from './applyGlobalScan';
+import type { GlobalScanFormattedResult } from './formatGlobalScan';
+export interface ProductVoucherCollectionScanHost extends GlobalScanApplyHost {
+    waitForCustomerDiscounts(): Promise<void>;
+    loadCustomerDiscounts(): Promise<Record<string, any>[]>;
+}
+/** Collect voucher candidates after customer binding and coupon loading finish.
+ * Never expand a wristband's result to other orders of the same customer. */
+export declare function applyProductVoucherCollectionScan(host: ProductVoucherCollectionScanHost, formatted: GlobalScanFormattedResult, bridge: GlobalScanHostBridge): Promise<GlobalScanHandleResult>;

package/lib/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.js

@@ -0,0 +1,71 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.applyProductVoucherCollectionScan = applyProductVoucherCollectionScan;
+var _applyGlobalScan = require("./applyGlobalScan");
+/** Collect voucher candidates after customer binding and coupon loading finish.
+ * Never expand a wristband's result to other orders of the same customer. */
+async function applyProductVoucherCollectionScan(host, formatted, bridge) {
+  const assertCurrent = () => {
+    if (bridge.isCurrent?.() === false) {
+      throw new DOMException('Scan session ended', 'AbortError');
+    }
+  };
+  let vouchers = [];
+  assertCurrent();
+  const result = await (0, _applyGlobalScan.applyGlobalScan)({
+    ...host,
+    setOrderCustomer: customer => {
+      assertCurrent();
+      host.setOrderCustomer(customer);
+    },
+    addProductToOrder: (product, booking) => {
+      assertCurrent();
+      return host.addProductToOrder(product, booking);
+    }
+  }, formatted, {
+    ...bridge,
+    applyPromotionCode: bridge.applyPromotionCode && (async (code, customerId, options) => {
+      // Customer binding starts prepare/config in the background. Let it finish
+      // before adding scanned coupons so its response cannot overwrite them.
+      await host.waitForCustomerDiscounts();
+      assertCurrent();
+      const promotion = await bridge.applyPromotionCode(code, customerId, {
+        ...options,
+        productVouchersOnly: true,
+        suppressFailureNotification: true
+      });
+      assertCurrent();
+      // An empty successful search is different from a swallowed request error.
+      if (!Array.isArray(promotion.scannedDiscountList)) {
+        throw new Error('Could not resolve scanned vouchers');
+      }
+      vouchers = promotion.scannedDiscountList;
+      return promotion;
+    })
+  });
+  assertCurrent();
+  if (formatted.searchType === 'wallet' && result.status === 'success') {
+    vouchers = await host.loadCustomerDiscounts();
+    assertCurrent();
+    return {
+      ...result,
+      redemption: {
+        source: 'wallet',
+        vouchers
+      }
+    };
+  }
+  if (formatted.searchType === 'walletPass') {
+    return {
+      ...result,
+      redemption: {
+        source: 'scan',
+        vouchers
+      }
+    };
+  }
+  return result;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.10.68",
+  "version": "0.10.70",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",