@pisell/pisellos 3.0.95 → 3.0.97

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/modules/Discount/index.d.ts

@@ -17,12 +17,13 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     setOriginalDiscountList(originalDiscountList: Discount[]): Promise<void>;
     getOriginalDiscountList(): Discount[];
     loadPrepareConfig(params: {
-        action?: 'create';
+        action?: 'create' | 'edit';
         with_good_pass: 0 | 1;
         with_discount_card: 0 | 1;
         customer_id: number;
         with_wallet_pass_holder: 0 | 1;
         request_timezone: string;
+        order_id?: number;
     }): Promise<Discount[]>;
     batchSearch(code: string, customerId?: number): Promise<DiscountWithReason>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];

package/dist/modules/Rules/index.js

@@ -1805,7 +1805,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 套餐适用范围配置
       var packageScope = usageRules === null || usageRules === void 0 ? void 0 : usageRules.package_scope;
       var _ref8 = packageScope || {},
-        scopeType = _ref8.type,
+        _ref8$type = _ref8.type,
+        scopeType = _ref8$type === void 0 ? 'product_all' : _ref8$type,
         _ref8$exclude_bundle_ = _ref8.exclude_bundle_product_ids,
         exclude_bundle_product_ids = _ref8$exclude_bundle_ === void 0 ? [] : _ref8$exclude_bundle_,
         _ref8$include_bundle_ = _ref8.include_bundle_product_ids,

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

@@ -25,6 +25,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     setHolders(holders: {
         form_record_id: number;
     }[]): void;
+    setOrderId(id?: number): void;
     setBookingSubject(bookingSubject: {
         type?: 'form' | 'customer';
         [key: string]: any;

package/dist/solution/ShopDiscount/index.js

@@ -56,7 +56,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: [],
-      bookingSubject: undefined
+      bookingSubject: undefined,
+      orderId: undefined
     };
     return _this;
   }
@@ -294,6 +295,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     value: function setHolders(holders) {
       this.store.holders = holders;
     }
+  }, {
+    key: "setOrderId",
+    value: function setOrderId(id) {
+      this.store.orderId = id;
+    }
   }, {
     key: "setBookingSubject",
     value: function setBookingSubject(bookingSubject) {
@@ -686,24 +692,27 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
-        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$discount8, _this$store$productLi, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, result;
+        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$discount8, _this$store$productLi, orderId, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, result;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               _context8.prev = 0;
+              orderId = this.store.orderId;
               customerId = params.customerId || ((_this$getCustomer2 = this.getCustomer()) === null || _this$getCustomer2 === void 0 ? void 0 : _this$getCustomer2.id); // if (customerId === 1 || !customerId) {
               //   return
               // }
-              _context8.next = 4;
-              return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.loadPrepareConfig({
+              _context8.next = 5;
+              return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.loadPrepareConfig(_objectSpread({
                 customer_id: customerId,
-                action: 'create',
+                action: orderId ? 'edit' : 'create',
                 with_good_pass: 1,
                 with_discount_card: 1,
                 with_wallet_pass_holder: 1,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
-              });
-            case 4:
+              }, orderId ? {
+                order_id: orderId
+              } : {}));
+            case 5:
               goodPassList = _context8.sent;
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
@@ -716,35 +725,35 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
               newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              _context8.next = 12;
+              _context8.next = 13;
               return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.setOriginalDiscountList(newDiscountList);
-            case 12:
+            case 13:
               // 根据当前预约时间过滤优惠券列表
               filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
               this.store.filteredDiscountList = filteredDiscountList;
               this.setDiscountList(filteredDiscountList || []);
               if (!((_this$store$productLi = this.store.productList) !== null && _this$store$productLi !== void 0 && _this$store$productLi.length)) {
-                _context8.next = 19;
+                _context8.next = 20;
                 break;
               }
               result = this.calcDiscount(this.store.productList);
-              _context8.next = 19;
+              _context8.next = 20;
               return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, result);
-            case 19:
-              _context8.next = 21;
+            case 20:
+              _context8.next = 22;
               return this.core.effects.emit(ShopDiscountHooks.onLoadDiscountList, filteredDiscountList);
-            case 21:
-              _context8.next = 26;
+            case 22:
+              _context8.next = 27;
               break;
-            case 23:
-              _context8.prev = 23;
+            case 24:
+              _context8.prev = 24;
               _context8.t0 = _context8["catch"](0);
               console.error('[ShopDiscount] 加载准备配置出错:', _context8.t0);
-            case 26:
+            case 27:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[0, 23]]);
+        }, _callee8, this, [[0, 24]]);
       }));
       function loadPrepareConfig(_x8) {
         return _loadPrepareConfig.apply(this, arguments);

package/dist/solution/ShopDiscount/types.d.ts

@@ -35,4 +35,5 @@ export interface ShopDiscountState {
         type?: 'form' | 'customer';
         [key: string]: any;
     };
+    orderId?: number;
 }

package/dist/solution/ShopDiscount/utils.js

@@ -261,10 +261,12 @@ var isInRepeatingSchedule = function isInRepeatingSchedule(targetDate, targetDat
 
 // 每日重复逻辑
 var isInDailyRepeat = function isInDailyRepeat(targetDate, startDate, endDate, repeatRule) {
-  var daysDiff = targetDate.diff(startDate, 'day');
-  if (daysDiff < 0) {
+  // dayjs#diff 会截断不足一天的负差值；必须先比较完整时刻，避免开始日前的
+  // 当天时段被误判为第 0 天。
+  if (targetDate.isBefore(startDate)) {
     return false;
   }
+  var daysDiff = targetDate.diff(startDate, 'day');
 
   // 检查频率
   if (daysDiff % repeatRule.frequency !== 0) {
@@ -283,6 +285,10 @@ var isInDailyRepeat = function isInDailyRepeat(targetDate, startDate, endDate, r
 
 // 每周重复逻辑
 var isInWeeklyRepeat = function isInWeeklyRepeat(targetDate, startDate, endDate, repeatRule) {
+  // 同上：不足一周的负差值会被截断为 0，开始时刻前不能命中重复规则。
+  if (targetDate.isBefore(startDate)) {
+    return false;
+  }
   var targetDayOfWeek = targetDate.day(); // 0=周日, 1=周一, ..., 6=周六
 
   // 检查是否在指定的星期几内
@@ -292,9 +298,6 @@ var isInWeeklyRepeat = function isInWeeklyRepeat(targetDate, startDate, endDate,
 
   // 计算周差
   var weeksDiff = targetDate.diff(startDate, 'week');
-  if (weeksDiff < 0) {
-    return false;
-  }
 
   // 检查频率
   if (weeksDiff % repeatRule.frequency !== 0) {

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,49 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

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

@@ -17,12 +17,13 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     setOriginalDiscountList(originalDiscountList: Discount[]): Promise<void>;
     getOriginalDiscountList(): Discount[];
     loadPrepareConfig(params: {
-        action?: 'create';
+        action?: 'create' | 'edit';
         with_good_pass: 0 | 1;
         with_discount_card: 0 | 1;
         customer_id: number;
         with_wallet_pass_holder: 0 | 1;
         request_timezone: string;
+        order_id?: number;
     }): Promise<Discount[]>;
     batchSearch(code: string, customerId?: number): Promise<DiscountWithReason>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];

package/lib/modules/Rules/index.js

@@ -1382,7 +1382,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     }
     const ruleType = usageRules.type;
     const packageScope = usageRules == null ? void 0 : usageRules.package_scope;
-    const { type: scopeType, exclude_bundle_product_ids = [], include_bundle_product_ids = [], filter = 0 } = packageScope || {};
+    const { type: scopeType = "product_all", exclude_bundle_product_ids = [], include_bundle_product_ids = [], filter = 0 } = packageScope || {};
     const isMainProduct = flatItem.type === "main";
     const isBundleItem = flatItem.type === "bundle";
     if (isMainProduct) {

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

@@ -25,6 +25,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     setHolders(holders: {
         form_record_id: number;
     }[]): void;
+    setOrderId(id?: number): void;
     setBookingSubject(bookingSubject: {
         type?: 'form' | 'customer';
         [key: string]: any;

package/lib/solution/ShopDiscount/index.js

@@ -56,7 +56,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: [],
-      bookingSubject: void 0
+      bookingSubject: void 0,
+      orderId: void 0
     };
   }
   // =========== 生命周期方法 ===========
@@ -198,6 +199,9 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   setHolders(holders) {
     this.store.holders = holders;
   }
+  setOrderId(id) {
+    this.store.orderId = id;
+  }
   setBookingSubject(bookingSubject) {
     this.store.bookingSubject = bookingSubject;
   }
@@ -465,14 +469,16 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   async loadPrepareConfig(params) {
     var _a, _b, _c, _d, _e;
     try {
+      const orderId = this.store.orderId;
       const customerId = params.customerId || ((_a = this.getCustomer()) == null ? void 0 : _a.id);
       const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         customer_id: customerId,
-        action: "create",
+        action: orderId ? "edit" : "create",
         with_good_pass: 1,
         with_discount_card: 1,
         with_wallet_pass_holder: 1,
-        request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
+        request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+        ...orderId ? { order_id: orderId } : {}
       }));
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan

package/lib/solution/ShopDiscount/types.d.ts

@@ -35,4 +35,5 @@ export interface ShopDiscountState {
         type?: 'form' | 'customer';
         [key: string]: any;
     };
+    orderId?: number;
 }

package/lib/solution/ShopDiscount/utils.js

@@ -183,10 +183,10 @@ var isInRepeatingSchedule = (targetDate, targetDateString, targetTimeString, sch
   }
 };
 var isInDailyRepeat = (targetDate, startDate, endDate, repeatRule) => {
-  const daysDiff = targetDate.diff(startDate, "day");
-  if (daysDiff < 0) {
+  if (targetDate.isBefore(startDate)) {
     return false;
   }
+  const daysDiff = targetDate.diff(startDate, "day");
   if (daysDiff % repeatRule.frequency !== 0) {
     return false;
   }
@@ -196,14 +196,14 @@ var isInDailyRepeat = (targetDate, startDate, endDate, repeatRule) => {
   return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay <= endTimeOfDay;
 };
 var isInWeeklyRepeat = (targetDate, startDate, endDate, repeatRule) => {
+  if (targetDate.isBefore(startDate)) {
+    return false;
+  }
   const targetDayOfWeek = targetDate.day();
   if (!repeatRule.frequency_date.includes(targetDayOfWeek)) {
     return false;
   }
   const weeksDiff = targetDate.diff(startDate, "week");
-  if (weeksDiff < 0) {
-    return false;
-  }
   if (weeksDiff % repeatRule.frequency !== 0) {
     return false;
   }

package/package.json

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