@pisell/pisellos 0.10.63 → 0.10.65

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

@@ -241,7 +241,7 @@ function consolidateDiscountFreeProductLines(tempOrder) {
         bundle_selling_price: String(bundle?.bundle_selling_price ?? '')
       }))
     });
-    const mergeKey = [discountSplitOriginUid, product.product_id, product.product_variant_id ?? 0, fingerprint, priceSignature].join('#');
+    const mergeKey = [discountSplitOriginUid, productUid ? tempOrder._extend?.productsByUid?.[productUid]?.productVoucherGroupKey ?? '' : '', product.product_id, product.product_variant_id ?? 0, fingerprint, priceSignature].join('#');
     const matchedIndex = productIndexByKey.get(mergeKey);
 
     // 当前拆分来源 + 商品结构组合第一次出现时，保留该行作为回并目标。

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

@@ -0,0 +1,15 @@
+import type { Discount } from '../../Discount/types';
+import type { OrderTempOrder } from '../types';
+/** Runtime-only allocation constraints. Never copied into order/product metadata. */
+export interface ProductVoucherGroup {
+    key: string;
+    discountIds: Array<number | string>;
+}
+export declare function productVoucherGroupKey(order: OrderTempOrder, product: any): string | undefined;
+export declare function isUsableProductVoucher(discount: Discount): boolean;
+export declare function voucherGroupError(): Error & {
+    code: string;
+};
+export declare function allowsProductVoucher(order: OrderTempOrder | null | undefined, product: any, discount: Discount): boolean;
+/** Reductions stay possible when a voucher expires; checkout always requires full coverage. */
+export declare function validateProductVoucherGroups(order: OrderTempOrder, discounts: Discount[], previous?: OrderTempOrder, requireCoverage?: boolean): void;

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

@@ -0,0 +1,64 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.allowsProductVoucher = allowsProductVoucher;
+exports.isUsableProductVoucher = isUsableProductVoucher;
+exports.productVoucherGroupKey = productVoucherGroupKey;
+exports.validateProductVoucherGroups = validateProductVoucherGroups;
+exports.voucherGroupError = voucherGroupError;
+var _availability = require("../../Discount/availability");
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _utils = require("../../../solution/ShopDiscount/utils");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/** Runtime-only allocation constraints. Never copied into order/product metadata. */
+
+function productVoucherGroupKey(order, product) {
+  const uid = product?.metadata?.unique_identification_number ?? product?.unique_identification_number;
+  return order._extend?.productsByUid?.[String(uid)]?.productVoucherGroupKey;
+}
+function isUsableProductVoucher(discount) {
+  return (discount.tag || discount.type) === 'good_pass' && !discount.isEditMode && !discount.isDisabled && !(0, _availability.getDiscountUsageBlockReason)(discount) && !(0, _utils.getDiscountTimeUnavailableReason)(discount, (0, _dayjs.default)().format('YYYY-MM-DD HH:mm:ss'));
+}
+function voucherGroupError() {
+  return Object.assign(new Error('The selected items no longer match the available vouchers. Please adjust your selection.'), {
+    code: 'PRODUCT_VOUCHER_GROUP_INVALID'
+  });
+}
+function allowsProductVoucher(order, product, discount) {
+  const groups = order?._extend?.productVoucherGroups;
+  if (!order || !groups?.length) return true;
+  const key = productVoucherGroupKey(order, product);
+  if (!key) return !groups.some(group => group.discountIds.some(id => String(id) === String(discount.id)));
+  return (discount.tag || discount.type) === 'good_pass' && Boolean(groups.find(group => group.key === key)?.discountIds.some(id => String(id) === String(discount.id)));
+}
+
+/** Reductions stay possible when a voucher expires; checkout always requires full coverage. */
+function validateProductVoucherGroups(order, discounts, previous, requireCoverage = false) {
+  const groups = order._extend?.productVoucherGroups;
+  if (!groups?.length) return;
+  const usedIds = new Set();
+  const byId = new Map(discounts.filter(isUsableProductVoucher).map(discount => [String(discount.id), discount]));
+  const quantity = item => Number(item.num ?? item.product_quantity ?? 0);
+  for (const group of groups) {
+    const items = order.products.filter(item => productVoucherGroupKey(order, item) === group.key);
+    const selected = items.reduce((sum, item) => sum + quantity(item), 0);
+    const before = previous?.products.filter(item => productVoucherGroupKey(previous, item) === group.key).reduce((sum, item) => sum + quantity(item), 0) ?? 0;
+    if (!requireCoverage && previous && selected <= before) continue;
+    const ids = new Set(group.discountIds.map(String).filter(id => byId.has(id)));
+    if (!Number.isInteger(selected) || selected < 0 || selected > ids.size) throw voucherGroupError();
+    if (!requireCoverage) continue;
+    for (const item of items) {
+      const applied = (item.discount_list || []).filter(entry => (entry.type || entry.tag) === 'good_pass');
+      // Rules splits a good_pass allocation into one physical line per instance.
+      const id = String(applied[0]?.discount?.resource_id ?? '');
+      const voucher = byId.get(id);
+      if (quantity(item) !== 1 || applied.length !== 1 || !ids.has(id) || !voucher?.isAvailable || voucher.config?.isAvailable === false || usedIds.has(id)) throw voucherGroupError();
+      usedIds.add(id);
+    }
+  }
+  if (order.products.some(item => !groups.some(group => group.key === productVoucherGroupKey(order, item)))) {
+    throw voucherGroupError();
+  }
+}

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

@@ -9,6 +9,8 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     private store;
     window: WindowPlugin;
     private hooks;
+    private discountScope?;
+    setDiscountScope(scope: (product: any, discount: Discount) => boolean): void;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setRulesList(rulesList: Rules[]): Promise<void>;

package/lib/modules/Rules/index.js

@@ -20,6 +20,10 @@ class RulesModule extends _BaseModule.BaseModule {
   store;
   window; // WindowPlugin 实例
   hooks;
+  discountScope;
+  setDiscountScope(scope) {
+    this.discountScope = scope;
+  }
   constructor(name, version) {
     super(name, version);
     this.hooks = {};
@@ -722,6 +726,7 @@ class RulesModule extends _BaseModule.BaseModule {
 
     // 辅助函数：检查商品是否对某个折扣卡可用
     const checkItemApplicableForDiscount = (flatItem, discount) => {
+      if (this.discountScope && !this.discountScope(flatItem.originProduct, discount)) return false;
       if (discount.config?.isAvailable === false) return false;
       let product;
       if (flatItem.type === 'main') {
@@ -1093,6 +1098,7 @@ class RulesModule extends _BaseModule.BaseModule {
 
       // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
       const applicableDiscounts = sortedDiscountList.filter(discount => {
+        if (this.discountScope && !this.discountScope(originProduct, discount)) return false;
         if (this.isItemRewardProductDiscount(product)) return false;
         // 🔥 检查策略可用性（针对全额抵扣卡和折扣卡）
         const discountType = discount.tag || discount.type;

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

@@ -338,7 +338,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         discountList: Discount[];
         originalDiscountList?: Discount[];
     }): Promise<void>;
-    scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
+    scanPromotionCode(code: string, customerId?: number, options?: {
+        productVouchersOnly?: boolean;
+    }): Promise<BaseSalesScanCodeResult>;
     setDiscountSelected(params: {
         discountId: number;
         isSelected: boolean;
@@ -519,6 +521,11 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private hasSmartPricingStrategies;
     shouldRecalculateProductBookingPricesForContextChange(params: BaseSalesPriceRecalculationContextChange): boolean;
     calculateProductBookingPrices(paramsList: BaseSalesCalculateProductBookingPriceParams[]): Promise<BaseSalesProductBookingPriceResult[]>;
+    setProductVoucherGroups(groups: Array<{
+        key: string;
+        discountIds: Array<number | string>;
+    }>): void;
+    validateProductVoucherSelection(): void;
     addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProduct(params: UpdateOrderProductParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProducts(paramsList: UpdateOrderProductParams[]): Promise<import("../../modules/Order/types").OrderProduct[]>;

package/lib/solution/BaseSales/index.js

@@ -2412,10 +2412,10 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     }
     await discountModule.setDiscountList(params.discountList);
   }
-  async scanPromotionCode(code, customerId) {
+  async scanPromotionCode(code, customerId, options) {
     try {
       if (!this.store.order) throw new Error('order 模块未初始化');
-      const raw = await this.store.order.scanCode(code, customerId);
+      const raw = await this.store.order.scanCode(code, customerId, options);
       if (raw.isAvailable) {
         await this.store.order.recalculateSummary({
           createIfMissing: true
@@ -4112,6 +4112,13 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       });
     });
   }
+  setProductVoucherGroups(groups) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    this.store.order.setProductVoucherGroups(groups);
+  }
+  validateProductVoucherSelection() {
+    this.store.order?.validateProductVoucherSelection();
+  }
   async addProductToOrder(product, booking, options) {
     try {
       if (!this.store.order) throw new Error('order 模块未初始化');

package/lib/solution/BookingTicket/index.js

@@ -1699,6 +1699,20 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
           return bridge.openBookingEdit(payload);
         } : undefined
       } : undefined;
+      if (guardedBridge?.scanScope === 'product-voucher') {
+        if (!guardedBridge.applyPromotionCode) return {
+          status: 'failed',
+          reason: 'no_bridge'
+        };
+        const promotion = await guardedBridge.applyPromotionCode(trimmed);
+        return promotion.isAccepted ?? promotion.isAvailable ? {
+          status: 'success',
+          kind: 'promotion'
+        } : {
+          status: 'failed',
+          reason: 'not_found'
+        };
+      }
       const localSearch = v => this.store.products.findProductsByCodeOrBarcode(v);
       const scanCallback = (0, _handleScan.handleGlobalScan)(this.request, localSearch, this.getSubmitOrderSalesChannel());
       const raw = await scanCallback({

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

@@ -208,6 +208,8 @@ export interface AddAddTimeProductsToBookingInput {
 }
 /** 扫码宿主桥接：SalesSdk 在 pubsub 订阅回调里注入，OS 需要 UI 时直接调用 */
 export interface GlobalScanHostBridge {
+    /** Restrict redemption scans before customer/product side effects. */
+    scanScope?: 'all' | 'product-voucher';
     openProductDetail?: (payload: Record<string, any>) => Promise<any | null>;
     openBookingEdit?: (payload: Record<string, any>) => Promise<any | null>;
     confirmDetail?: (input: {

package/package.json

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