@pisell/pisellos 2.2.270 → 2.2.271

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, ITEM_REWARD_STRATEGY } from "./examples";

package/dist/modules/Rules/index.js

@@ -1178,12 +1178,18 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false;
         });
 
-        // 选择第一个适用的优惠券（已经按过期时间排序）
-        // 如果有 isScan 且 isSelected 的折扣卡，则优先选中，否则再选择第一个
-        // 用于处理：先手动扫描了一张折扣卡，扫描完以后带入客户信息，但是之前那张折扣卡不是最优惠的情况
-        var selectedDiscountCard = applicableDiscounts.find(function (n) {
+        // 用户显式点击某张折扣卡时，本次选择优先于自动排序和扫码默认选择。
+        // 目标仍必须在当前商品的 applicableDiscounts 中，因此不会绕过 Holder、时间或商品范围校验。
+        var explicitlySelectedDiscountCard = (options === null || options === void 0 ? void 0 : options.isSelected) === true && options.discountId !== undefined ? applicableDiscounts.find(function (discount) {
+          var discountType = discount.tag || discount.type;
+          return String(discount.id) === String(options.discountId) && ['discount_card', 'product_discount_card'].includes(discountType);
+        }) : undefined;
+
+        // 没有显式选择时保持现有行为：扫码且已选中的折扣卡优先，否则使用自动排序第一项。
+        var scannedSelectedDiscountCard = applicableDiscounts.find(function (n) {
           return n.isScan && n.isSelected && (n.tag || n.type) !== 'good_pass';
         });
+        var selectedDiscountCard = explicitlySelectedDiscountCard || scannedSelectedDiscountCard;
         var selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
 
         // 如果是手动折扣，则不适用优惠券

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 | 4 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 4 | 3 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -191,10 +191,12 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      */
     getCustomer(): ICustomer | null;
     /**
-     * 通过 ids 获取商品列表（不加载到模块中）
-     * @returns 商品列表
+     * 通过 ids 获取商品列表；默认只读取内存，显式开启 loadMissing 时按当前订单上下文补查缺失商品。
+     * 补查直接写入 ProductList，不更新 BookingTicket.productCatalog，避免当前商品列表被查询子集覆盖。
      */
-    getProductByIds(ids: number[]): Promise<ProductData[] | undefined>;
+    getProductByIds(ids: number[], options?: {
+        loadMissing?: boolean;
+    }): Promise<ProductData[]>;
     /**
      * 获取日程时间段点
      * @param params 参数

package/dist/solution/BookingTicket/index.js

@@ -1270,24 +1270,88 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     }
 
     /**
-     * 通过 ids 获取商品列表（不加载到模块中）
-     * @returns 商品列表
+     * 通过 ids 获取商品列表；默认只读取内存，显式开启 loadMissing 时按当前订单上下文补查缺失商品。
+     * 补查直接写入 ProductList，不更新 BookingTicket.productCatalog，避免当前商品列表被查询子集覆盖。
      */
   }, {
     key: "getProductByIds",
     value: (function () {
-      var _getProductByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(ids) {
+      var _getProductByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(ids, options) {
+        var _this$getOrderCustome, _this$getOrderCustome2, _this$getOrderCustome3;
+        var normalizedIds, localProducts, localProductIds, missingIds, rawBookingDate, bookingDate, customerId, loadedProducts, productById;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              return _context18.abrupt("return", this.store.products.getProductByIds(ids));
-            case 1:
+              normalizedIds = Array.from(new Set((ids || []).map(function (id) {
+                return Number(id);
+              }).filter(function (id) {
+                return Number.isFinite(id);
+              })));
+              _context18.next = 3;
+              return this.store.products.getProductByIds(normalizedIds);
+            case 3:
+              _context18.t0 = _context18.sent;
+              if (_context18.t0) {
+                _context18.next = 6;
+                break;
+              }
+              _context18.t0 = [];
+            case 6:
+              localProducts = _context18.t0;
+              if (options !== null && options !== void 0 && options.loadMissing) {
+                _context18.next = 9;
+                break;
+              }
+              return _context18.abrupt("return", localProducts);
+            case 9:
+              localProductIds = new Set(localProducts.map(function (product) {
+                return Number(product.id);
+              }));
+              missingIds = normalizedIds.filter(function (id) {
+                return !localProductIds.has(id);
+              });
+              if (missingIds.length) {
+                _context18.next = 13;
+                break;
+              }
+              return _context18.abrupt("return", localProducts);
+            case 13:
+              rawBookingDate = this.getBookingDate();
+              bookingDate = rawBookingDate && dayjs(rawBookingDate).isValid() ? dayjs(rawBookingDate) : null;
+              customerId = Number((_this$getOrderCustome = (_this$getOrderCustome2 = this.getOrderCustomerSnapshot()) === null || _this$getOrderCustome2 === void 0 ? void 0 : _this$getOrderCustome2.id) !== null && _this$getOrderCustome !== void 0 ? _this$getOrderCustome : (_this$getOrderCustome3 = this.getOrderCustomer()) === null || _this$getOrderCustome3 === void 0 ? void 0 : _this$getOrderCustome3.customer_id);
+              _context18.next = 18;
+              return this.store.products.loadProducts(_objectSpread(_objectSpread({
+                product_ids: missingIds,
+                with_count: ['bundleGroup', 'optionGroup'],
+                with_schedule: 1,
+                cacheId: this.cacheId
+              }, bookingDate ? {
+                schedule_date: bookingDate.format('YYYY-MM-DD'),
+                schedule_datetime: bookingDate.format('YYYY-MM-DD HH:mm:ss')
+              } : {}), Number.isFinite(customerId) && customerId > 0 ? {
+                customer_id: customerId
+              } : {}));
+            case 18:
+              loadedProducts = _context18.sent;
+              productById = new Map();
+              [].concat(_toConsumableArray(localProducts), _toConsumableArray(loadedProducts || [])).forEach(function (product) {
+                var productId = Number(product.id);
+                if (Number.isFinite(productId)) {
+                  productById.set(productId, product);
+                }
+              });
+              return _context18.abrupt("return", normalizedIds.map(function (id) {
+                return productById.get(id);
+              }).filter(function (product) {
+                return Boolean(product);
+              }));
+            case 22:
             case "end":
               return _context18.stop();
           }
         }, _callee18, this);
       }));
-      function getProductByIds(_x13) {
+      function getProductByIds(_x13, _x14) {
         return _getProductByIds.apply(this, arguments);
       }
       return getProductByIds;
@@ -1321,7 +1385,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee19, this);
       }));
-      function getScheduleTimePoints(_x14) {
+      function getScheduleTimePoints(_x15) {
         return _getScheduleTimePoints.apply(this, arguments);
       }
       return getScheduleTimePoints;
@@ -1711,7 +1775,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee23, this, [[0, 7]]);
       }));
-      function changeCustomerPage(_x15, _x16) {
+      function changeCustomerPage(_x16, _x17) {
         return _changeCustomerPage.apply(this, arguments);
       }
       return changeCustomerPage;
@@ -2165,10 +2229,10 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "buildAddProductCtx",
     value: function buildAddProductCtx(extra) {
-      var _extra$date2, _ref12, _this$getOrderCustome, _this$getOrderCustome2, _this$store$order$get4, _extra$presetStartTim2;
+      var _extra$date2, _ref12, _this$getOrderCustome4, _this$getOrderCustome5, _this$store$order$get4, _extra$presetStartTim2;
       var bookingContextState = this.store.bookingContext.getState();
       var date = (_extra$date2 = extra === null || extra === void 0 ? void 0 : extra.date) !== null && _extra$date2 !== void 0 ? _extra$date2 : bookingContextState.date;
-      var orderCustomerId = (_ref12 = (_this$getOrderCustome = (_this$getOrderCustome2 = this.getOrderCustomerSnapshot()) === null || _this$getOrderCustome2 === void 0 ? void 0 : _this$getOrderCustome2.id) !== null && _this$getOrderCustome !== void 0 ? _this$getOrderCustome : (_this$store$order$get4 = this.store.order.getTempOrder()) === null || _this$store$order$get4 === void 0 ? void 0 : _this$store$order$get4.customer_id) !== null && _ref12 !== void 0 ? _ref12 : undefined;
+      var orderCustomerId = (_ref12 = (_this$getOrderCustome4 = (_this$getOrderCustome5 = this.getOrderCustomerSnapshot()) === null || _this$getOrderCustome5 === void 0 ? void 0 : _this$getOrderCustome5.id) !== null && _this$getOrderCustome4 !== void 0 ? _this$getOrderCustome4 : (_this$store$order$get4 = this.store.order.getTempOrder()) === null || _this$store$order$get4 === void 0 ? void 0 : _this$store$order$get4.customer_id) !== null && _ref12 !== void 0 ? _ref12 : undefined;
       return _objectSpread({
         bookingConfig: bookingContextState.bookingConfig,
         resourcesOrigin: bookingContextState.resourcesOrigin,
@@ -2285,7 +2349,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee27, this);
       }));
-      function updateProductInOrder(_x17) {
+      function updateProductInOrder(_x18) {
         return _updateProductInOrder.apply(this, arguments);
       }
       return updateProductInOrder;
@@ -2394,7 +2458,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee28, this, [[4, 21]]);
       }));
-      function handleGlobalScanCode(_x18, _x19) {
+      function handleGlobalScanCode(_x19, _x20) {
         return _handleGlobalScanCode.apply(this, arguments);
       }
       return handleGlobalScanCode;
@@ -2492,7 +2556,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee29, this);
       }));
-      function addAddTimeProductToBooking(_x20) {
+      function addAddTimeProductToBooking(_x21) {
         return _addAddTimeProductToBooking.apply(this, arguments);
       }
       return addAddTimeProductToBooking;
@@ -2595,7 +2659,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee30, this, [[13, 31, 34, 37]]);
       }));
-      function addAddTimeProductsToBooking(_x21) {
+      function addAddTimeProductsToBooking(_x22) {
         return _addAddTimeProductsToBooking.apply(this, arguments);
       }
       return addAddTimeProductsToBooking;
@@ -2629,7 +2693,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee31, this);
       }));
-      function setOtherParams(_x22) {
+      function setOtherParams(_x23) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;
@@ -2700,7 +2764,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee32, this);
       }));
-      function handlePrintWristband(_x23) {
+      function handlePrintWristband(_x24) {
         return _handlePrintWristband.apply(this, arguments);
       }
       return handlePrintWristband;
@@ -2775,7 +2839,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee33, this);
       }));
-      function handleRedeem(_x24) {
+      function handleRedeem(_x25) {
         return _handleRedeem.apply(this, arguments);
       }
       return handleRedeem;

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

@@ -0,0 +1,51 @@
+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,
+  ITEM_REWARD_STRATEGY: () => import_examples.ITEM_REWARD_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,
+  ITEM_REWARD_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

package/lib/modules/Rules/index.js

@@ -856,9 +856,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         return false;
       });
-      const selectedDiscountCard = applicableDiscounts.find(
+      const explicitlySelectedDiscountCard = (options == null ? void 0 : options.isSelected) === true && options.discountId !== void 0 ? applicableDiscounts.find((discount) => {
+        const discountType = discount.tag || discount.type;
+        return String(discount.id) === String(options.discountId) && ["discount_card", "product_discount_card"].includes(discountType);
+      }) : void 0;
+      const scannedSelectedDiscountCard = applicableDiscounts.find(
         (n) => n.isScan && n.isSelected && (n.tag || n.type) !== "good_pass"
       );
+      const selectedDiscountCard = explicitlySelectedDiscountCard || scannedSelectedDiscountCard;
       const selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
       let isManualDiscount = false;
       let isItemRewardProductDiscount = false;

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 | 4 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 4 | 3 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -191,10 +191,12 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      */
     getCustomer(): ICustomer | null;
     /**
-     * 通过 ids 获取商品列表（不加载到模块中）
-     * @returns 商品列表
+     * 通过 ids 获取商品列表；默认只读取内存，显式开启 loadMissing 时按当前订单上下文补查缺失商品。
+     * 补查直接写入 ProductList，不更新 BookingTicket.productCatalog，避免当前商品列表被查询子集覆盖。
      */
-    getProductByIds(ids: number[]): Promise<ProductData[] | undefined>;
+    getProductByIds(ids: number[], options?: {
+        loadMissing?: boolean;
+    }): Promise<ProductData[]>;
     /**
      * 获取日程时间段点
      * @param params 参数

package/lib/solution/BookingTicket/index.js

@@ -722,11 +722,53 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     return this.getOrderCustomerSnapshot();
   }
   /**
-   * 通过 ids 获取商品列表（不加载到模块中）
-   * @returns 商品列表
+   * 通过 ids 获取商品列表；默认只读取内存，显式开启 loadMissing 时按当前订单上下文补查缺失商品。
+   * 补查直接写入 ProductList，不更新 BookingTicket.productCatalog，避免当前商品列表被查询子集覆盖。
    */
-  async getProductByIds(ids) {
-    return this.store.products.getProductByIds(ids);
+  async getProductByIds(ids, options) {
+    var _a, _b;
+    const normalizedIds = Array.from(
+      new Set(
+        (ids || []).map((id) => Number(id)).filter((id) => Number.isFinite(id))
+      )
+    );
+    const localProducts = await this.store.products.getProductByIds(normalizedIds) || [];
+    if (!(options == null ? void 0 : options.loadMissing)) {
+      return localProducts;
+    }
+    const localProductIds = new Set(
+      localProducts.map((product) => Number(product.id))
+    );
+    const missingIds = normalizedIds.filter(
+      (id) => !localProductIds.has(id)
+    );
+    if (!missingIds.length) {
+      return localProducts;
+    }
+    const rawBookingDate = this.getBookingDate();
+    const bookingDate = rawBookingDate && (0, import_dayjs.default)(rawBookingDate).isValid() ? (0, import_dayjs.default)(rawBookingDate) : null;
+    const customerId = Number(
+      ((_a = this.getOrderCustomerSnapshot()) == null ? void 0 : _a.id) ?? ((_b = this.getOrderCustomer()) == null ? void 0 : _b.customer_id)
+    );
+    const loadedProducts = await this.store.products.loadProducts({
+      product_ids: missingIds,
+      with_count: ["bundleGroup", "optionGroup"],
+      with_schedule: 1,
+      cacheId: this.cacheId,
+      ...bookingDate ? {
+        schedule_date: bookingDate.format("YYYY-MM-DD"),
+        schedule_datetime: bookingDate.format("YYYY-MM-DD HH:mm:ss")
+      } : {},
+      ...Number.isFinite(customerId) && customerId > 0 ? { customer_id: customerId } : {}
+    });
+    const productById = /* @__PURE__ */ new Map();
+    [...localProducts, ...loadedProducts || []].forEach((product) => {
+      const productId = Number(product.id);
+      if (Number.isFinite(productId)) {
+        productById.set(productId, product);
+      }
+    });
+    return normalizedIds.map((id) => productById.get(id)).filter((product) => Boolean(product));
   }
   /**
    * 获取日程时间段点

package/package.json

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