@pisell/pisellos 2.2.144 → 2.2.146

package/dist/model/strategy/adapter/walletPass/evaluator.d.ts

@@ -8,10 +8,12 @@ export declare class WalletPassEvaluator {
     private engine;
     private strategyConfigs;
     private locale;
+    private otherParams;
     constructor();
     setStrategyConfigs(strategyConfigs: StrategyConfig[]): void;
     getStrategyConfigs(): StrategyConfig[];
     setLocale(locale: string): void;
+    setOtherParams(otherParams: any): void;
     getText(key: string): string;
     /**
      * 搜索券的格式

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

@@ -35,12 +35,22 @@ var FIELD_REASON_CODE_MAP = {
 };
 
 /**
- * 用阈值替换文案中的占位符（同时兼容 ${value} 和 {value}）
+ * 金额类型 field 集合（需要在文案前拼货币符号）
+ */
+var AMOUNT_FIELDS = new Set(['orderTotalAmount', 'applicableProductTotalAmount']);
+
+/**
+ * 用阈值与货币符号替换文案中的占位符
+ * 支持占位符：{value} / ${value} / {currency}
  */
 function formatReason(template, value) {
+  var currency = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
   if (!template) return template;
-  var replacement = value === undefined || value === null ? '' : String(value);
-  return template.replace(/\$\{value\}/g, replacement).replace(/\{value\}/g, replacement);
+  var v = value === undefined || value === null ? '' : String(value);
+  var c = currency === undefined || currency === null ? '' : String(currency);
+  // 注意：必须先替换 value，再替换 currency
+  // 否则 currency 注入的 "$" 会被后续的 /\$\{value\}/ 正则误吞
+  return template.replace(/\$\{value\}/g, v).replace(/\{value\}/g, v).replace(/\{currency\}/g, c);
 }
 
 /**
@@ -53,6 +63,7 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
     _defineProperty(this, "engine", void 0);
     _defineProperty(this, "strategyConfigs", []);
     _defineProperty(this, "locale", 'en');
+    _defineProperty(this, "otherParams", {});
     this.engine = new StrategyEngine({
       debug: false,
       enableTrace: false
@@ -76,6 +87,11 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
     value: function setLocale(locale) {
       this.locale = locale;
     }
+  }, {
+    key: "setOtherParams",
+    value: function setOtherParams(otherParams) {
+      this.otherParams = otherParams;
+    }
   }, {
     key: "getText",
     value: function getText(key) {
@@ -210,7 +226,7 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
               strategyResult: evaluationResult
             });
           } else {
-            var _evaluationResult$mat, _evaluationResult$mat2;
+            var _evaluationResult$mat, _evaluationResult$mat2, _this$otherParams, _this$otherParams$get, _this$otherParams2;
             // 优先根据失败的 field 映射到具体的 reasonCode（更精确的失败原因）
             var reasonCode = 'not_meet_the_required_conditions';
             var thresholdValue = undefined;
@@ -231,7 +247,9 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
               reasonCode = codeMapping[evaluationResult.code] || 'not_meet_the_required_conditions';
             }
             var rawText = this.getText(reasonCode);
-            var reason = thresholdValue !== undefined ? formatReason(rawText, thresholdValue) : rawText;
+            // 金额类型字段：从 otherParams.getData 取货币符号；非金额或取不到则留空
+            var currency = failedField && AMOUNT_FIELDS.has(failedField) ? ((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 || (_this$otherParams$get = (_this$otherParams2 = _this$otherParams).getData) === null || _this$otherParams$get === void 0 ? void 0 : _this$otherParams$get.call(_this$otherParams2, 'shop_symbol')) || '' : '';
+            var reason = thresholdValue !== undefined ? formatReason(rawText, thresholdValue, currency) : rawText;
             results.push({
               voucher: voucher,
               isApplicable: false,
@@ -479,6 +497,7 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
   }, {
     key: "calculateApplicableProducts",
     value: function calculateApplicableProducts(products, applicableProductIds, deductTaxAndFee) {
+      console.log(products, 'products1234');
       var total = 0;
       var count = 0;
 

package/dist/model/strategy/adapter/walletPass/locales.js

@@ -6,8 +6,8 @@ export var locales = {
     'max_passes_per_item_reached': '该商品已达到卡券使用上限',
     'not_available_for_this_channel': '当前渠道不可使用',
     'not_valid_for_this_order_type': '当前订单类型不适用',
-    'order_total_amount_not_enough': '订单满 ${value} 才可用',
-    'applicable_product_total_amount_not_enough': '适用商品满 ${value} 才可用',
+    'order_total_amount_not_enough': '订单满 {currency}{value} 才可用',
+    'applicable_product_total_amount_not_enough': '适用商品满 {currency}{value} 才可用',
     'applicable_product_count_not_enough': '至少购买 {value} 件适用商品才可用'
   },
   'en': {
@@ -17,8 +17,8 @@ export var locales = {
     'max_passes_per_item_reached': 'Max passes per item reached.',
     'not_available_for_this_channel': 'Not available for this channel.',
     'not_valid_for_this_order_type': 'Not valid for this order type.',
-    'order_total_amount_not_enough': 'Spend ${value} to use',
-    'applicable_product_total_amount_not_enough': '${value} on eligible items',
+    'order_total_amount_not_enough': 'Spend {currency}{value} to use',
+    'applicable_product_total_amount_not_enough': '{currency}{value} on eligible items',
     'applicable_product_count_not_enough': 'Buy {value} eligible items to use'
   },
   'zh-HK': {
@@ -28,8 +28,8 @@ export var locales = {
     'max_passes_per_item_reached': '該商品已達卡券使用上限',
     'not_available_for_this_channel': '當前渠道不可使用',
     'not_valid_for_this_order_type': '當前訂單類型不適用',
-    'order_total_amount_not_enough': '訂單滿 ${value} 才可用',
-    'applicable_product_total_amount_not_enough': '適用商品滿 ${value} 才可用',
+    'order_total_amount_not_enough': '訂單滿 {currency}{value} 才可用',
+    'applicable_product_total_amount_not_enough': '適用商品滿 {currency}{value} 才可用',
     'applicable_product_count_not_enough': '至少購買 {value} 件適用商品才可用'
   }
 };

package/dist/server/modules/order/utils/filterBookings.js

@@ -160,7 +160,7 @@ function matchBooking(booking, orderInfo, ctx) {
   }
   if (ctx.appointmentStatusSet && !ctx.appointmentStatusSet.has(getBookingAppointmentStatus(booking))) return false;
   if (ctx.bookingTimeRange) {
-    var ts = toTimestamp(booking.start_date);
+    var ts = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
     if (ts < ctx.bookingTimeRange[0] || ts > ctx.bookingTimeRange[1]) return false;
   }
   if (ctx.afterExecutionTimeMs != null) {
@@ -308,6 +308,7 @@ export function filterBookingsFromOrders(orders, filters) {
 
     // 订单级预过滤
     if (!matchOrder(order, ctx)) continue;
+    debugger;
 
     // 订单通过，遍历其 bookings；orderInfo 延迟创建
     var orderInfo = null;

package/lib/model/strategy/adapter/walletPass/evaluator.d.ts

@@ -8,10 +8,12 @@ export declare class WalletPassEvaluator {
     private engine;
     private strategyConfigs;
     private locale;
+    private otherParams;
     constructor();
     setStrategyConfigs(strategyConfigs: StrategyConfig[]): void;
     getStrategyConfigs(): StrategyConfig[];
     setLocale(locale: string): void;
+    setOtherParams(otherParams: any): void;
     getText(key: string): string;
     /**
      * 搜索券的格式

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

@@ -50,16 +50,22 @@ var FIELD_REASON_CODE_MAP = {
   applicableProductTotalAmount: "applicable_product_total_amount_not_enough",
   applicableProductCount: "applicable_product_count_not_enough"
 };
-function formatReason(template, value) {
+var AMOUNT_FIELDS = /* @__PURE__ */ new Set([
+  "orderTotalAmount",
+  "applicableProductTotalAmount"
+]);
+function formatReason(template, value, currency = "") {
   if (!template)
     return template;
-  const replacement = value === void 0 || value === null ? "" : String(value);
-  return template.replace(/\$\{value\}/g, replacement).replace(/\{value\}/g, replacement);
+  const v = value === void 0 || value === null ? "" : String(value);
+  const c = currency === void 0 || currency === null ? "" : String(currency);
+  return template.replace(/\$\{value\}/g, v).replace(/\{value\}/g, v).replace(/\{currency\}/g, c);
 }
 var WalletPassEvaluator = class {
   constructor() {
     this.strategyConfigs = [];
     this.locale = "en";
+    this.otherParams = {};
     this.engine = new import__.StrategyEngine({
       debug: false,
       enableTrace: false
@@ -75,6 +81,9 @@ var WalletPassEvaluator = class {
   setLocale(locale) {
     this.locale = locale;
   }
+  setOtherParams(otherParams) {
+    this.otherParams = otherParams;
+  }
   getText(key) {
     var _a, _b;
     return (_b = (_a = import_locales.locales) == null ? void 0 : _a[this.locale]) == null ? void 0 : _b[key];
@@ -112,7 +121,7 @@ var WalletPassEvaluator = class {
    * 评估可用的 vouchers
    */
   evaluate(input) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     const { orderTotalAmount, products, vouchers, strategyConfigs } = input;
     const productIds = products.map((p) => p.product_id);
     const results = [];
@@ -204,7 +213,8 @@ var WalletPassEvaluator = class {
           reasonCode = codeMapping[evaluationResult.code] || "not_meet_the_required_conditions";
         }
         const rawText = this.getText(reasonCode);
-        const reason = thresholdValue !== void 0 ? formatReason(rawText, thresholdValue) : rawText;
+        const currency = failedField && AMOUNT_FIELDS.has(failedField) ? ((_g = (_f = this.otherParams) == null ? void 0 : _f.getData) == null ? void 0 : _g.call(_f, "shop_symbol")) || "" : "";
+        const reason = thresholdValue !== void 0 ? formatReason(rawText, thresholdValue, currency) : rawText;
         results.push({
           voucher,
           isApplicable: false,
@@ -405,6 +415,7 @@ var WalletPassEvaluator = class {
    * 计算适用商品的总金额和数量
    */
   calculateApplicableProducts(products, applicableProductIds, deductTaxAndFee) {
+    console.log(products, "products1234");
     let total = 0;
     let count = 0;
     if (applicableProductIds !== null && applicableProductIds.length === 0) {

package/lib/model/strategy/adapter/walletPass/locales.js

@@ -30,8 +30,8 @@ var locales = {
     "max_passes_per_item_reached": "该商品已达到卡券使用上限",
     "not_available_for_this_channel": "当前渠道不可使用",
     "not_valid_for_this_order_type": "当前订单类型不适用",
-    "order_total_amount_not_enough": "订单满 ${value} 才可用",
-    "applicable_product_total_amount_not_enough": "适用商品满 ${value} 才可用",
+    "order_total_amount_not_enough": "订单满 {currency}{value} 才可用",
+    "applicable_product_total_amount_not_enough": "适用商品满 {currency}{value} 才可用",
     "applicable_product_count_not_enough": "至少购买 {value} 件适用商品才可用"
   },
   "en": {
@@ -41,8 +41,8 @@ var locales = {
     "max_passes_per_item_reached": "Max passes per item reached.",
     "not_available_for_this_channel": "Not available for this channel.",
     "not_valid_for_this_order_type": "Not valid for this order type.",
-    "order_total_amount_not_enough": "Spend ${value} to use",
-    "applicable_product_total_amount_not_enough": "${value} on eligible items",
+    "order_total_amount_not_enough": "Spend {currency}{value} to use",
+    "applicable_product_total_amount_not_enough": "{currency}{value} on eligible items",
     "applicable_product_count_not_enough": "Buy {value} eligible items to use"
   },
   "zh-HK": {
@@ -52,8 +52,8 @@ var locales = {
     "max_passes_per_item_reached": "該商品已達卡券使用上限",
     "not_available_for_this_channel": "當前渠道不可使用",
     "not_valid_for_this_order_type": "當前訂單類型不適用",
-    "order_total_amount_not_enough": "訂單滿 ${value} 才可用",
-    "applicable_product_total_amount_not_enough": "適用商品滿 ${value} 才可用",
+    "order_total_amount_not_enough": "訂單滿 {currency}{value} 才可用",
+    "applicable_product_total_amount_not_enough": "適用商品滿 {currency}{value} 才可用",
     "applicable_product_count_not_enough": "至少購買 {value} 件適用商品才可用"
   }
 };

package/lib/server/modules/order/utils/filterBookings.js

@@ -178,7 +178,7 @@ function matchBooking(booking, orderInfo, ctx) {
   if (ctx.appointmentStatusSet && !ctx.appointmentStatusSet.has(getBookingAppointmentStatus(booking)))
     return false;
   if (ctx.bookingTimeRange) {
-    const ts = toTimestamp(booking.start_date);
+    const ts = toTimestamp(bookingDateTimeString(booking.start_date, booking.start_time));
     if (ts < ctx.bookingTimeRange[0] || ts > ctx.bookingTimeRange[1])
       return false;
   }
@@ -308,6 +308,7 @@ function filterBookingsFromOrders(orders, filters) {
       continue;
     if (!matchOrder(order, ctx))
       continue;
+    debugger;
     let orderInfo = null;
     for (let j = 0, bLen = bookings.length; j < bLen; j++) {
       const booking = bookings[j];

package/package.json

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