@pisell/pisellos 2.1.170 → 2.1.171

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

@@ -56,46 +56,18 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
   }, {
     key: "resolveProducts",
     value: function resolveProducts(businessData) {
-      var _this = this,
-        _businessData$debugLo;
+      var _this = this;
       var strategyConfigs = businessData.strategyConfigs ? this.normalizeStrategyConfigs(businessData.strategyConfigs) : this.strategyConfigs;
       var menuScopeMap = this.buildMenuScopeMap(businessData.menuList || []);
       var scheduleTimePoints = this.buildScheduleTimePoints(strategyConfigs, businessData.scheduleList || []);
       var _this$buildGlobalEffe = this.buildGlobalEffectiveRuleMap(strategyConfigs, businessData, menuScopeMap),
         globalEffectiveRuleMap = _this$buildGlobalEffe.globalEffectiveRuleMap,
         rawResults = _this$buildGlobalEffe.rawResults;
-      var productDiagnostics = businessData.debugLog ? [] : undefined;
       var products = businessData.products.map(function (product) {
-        var resolvedProduct = _this.resolveProduct(product, businessData, globalEffectiveRuleMap, menuScopeMap, productDiagnostics);
+        var resolvedProduct = _this.resolveProduct(product, businessData, globalEffectiveRuleMap, menuScopeMap);
         // 套餐子商品也可能携带 data_variants，需在同一策略上下文内继续评估并写回 bundle_item。
         return _this.resolveProductBundleItems(resolvedProduct, businessData, globalEffectiveRuleMap, menuScopeMap);
       });
-      businessData === null || businessData === void 0 || (_businessData$debugLo = businessData.debugLog) === null || _businessData$debugLo === void 0 || _businessData$debugLo.call(businessData, '[VenueBooking][smartPricing] evaluator result', {
-        scheduleDateTime: businessData.scheduleDateTime,
-        strategyConfigs: strategyConfigs.map(function (config) {
-          var _config$metadata, _config$metadata2, _config$metadata3;
-          return {
-            ruleId: String(config === null || config === void 0 || (_config$metadata = config.metadata) === null || _config$metadata === void 0 ? void 0 : _config$metadata.id),
-            name: config === null || config === void 0 || (_config$metadata2 = config.metadata) === null || _config$metadata2 === void 0 ? void 0 : _config$metadata2.name,
-            status: config === null || config === void 0 || (_config$metadata3 = config.metadata) === null || _config$metadata3 === void 0 || (_config$metadata3 = _config$metadata3.custom) === null || _config$metadata3 === void 0 ? void 0 : _config$metadata3.status,
-            priority: _this.getStrategyPriority(config),
-            conditions: config === null || config === void 0 ? void 0 : config.conditions
-          };
-        }),
-        globalRuleResults: rawResults.map(function (result) {
-          var _result$config, _result$config2;
-          return {
-            ruleId: String(result === null || result === void 0 || (_result$config = result.config) === null || _result$config === void 0 || (_result$config = _result$config.metadata) === null || _result$config === void 0 ? void 0 : _result$config.id),
-            name: result === null || result === void 0 || (_result$config2 = result.config) === null || _result$config2 === void 0 || (_result$config2 = _result$config2.metadata) === null || _result$config2 === void 0 ? void 0 : _result$config2.name,
-            applicable: result === null || result === void 0 ? void 0 : result.applicable,
-            code: result === null || result === void 0 ? void 0 : result.code,
-            message: result === null || result === void 0 ? void 0 : result.message,
-            matched: result === null || result === void 0 ? void 0 : result.matched
-          };
-        }),
-        effectiveRuleIds: Array.from(globalEffectiveRuleMap.keys()),
-        productDiagnostics: productDiagnostics || []
-      });
       return {
         products: products,
         globalEffectiveRuleMap: globalEffectiveRuleMap,
@@ -247,60 +219,20 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
     }
   }, {
     key: "resolveProduct",
-    value: function resolveProduct(product, businessData, globalEffectiveRuleMap, menuScopeMap, diagnostics) {
-      var _product$id, _product$price5, _resolvedProduct$pric, _resolvedProduct$_dat, _resolvedProduct$_dat2;
+    value: function resolveProduct(product, businessData, globalEffectiveRuleMap, menuScopeMap) {
       var dataVariants = this.getProductDataVariants(product);
-      var 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;
-      if (!dataVariants.length) {
-        var _product$price, _product$price2;
-        diagnostics === null || diagnostics === void 0 || diagnostics.push({
-          productId: productId,
-          originalPrice: (_product$price = product === null || product === void 0 ? void 0 : product.price) !== null && _product$price !== void 0 ? _product$price : product === null || product === void 0 ? void 0 : product.selling_price,
-          finalPrice: (_product$price2 = product === null || product === void 0 ? void 0 : product.price) !== null && _product$price2 !== void 0 ? _product$price2 : product === null || product === void 0 ? void 0 : product.selling_price,
-          reason: 'product has no data_variants',
-          variants: []
-        });
-        return product;
-      }
+      if (!dataVariants.length) return product;
       var matchedVariants = [];
-      var variantDiagnostics = [];
       var _iterator5 = _createForOfIteratorHelper(dataVariants),
         _step5;
       try {
         for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
           var variant = _step5.value;
-          var ruleId = String(variant.data_variant_rule_id);
-          var rule = globalEffectiveRuleMap.get(ruleId);
-          if (!rule) {
-            variantDiagnostics.push({
-              ruleId: ruleId,
-              variantData: variant.data || {},
-              globalRuleEffective: false,
-              productRulesMatched: false,
-              reason: 'referenced rule is missing or its global conditions did not match'
-            });
+          var rule = globalEffectiveRuleMap.get(String(variant.data_variant_rule_id));
+          if (!rule) continue;
+          if (!this.evaluateProductRules(rule, product, businessData, menuScopeMap)) {
             continue;
           }
-          var productRulesMatched = this.evaluateProductRules(rule, product, businessData, menuScopeMap);
-          if (!productRulesMatched) {
-            variantDiagnostics.push({
-              ruleId: ruleId,
-              variantData: variant.data || {},
-              globalRuleEffective: true,
-              productRulesMatched: false,
-              productRules: rule.productRules,
-              reason: 'product-level conditions did not match'
-            });
-            continue;
-          }
-          variantDiagnostics.push({
-            ruleId: 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,
@@ -313,27 +245,8 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
       } finally {
         _iterator5.f();
       }
-      if (!matchedVariants.length) {
-        var _product$price3, _product$price4;
-        diagnostics === null || diagnostics === void 0 || diagnostics.push({
-          productId: productId,
-          originalPrice: (_product$price3 = product === null || product === void 0 ? void 0 : product.price) !== null && _product$price3 !== void 0 ? _product$price3 : product === null || product === void 0 ? void 0 : product.selling_price,
-          finalPrice: (_product$price4 = product === null || product === void 0 ? void 0 : product.price) !== null && _product$price4 !== void 0 ? _product$price4 : product === null || product === void 0 ? void 0 : product.selling_price,
-          reason: 'no data_variant matched',
-          variants: variantDiagnostics
-        });
-        return product;
-      }
-      var resolvedProduct = this.mergeMatchedVariants(product, matchedVariants);
-      diagnostics === null || diagnostics === void 0 || diagnostics.push({
-        productId: productId,
-        originalPrice: (_product$price5 = product === null || product === void 0 ? void 0 : product.price) !== null && _product$price5 !== void 0 ? _product$price5 : product === null || product === void 0 ? void 0 : product.selling_price,
-        finalPrice: (_resolvedProduct$pric = resolvedProduct === null || resolvedProduct === void 0 ? void 0 : resolvedProduct.price) !== null && _resolvedProduct$pric !== void 0 ? _resolvedProduct$pric : resolvedProduct === null || resolvedProduct === void 0 ? void 0 : resolvedProduct.selling_price,
-        appliedRuleIds: (resolvedProduct === null || resolvedProduct === void 0 || (_resolvedProduct$_dat = resolvedProduct._dataVariant) === null || _resolvedProduct$_dat === void 0 ? void 0 : _resolvedProduct$_dat.appliedRuleIds) || [],
-        appliedFields: (resolvedProduct === null || resolvedProduct === void 0 || (_resolvedProduct$_dat2 = resolvedProduct._dataVariant) === null || _resolvedProduct$_dat2 === void 0 ? void 0 : _resolvedProduct$_dat2.appliedFields) || [],
-        variants: variantDiagnostics
-      });
-      return resolvedProduct;
+      if (!matchedVariants.length) return product;
+      return this.mergeMatchedVariants(product, matchedVariants);
     }
 
     /**
@@ -710,11 +623,11 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
   }, {
     key: "isProductInMenuScope",
     value: function isProductInMenuScope(product, scope) {
-      var _product$id2,
+      var _product$id,
         _this5 = this;
       if (scope.isAllProducts) return true;
       if (!product || _typeof(product) !== 'object') return false;
-      var productId = this.toNumber((_product$id2 = product.id) !== null && _product$id2 !== void 0 ? _product$id2 : product.product_id);
+      var productId = this.toNumber((_product$id = product.id) !== null && _product$id !== void 0 ? _product$id : product.product_id);
       var variantId = this.toNumber(product.product_variant_id);
       var productKey = this.buildProductKey(productId, variantId);
       var collectionIds = Array.isArray(product.collection_ids) ? product.collection_ids.map(function (id) {
@@ -771,8 +684,8 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
     key: "normalizeStrategyConfigs",
     value: function normalizeStrategyConfigs(configs) {
       return configs.filter(function (config) {
-        var _config$metadata4;
-        return (config === null || config === void 0 || (_config$metadata4 = config.metadata) === null || _config$metadata4 === void 0 ? void 0 : _config$metadata4.type) === 'data_variant';
+        var _config$metadata;
+        return (config === null || config === void 0 || (_config$metadata = config.metadata) === null || _config$metadata === void 0 ? void 0 : _config$metadata.type) === 'data_variant';
       });
     }
   }, {

package/dist/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/dist/model/strategy/adapter/promotion/index.js

@@ -1,9 +0,0 @@
-// 导出评估器
-export { PromotionEvaluator } from "./evaluator";
-
-// 导出适配器
-export { PromotionAdapter } from "./adapter";
-export { default } from "./adapter";
-
-// 导出策略配置示例常量
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

package/dist/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/dist/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 共用的价格口径。