@pisell/pisellos 0.10.40 → 0.10.42

package/dist/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -13,6 +13,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import dayjs from 'dayjs';
 import { getProductSkuOptions } from "../../Order/utils";
 import { resolveManualDiscountMessage } from "../../Order/utils/manualProductDiscount";
+import { isEntitlementPass } from "../../Discount/entitlementPass";
 import { buildProductOptionStringFromOrderLine } from "./orderLineDisplay";
 function safeFormat(value, fmt) {
   if (value === undefined || value === null) return undefined;
@@ -125,20 +126,56 @@ function resolveProductCover(product, booking, sourceProduct) {
   var _ref6, _cover;
   return (_ref6 = (_cover = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.cover) !== null && _cover !== void 0 ? _cover : product.product_cover) !== null && _ref6 !== void 0 ? _ref6 : '';
 }
-function resolveMainProductPrice(product, fallback) {
-  var _metadata$main_produc;
-  var metadata = product.metadata || {};
-  var value = (_metadata$main_produc = metadata.main_product_original_price) !== null && _metadata$main_produc !== void 0 ? _metadata$main_produc : metadata.source_product_price;
+function toFinitePrice(value) {
+  if (value === undefined || value === null || value === '') return null;
   var parsed = Number(value);
-  return Number.isFinite(parsed) ? parsed : fallback;
+  return Number.isFinite(parsed) ? parsed : null;
+}
+function hasEntitlementPassDiscount(product) {
+  var hasEntitlementDiscount = function hasEntitlementDiscount(discountList) {
+    return Array.isArray(discountList) && discountList.some(isEntitlementPass);
+  };
+  return hasEntitlementDiscount(product.discount_list) || Array.isArray(product.product_bundle) && product.product_bundle.some(function (bundle) {
+    return hasEntitlementDiscount(bundle === null || bundle === void 0 ? void 0 : bundle.discount_list);
+  });
+}
+function resolveMainProductPrice(product, fallback, sourceProduct) {
+  var _variant, _metadata$origin, _ref7, _ref8, _price, _metadata$origin2, _metadata$origin3;
+  var restoreEntitlementPrice = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var metadata = product.metadata || {};
+  if (!restoreEntitlementPrice) {
+    var _metadata$main_produc;
+    var value = (_metadata$main_produc = metadata.main_product_original_price) !== null && _metadata$main_produc !== void 0 ? _metadata$main_produc : metadata.source_product_price;
+    var parsed = Number(value);
+    return Number.isFinite(parsed) ? parsed : fallback;
+  }
+  var sourcePrice = toFinitePrice(metadata.source_product_price);
+  if (sourcePrice !== null) return sourcePrice;
+  var variantId = Number(product.product_variant_id || 0);
+  var variantList = (_variant = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.variant) !== null && _variant !== void 0 ? _variant : (_metadata$origin = metadata.origin) === null || _metadata$origin === void 0 ? void 0 : _metadata$origin.variant;
+  if (variantId > 0 && Array.isArray(variantList)) {
+    var _matched$price;
+    var matched = variantList.find(function (variant) {
+      return Number(variant === null || variant === void 0 ? void 0 : variant.id) === variantId;
+    });
+    var variantPrice = toFinitePrice((_matched$price = matched === null || matched === void 0 ? void 0 : matched.price) !== null && _matched$price !== void 0 ? _matched$price : matched === null || matched === void 0 ? void 0 : matched.base_price);
+    if (variantPrice !== null) return variantPrice;
+  }
+  var catalogPrice = toFinitePrice((_ref7 = (_ref8 = (_price = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _price !== void 0 ? _price : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price) !== null && _ref8 !== void 0 ? _ref8 : (_metadata$origin2 = metadata.origin) === null || _metadata$origin2 === void 0 ? void 0 : _metadata$origin2.price) !== null && _ref7 !== void 0 ? _ref7 : (_metadata$origin3 = metadata.origin) === null || _metadata$origin3 === void 0 ? void 0 : _metadata$origin3.base_price);
+  if (catalogPrice !== null) return catalogPrice;
+
+  // legacy 数据没有 source_product_price 时，main_product_original_price
+  // 仍比已被月卡改写为 0 的 selling_price 更可靠。
+  var legacyMainPrice = toFinitePrice(metadata.main_product_original_price);
+  return legacyMainPrice !== null && legacyMainPrice !== void 0 ? legacyMainPrice : fallback;
 }
 function mapOrderBundleToOtherBundle(bundle) {
   return bundle.map(function (item) {
-    var _ref7, _ref8, _item$original_price;
+    var _ref9, _ref10, _item$original_price;
     return _objectSpread(_objectSpread({}, item), {}, {
       // 后端历史订单可能没有 original_price；此时 price 是折前毛价，
       // bundle_selling_price 已包含折扣，不能把它当成编辑时的新原价。
-      original_price: (_ref7 = (_ref8 = (_item$original_price = item.original_price) !== null && _item$original_price !== void 0 ? _item$original_price : item.product_price) !== null && _ref8 !== void 0 ? _ref8 : item.price) !== null && _ref7 !== void 0 ? _ref7 : item.bundle_selling_price
+      original_price: (_ref9 = (_ref10 = (_item$original_price = item.original_price) !== null && _item$original_price !== void 0 ? _item$original_price : item.product_price) !== null && _ref10 !== void 0 ? _ref10 : item.price) !== null && _ref9 !== void 0 ? _ref9 : item.bundle_selling_price
     });
   });
 }
@@ -169,10 +206,10 @@ function synthesizeProductResourceFromBooking(booking) {
   });
   if (relationIdsByForm.size === 0) return undefined;
   return {
-    resources: Array.from(relationIdsByForm.entries()).map(function (_ref9) {
-      var _ref10 = _slicedToArray(_ref9, 2),
-        formId = _ref10[0],
-        relationIds = _ref10[1];
+    resources: Array.from(relationIdsByForm.entries()).map(function (_ref11) {
+      var _ref12 = _slicedToArray(_ref11, 2),
+        formId = _ref12[0],
+        relationIds = _ref12[1];
       return {
         id: formId,
         status: 1,
@@ -192,15 +229,16 @@ function synthesizeProductResourceFromBooking(booking) {
  * 调用方须传入与该行关联的 booking（通常 bookings[].product_uid === product.metadata.unique_identification_number）。
  */
 export function buildCacheItemFromOrderLine(input) {
-  var _ref11, _sourceProduct$holder, _sourceProduct$origin, _product$metadata, _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$bundle_edit, _product$product_vari, _product$num, _ref12, _product$note, _booking$detail2, _product$metadata2, _product$metadata3, _ref13, _extension_type, _booking$product2, _booking$product3, _price, _product$product_sku, _product$order_detail, _ref14, _booking$id;
+  var _ref13, _sourceProduct$holder, _sourceProduct$origin, _product$metadata, _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$bundle_edit, _product$product_vari, _product$num, _ref14, _product$note, _booking$detail2, _product$metadata2, _product$metadata3, _ref15, _extension_type, _booking$product2, _booking$product3, _price2, _product$product_sku, _product$order_detail, _ref16, _booking$id;
   var product = input.product,
     booking = input.booking,
     sourceProduct = input.sourceProduct;
-  var holderConfig = (_ref11 = (_sourceProduct$holder = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.holder_config) !== null && _sourceProduct$holder !== void 0 ? _sourceProduct$holder : sourceProduct === null || sourceProduct === void 0 || (_sourceProduct$origin = sourceProduct.origin) === null || _sourceProduct$origin === void 0 ? void 0 : _sourceProduct$origin.holder_config) !== null && _ref11 !== void 0 ? _ref11 : (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.holder_config;
+  var holderConfig = (_ref13 = (_sourceProduct$holder = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.holder_config) !== null && _sourceProduct$holder !== void 0 ? _sourceProduct$holder : sourceProduct === null || sourceProduct === void 0 || (_sourceProduct$origin = sourceProduct.origin) === null || _sourceProduct$origin === void 0 ? void 0 : _sourceProduct$origin.holder_config) !== null && _ref13 !== void 0 ? _ref13 : (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.holder_config;
   var resolvedId = (_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id;
   var selling = Number((_product$selling_pric = product.selling_price) !== null && _product$selling_pric !== void 0 ? _product$selling_pric : 0);
   var original = Number((_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : selling);
-  var mainProductPrice = resolveMainProductPrice(product, selling);
+  var shouldRestoreEntitlementPrice = hasEntitlementPassDiscount(product);
+  var mainProductPrice = resolveMainProductPrice(product, selling, sourceProduct, shouldRestoreEntitlementPrice);
   var startDate = safeFormat(booking.start_date, 'YYYY-MM-DD');
   var endDate = safeFormat(booking.end_date, 'YYYY-MM-DD');
   var startTime = normalizeTimeString(booking.start_time);
@@ -230,7 +268,7 @@ export function buildCacheItemFromOrderLine(input) {
     quantity: (_product$num = product.num) !== null && _product$num !== void 0 ? _product$num : 1,
     product_name: productTitle,
     product_cover: productCover,
-    note: (_ref12 = (_product$note = product.note) !== null && _product$note !== void 0 ? _product$note : booking === null || booking === void 0 || (_booking$detail2 = booking.detail) === null || _booking$detail2 === void 0 ? void 0 : _booking$detail2.note) !== null && _ref12 !== void 0 ? _ref12 : '',
+    note: (_ref14 = (_product$note = product.note) !== null && _product$note !== void 0 ? _product$note : booking === null || booking === void 0 || (_booking$detail2 = booking.detail) === null || _booking$detail2 === void 0 ? void 0 : _booking$detail2.note) !== null && _ref14 !== void 0 ? _ref14 : '',
     price: mainProductPrice,
     total: selling,
     origin_total: original,
@@ -256,7 +294,8 @@ export function buildCacheItemFromOrderLine(input) {
     }
   }
   if (((_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.price_override) != null || manualDiscount) {
-    extend.priceOverride = selling;
+    var _product$metadata$pri, _product$metadata4;
+    extend.priceOverride = shouldRestoreEntitlementPrice ? (_product$metadata$pri = (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.price_override) !== null && _product$metadata$pri !== void 0 ? _product$metadata$pri : selling : selling;
   }
   if (booking.holder !== undefined) {
     extend.holder = booking.holder;
@@ -269,9 +308,9 @@ export function buildCacheItemFromOrderLine(input) {
   } : {}), {}, {
     id: resolvedId,
     product_id: resolvedId,
-    extension_type: (_ref13 = (_extension_type = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type) !== null && _extension_type !== void 0 ? _extension_type : booking === null || booking === void 0 || (_booking$product2 = booking.product) === null || _booking$product2 === void 0 ? void 0 : _booking$product2.extension_type) !== null && _ref13 !== void 0 ? _ref13 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type,
+    extension_type: (_ref15 = (_extension_type = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type) !== null && _extension_type !== void 0 ? _extension_type : booking === null || booking === void 0 || (_booking$product2 = booking.product) === null || _booking$product2 === void 0 ? void 0 : _booking$product2.extension_type) !== null && _ref15 !== void 0 ? _ref15 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type,
     title: productTitle || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || (booking === null || booking === void 0 || (_booking$product3 = booking.product) === null || _booking$product3 === void 0 ? void 0 : _booking$product3.title),
-    price: (_price = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _price !== void 0 ? _price : selling,
+    price: (_price2 = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _price2 !== void 0 ? _price2 : selling,
     selling_price: product.selling_price,
     original_price: product.original_price
   }, Number(((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.open_sold_weight) || 0) === 1 ? {
@@ -283,7 +322,7 @@ export function buildCacheItemFromOrderLine(input) {
     new: 0,
     autoClose: false,
     order_detail_id: (_product$order_detail = product.order_detail_id) !== null && _product$order_detail !== void 0 ? _product$order_detail : null,
-    booking_id: (_ref14 = (_booking$id = booking.id) !== null && _booking$id !== void 0 ? _booking$id : booking.booking_id) !== null && _ref14 !== void 0 ? _ref14 : 0
+    booking_id: (_ref16 = (_booking$id = booking.id) !== null && _booking$id !== void 0 ? _booking$id : booking.booking_id) !== null && _ref16 !== void 0 ? _ref16 : 0
   });
   if ((sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.capacity) !== undefined) {
     base.capacity = sourceProduct.capacity;

package/dist/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -8,6 +8,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { getProductSkuOptions } from "../../Order/utils";
+import { isEntitlementPass } from "../../Discount/entitlementPass";
 import { buildProductOptionStringFromOrderLine } from "./orderLineDisplay";
 /**
  * 从已加车的普通商品 order line 反查 SkuDetailModal edit 所需的 cacheItem。
@@ -52,13 +53,22 @@ function resolveSourceProductPrice(product, sourceProduct) {
   }
   return Number((_product$selling_pric = product.selling_price) !== null && _product$selling_pric !== void 0 ? _product$selling_pric : 0);
 }
+function hasEntitlementPassDiscount(product) {
+  var hasEntitlementDiscount = function hasEntitlementDiscount(discountList) {
+    return Array.isArray(discountList) && discountList.some(isEntitlementPass);
+  };
+  return hasEntitlementDiscount(product.discount_list) || Array.isArray(product.product_bundle) && product.product_bundle.some(function (bundle) {
+    return hasEntitlementDiscount(bundle === null || bundle === void 0 ? void 0 : bundle.discount_list);
+  });
+}
 
 /** 订单行 bundle → booking other.bundle（保留 original_price 供 setProductPrice 按比例分摊） */
 function mapOrderBundleToOtherBundle(bundle) {
+  var preferManualPrice = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   return bundle.map(function (item) {
-    var _ref, _ref2, _item$original_price, _ref3, _item$bundle_selling_, _item$original_total, _ref4, _item$num, _ref5, _item$quantity;
+    var _ref, _ref2, _item$original_price, _ref3, _item$price, _ref4, _item$bundle_selling_, _item$original_total, _ref5, _item$num, _ref6, _item$quantity;
     var catalogOriginal = (_ref = (_ref2 = (_item$original_price = item.original_price) !== null && _item$original_price !== void 0 ? _item$original_price : item.product_price) !== null && _ref2 !== void 0 ? _ref2 : item.price) !== null && _ref !== void 0 ? _ref : item.bundle_selling_price;
-    var selling = (_ref3 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref3 !== void 0 ? _ref3 : catalogOriginal;
+    var selling = preferManualPrice ? (_ref3 = (_item$price = item.price) !== null && _item$price !== void 0 ? _item$price : item.bundle_selling_price) !== null && _ref3 !== void 0 ? _ref3 : catalogOriginal : (_ref4 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref4 !== void 0 ? _ref4 : catalogOriginal;
     var _omitBundleSelling = item.bundle_selling_price,
       rest = _objectWithoutProperties(item, _excluded);
     var isMarkupOrMarkdown = (item.price_type === 'markdown' || item.price_type === 'markup') && (item.price_type_ext === '' || item.price_type_ext === undefined || item.price_type_ext === null);
@@ -69,13 +79,13 @@ function mapOrderBundleToOtherBundle(bundle) {
     }, isMarkupOrMarkdown ? {} : {
       original_total: (_item$original_total = item.original_total) !== null && _item$original_total !== void 0 ? _item$original_total : catalogOriginal
     }), {}, {
-      num: (_ref4 = (_item$num = item.num) !== null && _item$num !== void 0 ? _item$num : item.quantity) !== null && _ref4 !== void 0 ? _ref4 : 1,
-      quantity: (_ref5 = (_item$quantity = item.quantity) !== null && _item$quantity !== void 0 ? _item$quantity : item.num) !== null && _ref5 !== void 0 ? _ref5 : 1
+      num: (_ref5 = (_item$num = item.num) !== null && _item$num !== void 0 ? _item$num : item.quantity) !== null && _ref5 !== void 0 ? _ref5 : 1,
+      quantity: (_ref6 = (_item$quantity = item.quantity) !== null && _item$quantity !== void 0 ? _item$quantity : item.num) !== null && _ref6 !== void 0 ? _ref6 : 1
     });
   });
 }
 export function buildNormalProductCacheItemFromOrderLine(input) {
-  var _product$product_id, _product$selling_pric2, _product$original_pri, _product$metadata, _product$metadata2, _product$product_vari, _originExtend$other, _product$num, _product$product_vari2, _product$num2, _title, _product$note, _originExtend$price, _originExtend$total, _originExtend$origin_, _product$metadata3, _ref6, _title2, _ref7, _cover, _price3, _product$order_detail, _product$product_sku;
+  var _product$product_id, _product$selling_pric2, _product$original_pri, _product$metadata, _product$metadata2, _product$metadata3, _product$product_vari, _originExtend$other, _product$num, _product$product_vari2, _product$num2, _title, _product$note, _originExtend$price, _originExtend$total, _originExtend$origin_, _product$metadata4, _originExtend$priceOv, _product$metadata5, _ref7, _title2, _ref8, _cover, _price3, _product$order_detail, _product$product_sku;
   var product = input.product,
     sourceProduct = input.sourceProduct;
   var resolvedId = (_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id;
@@ -83,9 +93,11 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
   var selling = Number((_product$selling_pric2 = product.selling_price) !== null && _product$selling_pric2 !== void 0 ? _product$selling_pric2 : 0);
   var original = Number((_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : selling);
   var uid = (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.unique_identification_number;
-  var option = getProductSkuOptions(product);
-  var bundle = mapOrderBundleToOtherBundle(Array.isArray(product.product_bundle) ? product.product_bundle : []);
   var originExtend = (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 || (_product$metadata2 = _product$metadata2.origin) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2._extend;
+  var shouldPreserveEntitlementPriceOverride = hasEntitlementPassDiscount(product) && ((originExtend === null || originExtend === void 0 ? void 0 : originExtend.priceOverride) !== undefined || ((_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.price_override) != null);
+  var hasPriceOverride = (originExtend === null || originExtend === void 0 ? void 0 : originExtend.priceOverride) !== undefined || shouldPreserveEntitlementPriceOverride;
+  var option = getProductSkuOptions(product);
+  var bundle = mapOrderBundleToOtherBundle(Array.isArray(product.product_bundle) ? product.product_bundle : [], shouldPreserveEntitlementPriceOverride);
   var productOptionString = buildProductOptionStringFromOrderLine(product);
   var discountList = product.discount_list || [];
   var other = {
@@ -114,12 +126,12 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
     _skuValue: JSON.parse(JSON.stringify(skuValue)),
     isNormalProduct: true,
     metadata: {
-      product_add_schedule_time: (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.product_add_schedule_time
+      product_add_schedule_time: (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.product_add_schedule_time
     }
   }, productOptionString ? {
     product_option_string: productOptionString
-  } : {}), (originExtend === null || originExtend === void 0 ? void 0 : originExtend.priceOverride) !== undefined ? {
-    priceOverride: originExtend.priceOverride
+  } : {}), hasPriceOverride ? {
+    priceOverride: shouldPreserveEntitlementPriceOverride ? (_originExtend$priceOv = originExtend === null || originExtend === void 0 ? void 0 : originExtend.priceOverride) !== null && _originExtend$priceOv !== void 0 ? _originExtend$priceOv : (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.price_override : originExtend === null || originExtend === void 0 ? void 0 : originExtend.priceOverride
   } : {}), (originExtend === null || originExtend === void 0 ? void 0 : originExtend.bundle_edit) !== undefined ? {
     bundle_edit: originExtend.bundle_edit
   } : {});
@@ -131,8 +143,8 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
     id: resolvedId,
     product_id: resolvedId,
     _id: uid,
-    title: (_ref6 = (_title2 = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) !== null && _title2 !== void 0 ? _title2 : product.product_title) !== null && _ref6 !== void 0 ? _ref6 : '',
-    cover: (_ref7 = (_cover = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.cover) !== null && _cover !== void 0 ? _cover : product.product_cover) !== null && _ref7 !== void 0 ? _ref7 : '',
+    title: (_ref7 = (_title2 = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) !== null && _title2 !== void 0 ? _title2 : product.product_title) !== null && _ref7 !== void 0 ? _ref7 : '',
+    cover: (_ref8 = (_cover = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.cover) !== null && _cover !== void 0 ? _cover : product.product_cover) !== null && _ref8 !== void 0 ? _ref8 : '',
     price: (_price3 = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _price3 !== void 0 ? _price3 : sourcePrice,
     selling_price: product.selling_price,
     original_price: product.original_price

package/dist/modules/Customer/index.js

@@ -197,7 +197,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 url = '/franchisee/customer/select-list';
               }
               _params$skip = params.skip, skip = _params$skip === void 0 ? 1 : _params$skip, _params$num = params.num, num = _params$num === void 0 ? DEFAULT_PAGE_SIZE : _params$num, search = params.search, _otherParams = _objectWithoutProperties(params, _excluded);
-              queryParams = _objectSpread(_objectSpread({
+              queryParams = _objectSpread(_objectSpread(_objectSpread({
                 skip: skip,
                 num: num,
                 sort_by: SORT_BY,
@@ -206,7 +206,9 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 search_wallet_pass_flag: 1
               }, search && {
                 search: search
-              }), _otherParams);
+              }), _otherParams), url === '/customer/select-list' ? {
+                with_franchisor_data: 1
+              } : {});
               _context2.next = 7;
               return this.request.get(url, queryParams, {
                 cache: {

package/dist/modules/Customer/types.d.ts

@@ -50,6 +50,8 @@ export interface ShopGetCustomerListParams {
     search_wallet_flag?: 0 | 1;
     /** wallet pass搜索标识 */
     search_wallet_pass_flag?: 0 | 1;
+    /** 是否查询连锁加盟组合店铺数据 */
+    with_franchisor_data?: boolean | 0 | 1;
     /** 其他筛选参数 */
     [key: string]: any;
 }

package/dist/modules/Discount/entitlementPass.d.ts

@@ -0,0 +1,34 @@
+export declare const ENTITLEMENT_PASS_TYPE = "entitlement_pass";
+export declare const GOOD_PASS_TYPE = "good_pass";
+type DiscountLike = {
+    id?: number | string | null;
+    tag?: unknown;
+    type?: unknown;
+    discount?: object | null;
+    metadata?: object | null;
+    extension_data?: unknown;
+    balance?: unknown;
+    expire_time?: unknown;
+};
+export type EntitlementQuota = {
+    type: 'limited';
+    value: number;
+    balance: number;
+} | {
+    type: 'unlimited';
+    value: null;
+    balance: null;
+};
+export declare function isEntitlementPass(discount: DiscountLike | null | undefined): boolean;
+export declare function isFullCoveragePass(discount: DiscountLike | null | undefined): boolean;
+/**
+ * Resolve the authoritative total-use contract for an Entitlement Pass.
+ * Invalid or missing configuration fails closed. Legacy mode/total_uses fields
+ * are intentionally unsupported.
+ */
+export declare function resolveEntitlementQuota(discount: DiscountLike | null | undefined): EntitlementQuota | null;
+export declare function getRemainingEntitlementUses(discount: DiscountLike | null | undefined, usedCount: number, requestedCount: number): number;
+export declare function hasAvailableEntitlementUses(discount: DiscountLike | null | undefined): boolean;
+/** Sort Entitlement Passes by expiry, finite balance, then card instance id. */
+export declare function compareEntitlementPassPriority(left: DiscountLike, right: DiscountLike): number;
+export {};

package/dist/modules/Discount/entitlementPass.js

@@ -0,0 +1,147 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+import dayjs from 'dayjs';
+export var ENTITLEMENT_PASS_TYPE = 'entitlement_pass';
+export var GOOD_PASS_TYPE = 'good_pass';
+function getDiscountType(discount) {
+  var nestedDiscount = discount === null || discount === void 0 ? void 0 : discount.discount;
+  return String((discount === null || discount === void 0 ? void 0 : discount.tag) || (discount === null || discount === void 0 ? void 0 : discount.type) || (nestedDiscount === null || nestedDiscount === void 0 ? void 0 : nestedDiscount.tag) || (nestedDiscount === null || nestedDiscount === void 0 ? void 0 : nestedDiscount.type) || '');
+}
+export function isEntitlementPass(discount) {
+  return getDiscountType(discount) === ENTITLEMENT_PASS_TYPE;
+}
+export function isFullCoveragePass(discount) {
+  var type = getDiscountType(discount);
+  return type === GOOD_PASS_TYPE || type === ENTITLEMENT_PASS_TYPE;
+}
+function resolveIncludedUses(discount) {
+  var _discount$extension_d;
+  var metadata = discount.metadata;
+  var hasMetadataIncludedUses = !!metadata && _typeof(metadata) === 'object' && Object.prototype.hasOwnProperty.call(metadata, 'included_uses');
+  var rawValue = hasMetadataIncludedUses ? metadata === null || metadata === void 0 ? void 0 : metadata.included_uses : Array.isArray(discount.extension_data) ? (_discount$extension_d = discount.extension_data.find(function (item) {
+    return (item === null || item === void 0 ? void 0 : item.field_key) === 'included_uses';
+  })) === null || _discount$extension_d === void 0 ? void 0 : _discount$extension_d.value : undefined;
+  if (!rawValue || _typeof(rawValue) !== 'object' || Array.isArray(rawValue)) {
+    return null;
+  }
+  var includedUses = rawValue;
+  if (includedUses.type === 'unlimited' && includedUses.value === null) {
+    return {
+      type: 'unlimited',
+      value: null
+    };
+  }
+  if (includedUses.type === 'limited' && typeof includedUses.value === 'number' && Number.isInteger(includedUses.value) && includedUses.value >= 1 && includedUses.value <= 9999) {
+    return {
+      type: 'limited',
+      value: includedUses.value
+    };
+  }
+  return null;
+}
+function resolveNonNegativeInteger(value) {
+  if (typeof value !== 'number' && typeof value !== 'string' || typeof value === 'string' && value.trim() === '') {
+    return null;
+  }
+  var normalizedValue = Number(value);
+  if (!Number.isInteger(normalizedValue) || normalizedValue < 0) return null;
+  return normalizedValue;
+}
+
+/**
+ * Resolve the authoritative total-use contract for an Entitlement Pass.
+ * Invalid or missing configuration fails closed. Legacy mode/total_uses fields
+ * are intentionally unsupported.
+ */
+export function resolveEntitlementQuota(discount) {
+  if (!isEntitlementPass(discount)) return null;
+  var includedUses = resolveIncludedUses(discount);
+  if (!includedUses) return null;
+  if (includedUses.type === 'unlimited') {
+    return {
+      type: 'unlimited',
+      value: null,
+      balance: null
+    };
+  }
+  var balance = resolveNonNegativeInteger(discount === null || discount === void 0 ? void 0 : discount.balance);
+  if (balance === null) return null;
+  return {
+    type: 'limited',
+    value: includedUses.value,
+    balance: balance
+  };
+}
+export function getRemainingEntitlementUses(discount, usedCount, requestedCount) {
+  var quota = resolveEntitlementQuota(discount);
+  var normalizedRequestedCount = Math.max(Math.floor(Number(requestedCount) || 0), 0);
+  if (!quota || normalizedRequestedCount <= 0) return 0;
+  if (quota.type === 'unlimited') return normalizedRequestedCount;
+  var normalizedUsedCount = Math.max(Math.floor(Number(usedCount) || 0), 0);
+  return Math.min(Math.max(quota.balance - normalizedUsedCount, 0), normalizedRequestedCount);
+}
+export function hasAvailableEntitlementUses(discount) {
+  var quota = resolveEntitlementQuota(discount);
+  return !!quota && (quota.type === 'unlimited' || quota.balance > 0);
+}
+function resolveExpireTimestamp(value) {
+  if (typeof value !== 'string' || !value.trim()) return Number.POSITIVE_INFINITY;
+  var normalizedValue = value.trim();
+  var calendarParts = normalizedValue.match(/^(\d{4})-(\d{2})-(\d{2})(?:[T ](\d{2}):(\d{2})(?::(\d{2}))?)?/);
+  if (calendarParts) {
+    var _calendarParts = _slicedToArray(calendarParts, 7),
+      year = _calendarParts[1],
+      month = _calendarParts[2],
+      day = _calendarParts[3],
+      _calendarParts$ = _calendarParts[4],
+      hour = _calendarParts$ === void 0 ? '0' : _calendarParts$,
+      _calendarParts$2 = _calendarParts[5],
+      minute = _calendarParts$2 === void 0 ? '0' : _calendarParts$2,
+      _calendarParts$3 = _calendarParts[6],
+      second = _calendarParts$3 === void 0 ? '0' : _calendarParts$3;
+    var yearNumber = Number(year);
+    var monthNumber = Number(month);
+    var dayNumber = Number(day);
+    var hourNumber = Number(hour);
+    var minuteNumber = Number(minute);
+    var secondNumber = Number(second);
+    var daysInMonth = new Date(Date.UTC(yearNumber, monthNumber, 0)).getUTCDate();
+    if (yearNumber <= 0 || monthNumber < 1 || monthNumber > 12 || dayNumber < 1 || dayNumber > daysInMonth || hourNumber < 0 || hourNumber > 23 || minuteNumber < 0 || minuteNumber > 59 || secondNumber < 0 || secondNumber > 59) {
+      return Number.POSITIVE_INFINITY;
+    }
+  }
+  var date = dayjs(normalizedValue);
+  return date.isValid() ? date.valueOf() : Number.POSITIVE_INFINITY;
+}
+function compareIds(left, right) {
+  var leftNumber = Number(left);
+  var rightNumber = Number(right);
+  if (Number.isFinite(leftNumber) && Number.isFinite(rightNumber)) {
+    return leftNumber - rightNumber;
+  }
+  return String(left !== null && left !== void 0 ? left : '').localeCompare(String(right !== null && right !== void 0 ? right : ''), undefined, {
+    numeric: true
+  });
+}
+
+/** Sort Entitlement Passes by expiry, finite balance, then card instance id. */
+export function compareEntitlementPassPriority(left, right) {
+  var expireDifference = resolveExpireTimestamp(left.expire_time) - resolveExpireTimestamp(right.expire_time);
+  if (!Number.isNaN(expireDifference) && expireDifference !== 0) {
+    return expireDifference;
+  }
+  var leftQuota = resolveEntitlementQuota(left);
+  var rightQuota = resolveEntitlementQuota(right);
+  var leftBalance = (leftQuota === null || leftQuota === void 0 ? void 0 : leftQuota.type) === 'limited' ? leftQuota.balance : Number.POSITIVE_INFINITY;
+  var rightBalance = (rightQuota === null || rightQuota === void 0 ? void 0 : rightQuota.type) === 'limited' ? rightQuota.balance : Number.POSITIVE_INFINITY;
+  var balanceDifference = leftBalance - rightBalance;
+  if (!Number.isNaN(balanceDifference) && balanceDifference !== 0) {
+    return balanceDifference;
+  }
+  return compareIds(left.id, right.id);
+}

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

@@ -26,6 +26,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_available_wallet_flag?: 0 | 1;
         with_available_wallet_pass_flag?: 0 | 1;
         with_virtual_currency?: 0 | 1;
+        with_entitlement_pass?: 0 | 1;
         request_timezone: string;
         order_id?: number | string;
     }): Promise<DiscountPrepareConfigResult>;
@@ -36,6 +37,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     }): Promise<DiscountWithReason>;
     batchSearchByProductIds(productIds: number[]): Promise<any>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
+    private hasAvailableBalance;
     private checkUsageCreditsLimit;
     filterEnabledDiscountListWithReason(discountList: Discount[]): DiscountWithReason;
     private checkUsageCreditsLimitWithFailKey;

package/dist/modules/Discount/index.js

@@ -29,6 +29,7 @@ import { uniqueById } from "../../solution/ShopDiscount/utils";
 import { BaseModule } from "../BaseModule";
 import { DiscountHooks } from "./types";
 import Decimal from 'decimal.js';
+import { hasAvailableEntitlementUses, isEntitlementPass } from "./entitlementPass";
 export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(DiscountModule, _BaseModule);
   var _super = _createSuper(DiscountModule);
@@ -165,8 +166,8 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-        var _params$with_availabl, _params$with_availabl2, _params$with_virtual_, _prepareConfig$data, _prepareConfig$data2, _prepareConfig$data3, _prepareConfig$data4, _prepareConfig$data5, _prepareConfig$data6;
-        var prepareConfig, rawDiscountList, availableWalletList, availableWalletPassList, availableWalletIds, virtualCurrencyList, goodPassList;
+        var _params$with_availabl, _params$with_availabl2, _params$with_virtual_, _prepareConfig$data, _prepareConfig$data2, _prepareConfig$data3, _prepareConfig$data4, _prepareConfig$data5, _prepareConfig$data6, _prepareConfig$data7;
+        var prepareConfig, rawEntitlementPassList, entitlementPassList, entitlementPassIds, excludeEntitlementDuplicates, rawDiscountList, availableWalletList, availableWalletPassList, availableWalletIds, virtualCurrencyList, goodPassList;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -181,15 +182,28 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               }));
             case 3:
               prepareConfig = _context4.sent;
-              rawDiscountList = [].concat(_toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.good_pass_list) || []), _toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data2 = prepareConfig.data) === null || _prepareConfig$data2 === void 0 ? void 0 : _prepareConfig$data2.discount_card_list) || []));
-              availableWalletList = [].concat(_toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data3 = prepareConfig.data) === null || _prepareConfig$data3 === void 0 ? void 0 : _prepareConfig$data3.avaiable_wallet_list) || []), _toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data4 = prepareConfig.data) === null || _prepareConfig$data4 === void 0 ? void 0 : _prepareConfig$data4.available_wallet_list) || []));
-              availableWalletPassList = (prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data5 = prepareConfig.data) === null || _prepareConfig$data5 === void 0 ? void 0 : _prepareConfig$data5.available_wallet_pass_list) || [];
+              rawEntitlementPassList = prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.entitlement_pass_list;
+              entitlementPassList = Array.isArray(rawEntitlementPassList) ? rawEntitlementPassList : [];
+              entitlementPassIds = new Set(entitlementPassList.map(function (discount) {
+                return discount === null || discount === void 0 ? void 0 : discount.id;
+              }).filter(function (id) {
+                return id !== undefined && id !== null;
+              }).map(function (id) {
+                return String(id);
+              }));
+              excludeEntitlementDuplicates = function excludeEntitlementDuplicates(discount) {
+                var id = discount === null || discount === void 0 ? void 0 : discount.id;
+                return id === undefined || id === null || !entitlementPassIds.has(String(id));
+              };
+              rawDiscountList = [].concat(_toConsumableArray(entitlementPassList), _toConsumableArray(((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data2 = prepareConfig.data) === null || _prepareConfig$data2 === void 0 ? void 0 : _prepareConfig$data2.good_pass_list) || []).filter(excludeEntitlementDuplicates)), _toConsumableArray(((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data3 = prepareConfig.data) === null || _prepareConfig$data3 === void 0 ? void 0 : _prepareConfig$data3.discount_card_list) || []).filter(excludeEntitlementDuplicates)));
+              availableWalletList = [].concat(_toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data4 = prepareConfig.data) === null || _prepareConfig$data4 === void 0 ? void 0 : _prepareConfig$data4.avaiable_wallet_list) || []), _toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data5 = prepareConfig.data) === null || _prepareConfig$data5 === void 0 ? void 0 : _prepareConfig$data5.available_wallet_list) || []));
+              availableWalletPassList = (prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data6 = prepareConfig.data) === null || _prepareConfig$data6 === void 0 ? void 0 : _prepareConfig$data6.available_wallet_pass_list) || [];
               availableWalletIds = this.normalizePositiveNumberIds([].concat(_toConsumableArray(availableWalletList.map(function (item) {
                 return item === null || item === void 0 ? void 0 : item.wallet_id;
               })), _toConsumableArray(availableWalletPassList.map(function (item) {
                 return item === null || item === void 0 ? void 0 : item.product_id;
               }))));
-              virtualCurrencyList = this.normalizeVirtualCurrencyList(prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data6 = prepareConfig.data) === null || _prepareConfig$data6 === void 0 ? void 0 : _prepareConfig$data6.virtual_currency_list);
+              virtualCurrencyList = this.normalizeVirtualCurrencyList(prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data7 = prepareConfig.data) === null || _prepareConfig$data7 === void 0 ? void 0 : _prepareConfig$data7.virtual_currency_list);
               goodPassList = this.filterEnabledDiscountList(rawDiscountList) || []; // this.setDiscountList(goodPassList);
               return _context4.abrupt("return", {
                 discountList: goodPassList,
@@ -199,7 +213,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
                   return _objectSpread({}, item || {});
                 })
               });
-            case 11:
+            case 15:
             case "end":
               return _context4.stop();
           }
@@ -253,7 +267,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               return this.request.get("/machinecode/batch-search", _objectSpread(_objectSpread({
                 code: code,
                 translate_flag: 1,
-                tags: ['good_pass', 'product_discount_card'],
+                tags: ['entitlement_pass', 'good_pass', 'product_discount_card'],
                 // available: 1,
                 relation_product: 1,
                 with: ['extensionData', 'customScheduleSnapshot', 'holder.detail'],
@@ -292,8 +306,11 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               return this.request.get("/machinecode/batch-search", {
                 ids: productIds,
                 translate_flag: 1,
-                tags: ['good_pass', 'product_discount_card'],
-                relation_product: 1
+                tags: ['entitlement_pass', 'good_pass', 'product_discount_card'],
+                relation_product: 1,
+                with: ['extensionData', 'customScheduleSnapshot', 'holder.detail'],
+                unified_status_info_flag: 1,
+                request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
               });
             case 2:
               result = _context6.sent;
@@ -314,9 +331,19 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
     value: function filterEnabledDiscountList(discountList) {
       var _this2 = this;
       return discountList.filter(function (discount) {
-        return discount.limit_status === 'enable' && new Decimal((discount === null || discount === void 0 ? void 0 : discount.par_value) || 0).minus(new Decimal((discount === null || discount === void 0 ? void 0 : discount.used_par_value) || 0)).greaterThan(0) && _this2.checkUsageCreditsLimit(discount);
+        return discount.limit_status === 'enable' && _this2.hasAvailableBalance(discount) && _this2.checkUsageCreditsLimit(discount);
       });
     }
+  }, {
+    key: "hasAvailableBalance",
+    value: function hasAvailableBalance(discount) {
+      if (isEntitlementPass(discount)) {
+        return hasAvailableEntitlementUses(discount);
+      }
+
+      // good_pass 与折扣卡继续沿用原有金额余额判断。
+      return new Decimal((discount === null || discount === void 0 ? void 0 : discount.par_value) || 0).minus(new Decimal((discount === null || discount === void 0 ? void 0 : discount.used_par_value) || 0)).greaterThan(0);
+    }
 
     // 检查使用次数限制
   }, {
@@ -385,8 +412,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
       var lists = discountList.filter(function (discount) {
         return discount.limit_status === 'enable';
       }).filter(function (discount) {
-        var remaining = new Decimal((discount === null || discount === void 0 ? void 0 : discount.par_value) || 0).minus(new Decimal((discount === null || discount === void 0 ? void 0 : discount.used_par_value) || 0)).greaterThan(0);
-        return remaining;
+        return _this3.hasAvailableBalance(discount);
       }).map(function (discount) {
         var limitFailKey = _this3.checkUsageCreditsLimitWithFailKey(discount);
         return _objectSpread(_objectSpread({}, discount), {}, {