@pisell/pisellos 0.10.46 → 0.10.48

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

@@ -1 +1,46 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.ITEM_REWARD_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "PromotionAdapter", {
+  enumerable: true,
+  get: function () {
+    return _adapter.PromotionAdapter;
+  }
+});
+Object.defineProperty(exports, "PromotionEvaluator", {
+  enumerable: true,
+  get: function () {
+    return _evaluator.PromotionEvaluator;
+  }
+});
+Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _adapter.default;
+  }
+});
+var _evaluator = require("./evaluator");
+var _adapter = _interopRequireWildcard(require("./adapter"));
+var _examples = require("./examples");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

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

@@ -45,6 +45,8 @@ interface ApplicableProductDetails {
     num: number;
     metadata?: {
         product_discount_difference?: number;
+        /** 月卡扣除本单新增使用后的剩余次数；不限次数时为 null。 */
+        balance?: number | null;
     };
     discount?: {
         fixed_amount?: number;

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

@@ -16,8 +16,8 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     getWalletPassEvaluator(): import("../..").WalletPassEvaluator | undefined;
     private normalizeHolderRecordIds;
     /**
-     * 特定 form Holder 卡只授权给绑定同一 Holder Record 的商品行。
-     * required/isNeedHolder 仅控制是否强制选择 Holder，不参与优惠资格。
+     * 商品未开启 Holder 选择时跳过匹配；已开启时，特定 form Holder 卡
+     * 只适用于同一 Holder Record，是否必填不影响匹配规则。
      */
     private checkHolderMatch;
     isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, orderTotalAmount, holders, isFormSubject, }: {

package/lib/modules/Rules/index.js

@@ -51,12 +51,20 @@ class RulesModule extends _BaseModule.BaseModule {
   }
 
   /**
-   * 特定 form Holder 卡只授权给绑定同一 Holder Record 的商品行。
-   * required/isNeedHolder 仅控制是否强制选择 Holder，不参与优惠资格。
+   * 商品未开启 Holder 选择时跳过匹配；已开启时，特定 form Holder 卡
+   * 只适用于同一 Holder Record，是否必填不影响匹配规则。
    */
-  checkHolderMatch(discount, product, holders) {
+  checkHolderMatch(discount, product, holderSource, holders) {
     // 非表单类型 holder 视为匹配
     if (discount.holder?.holder_type !== 'form') return true;
+
+    // getProduct 会裁剪商品字段，从原始商品读取配置，套餐子项沿用父商品。
+    const holderConfig = holderSource?.holder_config ?? holderSource?.metadata?.holder_config ?? holderSource?.origin?.holder_config ?? holderSource?.metadata?.origin?.holder_config ?? holderSource?._origin?.holder_config ?? holderSource?._extend?.holder_config ?? holderSource?._extend?.product?.holder_config ?? holderSource?._extend?.product?.metadata?.holder_config;
+    const holderStatus = holderConfig?.status;
+    const holderEnabled = holderStatus === true || ['enable', '1'].includes(String(holderStatus).trim().toLowerCase());
+    if (!holderEnabled || holderConfig?.resource_id === undefined || holderConfig?.resource_id === null || holderConfig?.resource_id === '') {
+      return true;
+    }
     const discountHolderIds = this.normalizeHolderRecordIds(discount.holder.holder_id);
     if (!discountHolderIds.length) return false;
     const productHolderIds = this.normalizeHolderRecordIds(product.holder_id);
@@ -914,7 +922,7 @@ class RulesModule extends _BaseModule.BaseModule {
         const isHolderMatch = this.checkHolderMatch(discount, {
           isNeedHolder: resolveIsFormSubject(_tempVar) && !_tempVar?.isNormalProduct,
           holder_id: _tempVar?.holder_id || product.holder_id
-        }, holders);
+        }, flatItem.originProduct, holders);
         const timeReason = (0, _utils.getDiscountTimeUnavailableReason)(discount, (product?.startDate || (0, _dayjs.default)()).format('YYYY-MM-DD HH:mm:ss'));
         const timeLimit = !timeReason;
         // 是符合折扣的商品
@@ -1127,7 +1135,7 @@ class RulesModule extends _BaseModule.BaseModule {
         const isHolderMatch = this.checkHolderMatch(discount, {
           isNeedHolder: resolveIsFormSubject(_tempVar) && !_tempVar?.isNormalProduct,
           holder_id: _tempVar?.holder_id || product.holder_id
-        }, holders);
+        }, flatItem.originProduct, holders);
         // 如果 holder 不匹配，则不适用
         if (!isHolderMatch) return false;
         let timeLimit = true;
@@ -2118,9 +2126,65 @@ class RulesModule extends _BaseModule.BaseModule {
         appliedProductDetails: committedAppliedProductDetails
       };
     });
+
+    // 整单分配完成后统一记录卡余额；历史使用已包含在服务端余额中，只扣本次新增次数。
+    const entitlementBalances = new Map();
+    addModeDiscount.forEach(discount => {
+      const quota = (0, _entitlementPass.resolveEntitlementQuota)(discount);
+      if (!quota) return;
+      entitlementBalances.set(String(discount.id), quota.type === 'unlimited' ? null : Math.max(quota.balance - (entitlementUsageCounts.get(discount.id) || 0), 0));
+    });
+    const getEntitlementBalance = detail => {
+      if (!(0, _entitlementPass.isEntitlementPass)(detail)) return undefined;
+      const resourceId = detail?.discount?.resource_id ?? detail?.resource_id;
+      return entitlementBalances.get(String(resourceId));
+    };
+    const needsEntitlementBalance = detail => {
+      const balance = getEntitlementBalance(detail);
+      return balance !== undefined && detail?.metadata?.balance !== balance;
+    };
+    const withEntitlementBalance = detail => {
+      if (!needsEntitlementBalance(detail)) return detail;
+      return {
+        ...detail,
+        metadata: {
+          ...(detail.metadata || {}),
+          balance: getEntitlementBalance(detail)
+        }
+      };
+    };
+    const getProductDiscountDetails = originProduct => {
+      const product = this.hooks.getProduct(originProduct);
+      return [...(product.discount_list || []), ...(product.bundle || []).flatMap(bundle => bundle.discount_list || [])];
+    };
+    const productsWithEntitlementBalances = entitlementBalances.size ? processedProductList.map(product => {
+      if (!getProductDiscountDetails(product).some(needsEntitlementBalance)) {
+        return product;
+      }
+      // 历史商品及套餐可能仍引用输入快照；仅复制有变化的行，并直接更新 metadata。
+      // 不再次调用价格换算钩子，避免只补余额时改变商品价格。
+      const nextProduct = (0, _lodashEs.cloneDeep)(product);
+      getProductDiscountDetails(nextProduct).forEach(detail => {
+        if (!needsEntitlementBalance(detail)) return;
+        detail.metadata = withEntitlementBalance(detail).metadata;
+      });
+      return nextProduct;
+    }) : processedProductList;
+    const discountsWithEntitlementBalances = [...editModeDiscount, ...updatedDiscountList].map(discount => {
+      if (!(0, _entitlementPass.isEntitlementPass)(discount) || !entitlementBalances.has(String(discount.id))) {
+        return discount;
+      }
+      return {
+        ...discount,
+        appliedProductDetails: (discount.appliedProductDetails || []).map(withEntitlementBalance),
+        ...(discount.committedAppliedProductDetails ? {
+          committedAppliedProductDetails: discount.committedAppliedProductDetails.map(withEntitlementBalance)
+        } : {})
+      };
+    });
     return {
-      productList: processedProductList,
-      discountList: [...editModeDiscount, ...updatedDiscountList]
+      productList: productsWithEntitlementBalances,
+      discountList: discountsWithEntitlementBalances
     };
   }
 

package/lib/server/modules/order/types.d.ts

@@ -36,6 +36,8 @@ export type OrderSurchargeType = string;
 export interface OrderProductDiscountMetadata {
     /** 设备端本地唯一标识，用于与服务端记录对齐 */
     unique_identification_number?: string;
+    /** 月卡扣除本单新增使用后的剩余次数；不限次数时为 null。 */
+    balance?: number | null;
     [key: string]: unknown;
 }
 /**