@pisell/pisellos 2.2.150 → 2.2.151

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

@@ -50,7 +50,15 @@ function formatReason(template, 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);
+  // 使用函数作为替换参数，避免替换串中的 "$" 被 String.prototype.replace
+  // 当作特殊序列（如 $$ -> $、$& 等）处理
+  return template.replace(/\$\{value\}/g, function () {
+    return v;
+  }).replace(/\{value\}/g, function () {
+    return v;
+  }).replace(/\{currency\}/g, function () {
+    return c;
+  });
 }
 
 /**
@@ -249,6 +257,7 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
             var rawText = this.getText(reasonCode);
             // 金额类型字段：从 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')) || '' : '';
+            console.log(currency, 'currency12345');
             var reason = thresholdValue !== undefined ? formatReason(rawText, thresholdValue, currency) : rawText;
             results.push({
               voucher: voucher,

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

@@ -171,7 +171,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

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

@@ -25,6 +25,15 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     setOtherProductsIds(ids: number[]): void;
     getOtherProductsIds(): number[];
     storeChange(): void;
+    /**
+     * 传入一个时间, 判断改时间是否在schedule 内
+     * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
+     * @returns
+     */
+    isInScheduleByDate({ date, schedule, }: {
+        date: string;
+        schedule: any;
+    }): boolean;
     /**
    * 传入一个时间, 判断改时间是否在schedule 内
    * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule

package/dist/modules/Schedule/index.js

@@ -243,6 +243,18 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
         });
       }
     }
+    /**
+     * 传入一个时间, 判断改时间是否在schedule 内
+     * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
+     * @returns
+     */
+  }, {
+    key: "isInScheduleByDate",
+    value: function isInScheduleByDate(_ref2) {
+      var date = _ref2.date,
+        schedule = _ref2.schedule;
+      return getDateIsInSchedule(date, [schedule]);
+    }
     /**
     * 传入一个时间, 判断改时间是否在schedule 内
     * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
@@ -250,10 +262,10 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     */
   }], [{
     key: "isInScheduleByDate",
-    value: function isInScheduleByDate(_ref2) {
+    value: function isInScheduleByDate(_ref3) {
       var _schedule$repeat_rule, _schedule$repeat_rule2;
-      var date = _ref2.date,
-        schedule = _ref2.schedule;
+      var date = _ref3.date,
+        schedule = _ref3.schedule;
       return getDateIsInSchedule(date, [schedule]);
       if (schedule.start_time && schedule.end_time) {
         var isBeforeStartTime = dayjs(date).isBefore(dayjs(schedule.start_time));

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

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

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

@@ -59,7 +59,7 @@ function formatReason(template, value, currency = "") {
     return template;
   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);
+  return template.replace(/\$\{value\}/g, () => v).replace(/\{value\}/g, () => v).replace(/\{currency\}/g, () => c);
 }
 var WalletPassEvaluator = class {
   constructor() {
@@ -214,6 +214,7 @@ var WalletPassEvaluator = class {
         }
         const rawText = this.getText(reasonCode);
         const currency = failedField && AMOUNT_FIELDS.has(failedField) ? ((_g = (_f = this.otherParams) == null ? void 0 : _f.getData) == null ? void 0 : _g.call(_f, "shop_symbol")) || "" : "";
+        console.log(currency, "currency12345");
         const reason = thresholdValue !== void 0 ? formatReason(rawText, thresholdValue, currency) : rawText;
         results.push({
           voucher,

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

@@ -171,7 +171,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

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

@@ -25,6 +25,15 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     setOtherProductsIds(ids: number[]): void;
     getOtherProductsIds(): number[];
     storeChange(): void;
+    /**
+     * 传入一个时间, 判断改时间是否在schedule 内
+     * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
+     * @returns
+     */
+    isInScheduleByDate({ date, schedule, }: {
+        date: string;
+        schedule: any;
+    }): boolean;
     /**
    * 传入一个时间, 判断改时间是否在schedule 内
    * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule

package/lib/modules/Schedule/index.js

@@ -160,6 +160,17 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
       });
     }
   }
+  /**
+   * 传入一个时间, 判断改时间是否在schedule 内
+   * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule
+   * @returns
+   */
+  isInScheduleByDate({
+    date,
+    schedule
+  }) {
+    return (0, import_getDateIsInSchedule.getDateIsInSchedule)(date, [schedule]);
+  }
   /**
   * 传入一个时间, 判断改时间是否在schedule 内
   * @param param0 { date: string, schedule: any } date: 日期, schedule: schedule

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

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

package/package.json

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