@pisell/pisellos 2.1.170 → 2.1.171

package/dist/solution/VenueBooking/utils/smartPricing.d.ts

@@ -16,7 +16,6 @@ export interface VenueBookingSmartPricingContext {
     orderType?: string;
     strategy_context?: Record<string, any>;
     strategyConfigs?: StrategyConfig[];
-    debugLog?: (title: string, payload?: Record<string, any>) => void;
 }
 /** 从商品上读取展示/算价用的 price 字段 */
 export declare function extractProductPrice(product: DataVariantProduct): string | null;

package/dist/solution/VenueBooking/utils/smartPricing.js

@@ -1,7 +1,3 @@
-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 _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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 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; }
@@ -33,8 +29,7 @@ export function buildDataVariantBusinessData(products, context, scheduleDateTime
     channel: (_context$channel = context.channel) !== null && _context$channel !== void 0 ? _context$channel : strategyContext.channel,
     orderType: (_ref2 = (_context$orderType = context.orderType) !== null && _context$orderType !== void 0 ? _context$orderType : strategyContext.orderType) !== null && _ref2 !== void 0 ? _ref2 : strategyContext.order_type,
     businessCode: (_ref3 = (_context$businessCode = context.businessCode) !== null && _context$businessCode !== void 0 ? _context$businessCode : strategyContext.business_code) !== null && _ref3 !== void 0 ? _ref3 : strategyContext.businessCode,
-    custom: strategyContext,
-    debugLog: context === null || context === void 0 ? void 0 : context.debugLog
+    custom: strategyContext
   };
 }
 
@@ -43,7 +38,6 @@ export function buildDataVariantBusinessData(products, context, scheduleDateTime
  * evaluator 未注入时原样返回并打 warning。
  */
 export function formatProductsWithDataVariant(products, context, scheduleDateTime) {
-  var _context$debugLog, _context$debugLog2, _result$globalEffecti, _result$globalEffecti2;
   var evaluator = context.evaluator;
   if (!evaluator || typeof evaluator.resolveProducts !== 'function') {
     console.warn('[VenueBooking][smartPricing] dataVariantEvaluator 未注入，跳过智能定价格式化');
@@ -51,35 +45,7 @@ export function formatProductsWithDataVariant(products, context, scheduleDateTim
   }
   var resolvedAt = scheduleDateTime || dayjs().format('YYYY-MM-DD HH:mm:ss');
   var businessData = buildDataVariantBusinessData(products, context, resolvedAt);
-  (_context$debugLog = context.debugLog) === null || _context$debugLog === void 0 || _context$debugLog.call(context, '[VenueBooking][smartPricing] formatProducts input', {
-    scheduleDateTime: resolvedAt,
-    customerId: businessData.customerId,
-    availableWalletIds: businessData.availableWalletIds,
-    channel: businessData.channel,
-    businessCode: businessData.businessCode,
-    orderType: businessData.orderType,
-    productCount: products.length,
-    products: products.map(function (product) {
-      var _product$id;
-      return {
-        productId: (_product$id = product === null || product === void 0 ? void 0 : product.id) !== null && _product$id !== void 0 ? _product$id : product === null || product === void 0 ? void 0 : product.product_id,
-        price: product === null || product === void 0 ? void 0 : product.price,
-        sellingPrice: product === null || product === void 0 ? void 0 : product.selling_price,
-        dataVariants: Array.isArray(product === null || product === void 0 ? void 0 : product.data_variants) ? product.data_variants.map(function (variant) {
-          return {
-            dataVariantRuleId: variant === null || variant === void 0 ? void 0 : variant.data_variant_rule_id,
-            data: variant === null || variant === void 0 ? void 0 : variant.data
-          };
-        }) : []
-      };
-    })
-  });
   var result = evaluator.resolveProducts(businessData);
-  (_context$debugLog2 = context.debugLog) === null || _context$debugLog2 === void 0 || _context$debugLog2.call(context, '[VenueBooking][smartPricing] formatProducts output', {
-    scheduleDateTime: resolvedAt,
-    effectiveRuleIds: Array.from((result === null || result === void 0 || (_result$globalEffecti = result.globalEffectiveRuleMap) === null || _result$globalEffecti === void 0 || (_result$globalEffecti2 = _result$globalEffecti.keys) === null || _result$globalEffecti2 === void 0 ? void 0 : _result$globalEffecti2.call(_result$globalEffecti)) || []),
-    resultProducts: (result === null || result === void 0 ? void 0 : result.products) || []
-  });
   return Array.isArray(result === null || result === void 0 ? void 0 : result.products) ? result.products : products;
 }
 
@@ -155,7 +121,6 @@ export function buildSlotStartDatetime(date, label, config) {
  * key: `${productId}:${slotStart}`，value: price | null
  */
 export function buildSlotPriceMapByScheduleSegments(params) {
-  var _context$debugLog3, _context$debugLog4;
   var products = params.products,
     productIds = params.productIds,
     date = params.date,
@@ -176,18 +141,10 @@ export function buildSlotPriceMapByScheduleSegments(params) {
     scheduleTimePoints: scheduleTimePoints
   });
   var priceCache = new Map();
-  (_context$debugLog3 = context.debugLog) === null || _context$debugLog3 === void 0 || _context$debugLog3.call(context, '[VenueBooking][smartPricing] slot price evaluation started', {
-    date: date,
-    productIds: productIds,
-    scheduleTimePoints: scheduleTimePoints,
-    evalDatetimes: evalDatetimes,
-    timeLabels: timeLabels
-  });
   var _iterator3 = _createForOfIteratorHelper(evalDatetimes),
     _step3;
   try {
-    var _loop = function _loop() {
-      var _context$debugLog5;
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
       var evalDt = _step3.value;
       var resolved = formatProductsWithDataVariant(products, context, evalDt);
       var priceByProductId = new Map();
@@ -206,20 +163,6 @@ export function buildSlotPriceMapByScheduleSegments(params) {
         _iterator5.f();
       }
       priceCache.set(evalDt, priceByProductId);
-      (_context$debugLog5 = context.debugLog) === null || _context$debugLog5 === void 0 || _context$debugLog5.call(context, '[VenueBooking][smartPricing] slot segment prices resolved', {
-        date: date,
-        evalDatetime: evalDt,
-        prices: productIds.map(function (productId) {
-          var _priceByProductId$get;
-          return {
-            productId: productId,
-            price: (_priceByProductId$get = priceByProductId.get(productId)) !== null && _priceByProductId$get !== void 0 ? _priceByProductId$get : null
-          };
-        })
-      });
-    };
-    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-      _loop();
     }
   } catch (err) {
     _iterator3.e(err);
@@ -233,15 +176,15 @@ export function buildSlotPriceMapByScheduleSegments(params) {
       var label = _step4.value;
       var slotStart = buildSlotStartDatetime(date, label, config);
       var segmentEvalDt = findSegmentEvalDatetime(slotStart, evalDatetimes);
-      var priceByProductId = priceCache.get(segmentEvalDt);
+      var _priceByProductId = priceCache.get(segmentEvalDt);
       var _iterator6 = _createForOfIteratorHelper(productIds),
         _step6;
       try {
         for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var _priceByProductId$get2;
-          var productId = _step6.value;
-          var key = "".concat(productId, ":").concat(slotStart);
-          var price = (_priceByProductId$get2 = priceByProductId === null || priceByProductId === void 0 ? void 0 : priceByProductId.get(productId)) !== null && _priceByProductId$get2 !== void 0 ? _priceByProductId$get2 : null;
+          var _priceByProductId$get;
+          var _productId = _step6.value;
+          var key = "".concat(_productId, ":").concat(slotStart);
+          var price = (_priceByProductId$get = _priceByProductId === null || _priceByProductId === void 0 ? void 0 : _priceByProductId.get(_productId)) !== null && _priceByProductId$get !== void 0 ? _priceByProductId$get : null;
           if (price !== null) {
             map.set(key, price);
           }
@@ -257,18 +200,6 @@ export function buildSlotPriceMapByScheduleSegments(params) {
   } finally {
     _iterator4.f();
   }
-  (_context$debugLog4 = context.debugLog) === null || _context$debugLog4 === void 0 || _context$debugLog4.call(context, '[VenueBooking][smartPricing] slot price map completed', {
-    date: date,
-    entries: Array.from(map.entries()).map(function (_ref4) {
-      var _ref5 = _slicedToArray(_ref4, 2),
-        key = _ref5[0],
-        price = _ref5[1];
-      return {
-        key: key,
-        price: price
-      };
-    })
-  });
   return map;
 }
 
@@ -276,7 +207,7 @@ export function buildSlotPriceMapByScheduleSegments(params) {
  * 指定商品在某一 datetime 的智能定价（addon / 单点重算用）。
  */
 export function getPriceForProductAtDatetime(params) {
-  var _ref6, _extractProductPrice;
+  var _ref4, _extractProductPrice;
   var products = params.products,
     context = params.context,
     productId = params.productId,
@@ -286,7 +217,7 @@ export function getPriceForProductAtDatetime(params) {
   var product = resolved.find(function (item) {
     return Number(item.id) === Number(productId);
   });
-  return (_ref6 = (_extractProductPrice = extractProductPrice(product || {})) !== null && _extractProductPrice !== void 0 ? _extractProductPrice : fallbackPrice) !== null && _ref6 !== void 0 ? _ref6 : '0.00';
+  return (_ref4 = (_extractProductPrice = extractProductPrice(product || {})) !== null && _extractProductPrice !== void 0 ? _extractProductPrice : fallbackPrice) !== null && _ref4 !== void 0 ? _ref4 : '0.00';
 }
 
 /** 从 slot 价格 Map 读取单价，找不到则回退 fallback */

package/lib/model/strategy/adapter/dataVariant/evaluator.js

@@ -46,7 +46,6 @@ var DataVariantEvaluator = class {
    * 先执行全局预计算，再只针对商品自身 data_variants 引用到的规则做商品级判断。
    */
   resolveProducts(businessData) {
-    var _a;
     const strategyConfigs = businessData.strategyConfigs ? this.normalizeStrategyConfigs(businessData.strategyConfigs) : this.strategyConfigs;
     const menuScopeMap = this.buildMenuScopeMap(businessData.menuList || []);
     const scheduleTimePoints = this.buildScheduleTimePoints(
@@ -58,14 +57,12 @@ var DataVariantEvaluator = class {
       businessData,
       menuScopeMap
     );
-    const productDiagnostics = businessData.debugLog ? [] : void 0;
     const products = businessData.products.map((product) => {
       const resolvedProduct = this.resolveProduct(
         product,
         businessData,
         globalEffectiveRuleMap,
-        menuScopeMap,
-        productDiagnostics
+        menuScopeMap
       );
       return this.resolveProductBundleItems(
         resolvedProduct,
@@ -74,32 +71,6 @@ var DataVariantEvaluator = class {
         menuScopeMap
       );
     });
-    (_a = businessData == null ? void 0 : businessData.debugLog) == null ? void 0 : _a.call(businessData, "[VenueBooking][smartPricing] evaluator result", {
-      scheduleDateTime: businessData.scheduleDateTime,
-      strategyConfigs: strategyConfigs.map((config) => {
-        var _a2, _b, _c, _d;
-        return {
-          ruleId: String((_a2 = config == null ? void 0 : config.metadata) == null ? void 0 : _a2.id),
-          name: (_b = config == null ? void 0 : config.metadata) == null ? void 0 : _b.name,
-          status: (_d = (_c = config == null ? void 0 : config.metadata) == null ? void 0 : _c.custom) == null ? void 0 : _d.status,
-          priority: this.getStrategyPriority(config),
-          conditions: config == null ? void 0 : config.conditions
-        };
-      }),
-      globalRuleResults: rawResults.map((result) => {
-        var _a2, _b, _c, _d;
-        return {
-          ruleId: String((_b = (_a2 = result == null ? void 0 : result.config) == null ? void 0 : _a2.metadata) == null ? void 0 : _b.id),
-          name: (_d = (_c = result == null ? void 0 : result.config) == null ? void 0 : _c.metadata) == null ? void 0 : _d.name,
-          applicable: result == null ? void 0 : result.applicable,
-          code: result == null ? void 0 : result.code,
-          message: result == null ? void 0 : result.message,
-          matched: result == null ? void 0 : result.matched
-        };
-      }),
-      effectiveRuleIds: Array.from(globalEffectiveRuleMap.keys()),
-      productDiagnostics: productDiagnostics || []
-    });
     return {
       products,
       globalEffectiveRuleMap,
@@ -206,57 +177,20 @@ var DataVariantEvaluator = class {
     }
     return { globalEffectiveRuleMap, rawResults };
   }
-  resolveProduct(product, businessData, globalEffectiveRuleMap, menuScopeMap, diagnostics) {
-    var _a, _b;
+  resolveProduct(product, businessData, globalEffectiveRuleMap, menuScopeMap) {
     const dataVariants = this.getProductDataVariants(product);
-    const productId = (product == null ? void 0 : product.id) ?? (product == null ? void 0 : product.product_id);
-    if (!dataVariants.length) {
-      diagnostics == null ? void 0 : diagnostics.push({
-        productId,
-        originalPrice: (product == null ? void 0 : product.price) ?? (product == null ? void 0 : product.selling_price),
-        finalPrice: (product == null ? void 0 : product.price) ?? (product == null ? void 0 : product.selling_price),
-        reason: "product has no data_variants",
-        variants: []
-      });
+    if (!dataVariants.length)
       return product;
-    }
     const matchedVariants = [];
-    const variantDiagnostics = [];
     for (const variant of dataVariants) {
-      const ruleId = String(variant.data_variant_rule_id);
       const rule = globalEffectiveRuleMap.get(
-        ruleId
+        String(variant.data_variant_rule_id)
       );
-      if (!rule) {
-        variantDiagnostics.push({
-          ruleId,
-          variantData: variant.data || {},
-          globalRuleEffective: false,
-          productRulesMatched: false,
-          reason: "referenced rule is missing or its global conditions did not match"
-        });
+      if (!rule)
         continue;
-      }
-      const productRulesMatched = this.evaluateProductRules(rule, product, businessData, menuScopeMap);
-      if (!productRulesMatched) {
-        variantDiagnostics.push({
-          ruleId,
-          variantData: variant.data || {},
-          globalRuleEffective: true,
-          productRulesMatched: false,
-          productRules: rule.productRules,
-          reason: "product-level conditions did not match"
-        });
+      if (!this.evaluateProductRules(rule, product, businessData, menuScopeMap)) {
         continue;
       }
-      variantDiagnostics.push({
-        ruleId,
-        variantData: variant.data || {},
-        globalRuleEffective: true,
-        productRulesMatched: true,
-        priority: rule.priority,
-        reason: "variant matched and will be merged into the product"
-      });
       matchedVariants.push({
         ruleId: rule.ruleId,
         priority: rule.priority,
@@ -264,26 +198,9 @@ var DataVariantEvaluator = class {
         variant
       });
     }
-    if (!matchedVariants.length) {
-      diagnostics == null ? void 0 : diagnostics.push({
-        productId,
-        originalPrice: (product == null ? void 0 : product.price) ?? (product == null ? void 0 : product.selling_price),
-        finalPrice: (product == null ? void 0 : product.price) ?? (product == null ? void 0 : product.selling_price),
-        reason: "no data_variant matched",
-        variants: variantDiagnostics
-      });
+    if (!matchedVariants.length)
       return product;
-    }
-    const resolvedProduct = this.mergeMatchedVariants(product, matchedVariants);
-    diagnostics == null ? void 0 : diagnostics.push({
-      productId,
-      originalPrice: (product == null ? void 0 : product.price) ?? (product == null ? void 0 : product.selling_price),
-      finalPrice: (resolvedProduct == null ? void 0 : resolvedProduct.price) ?? (resolvedProduct == null ? void 0 : resolvedProduct.selling_price),
-      appliedRuleIds: ((_a = resolvedProduct == null ? void 0 : resolvedProduct._dataVariant) == null ? void 0 : _a.appliedRuleIds) || [],
-      appliedFields: ((_b = resolvedProduct == null ? void 0 : resolvedProduct._dataVariant) == null ? void 0 : _b.appliedFields) || [],
-      variants: variantDiagnostics
-    });
-    return resolvedProduct;
+    return this.mergeMatchedVariants(product, matchedVariants);
   }
   /**
    * 解析套餐子商品上的 Data Variant 覆盖。

package/lib/model/strategy/adapter/dataVariant/type.d.ts

@@ -105,7 +105,6 @@ export interface DataVariantBusinessData {
     /** 当前客户可用 wallet/pass id 合并列表，对应策略条件 field: available_wallet_ids */
     availableWalletIds?: Array<number | string>;
     custom?: Record<string, any>;
-    debugLog?: (title: string, payload?: Record<string, any>) => void;
 }
 /**
  * 全局预计算后的规则信息。

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

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

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

@@ -62,6 +62,8 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     private logPricingDiagnostics;
     private isPricingDiagnosticsEnabled;
     private getAvailableWalletIdsForDiagnostics;
+    private getOrderPricingSnapshotForDiagnostics;
+    private getCatalogPricingSnapshotForDiagnostics;
     private logMethodStart;
     private logMethodSuccess;
     private logMethodError;
@@ -181,6 +183,14 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     onCustomerLogin(params: {
         customerId: number;
     }): Promise<void>;
+    /**
+     * 接收 pisell2 VenueBooking 登录链路诊断日志。
+     * 实际是否上报仍由 OS 内部 cacheId 白名单统一控制。
+     */
+    logPricingDiagnosticsFromClient(params: {
+        title: string;
+        payload?: Record<string, any>;
+    }): void;
     private recalculateOrderPricesFromSmartPricing;
     /**
      * DataVariant 重算价格后，同步刷新订单展示、Rules 与 Summary 共用的价格口径。