@pisell/pisellos 2.2.256 → 2.2.257

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

@@ -0,0 +1,9 @@
+// 导出评估器
+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/Order/index.d.ts

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

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/dist/modules/Product/types.d.ts

@@ -168,6 +168,12 @@ export interface ProductData {
     product_resource?: {
         resources?: ProductResourceItem[];
     };
+    /** 商品级持有人配置，resource_id 对应 holder 表单 id */
+    holder_config?: {
+        status?: string;
+        required?: number | string | boolean;
+        resource_id?: number | string | null;
+    };
     /** 组合商品id，动态附加 */
     product_variant_id?: number;
     /** 套餐信息 */

package/dist/server/index.d.ts

@@ -318,6 +318,13 @@ declare class Server {
      * this.extractQueryDate('2026-04-15 09:58:00') // => '2026-04-15'
      */
     private extractQueryDate;
+    /**
+     * 判断时间范围是否完整落在今天。
+     *
+     * @example
+     * this.isRangeFullyToday('2026-04-15', '2026-04-15') // => true
+     */
+    private isRangeFullyToday;
     /**
      * 判断时间范围是否「开始和结束都不是今天」。
      *
@@ -327,8 +334,8 @@ declare class Server {
     private isRangeBothNotToday;
     /**
      * 订单查询是否走本地：
-     * - 当 start_time 与 end_time 都不是今天时，走远端；
-     * - 其余情况走本地。
+     * - 仅当 start_time 与 end_time 都是今天时，走本地；
+     * - 任意一端不是今天时，走云端，确保跨天查询能拉取非本地窗口数据。
      */
     private shouldUseLocalOrderQuery;
     /**

package/dist/server/index.js

@@ -3247,6 +3247,22 @@ var Server = /*#__PURE__*/function () {
       return text.split('T')[0].split(' ')[0] || null;
     }
 
+    /**
+     * 判断时间范围是否完整落在今天。
+     *
+     * @example
+     * this.isRangeFullyToday('2026-04-15', '2026-04-15') // => true
+     */
+  }, {
+    key: "isRangeFullyToday",
+    value: function isRangeFullyToday(startRaw, endRaw) {
+      var startDate = this.extractQueryDate(startRaw);
+      var endDate = this.extractQueryDate(endRaw);
+      if (!startDate || !endDate) return false;
+      var today = dayjs().format('YYYY-MM-DD');
+      return startDate === today && endDate === today;
+    }
+
     /**
      * 判断时间范围是否「开始和结束都不是今天」。
      *
@@ -3265,13 +3281,13 @@ var Server = /*#__PURE__*/function () {
 
     /**
      * 订单查询是否走本地：
-     * - 当 start_time 与 end_time 都不是今天时，走远端；
-     * - 其余情况走本地。
+     * - 仅当 start_time 与 end_time 都是今天时，走本地；
+     * - 任意一端不是今天时，走云端，确保跨天查询能拉取非本地窗口数据。
      */
   }, {
     key: "shouldUseLocalOrderQuery",
     value: function shouldUseLocalOrderQuery(data) {
-      return !this.isRangeBothNotToday(data === null || data === void 0 ? void 0 : data.start_time, data === null || data === void 0 ? void 0 : data.end_time);
+      return this.isRangeFullyToday(data === null || data === void 0 ? void 0 : data.start_time, data === null || data === void 0 ? void 0 : data.end_time);
     }
 
     /**

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -105,7 +105,9 @@ export function transformBaseProductToOrderProduct(params) {
   var origin = _objectSpread(_objectSpread({}, sourceProduct || {}), callbackOrigin || {});
   var matchedVariant = (_ref15 = (_findVariantById = findVariantById(callbackOrigin, productVariantId)) !== null && _findVariantById !== void 0 ? _findVariantById : findVariantById(sourceProduct, productVariantId)) !== null && _ref15 !== void 0 ? _ref15 : findVariantById(origin, productVariantId);
   var sourceProductPrice = toPriceString((_ref16 = (_ref17 = (_ref18 = (_ref19 = (_ref20 = (_ref21 = (_ref22 = (_payload$price = payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload.selling_price) !== null && _ref22 !== void 0 ? _ref22 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.price) !== null && _ref21 !== void 0 ? _ref21 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.base_price) !== null && _ref20 !== void 0 ? _ref20 : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref19 !== void 0 ? _ref19 : origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _ref18 !== void 0 ? _ref18 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _ref17 !== void 0 ? _ref17 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.selling_price) !== null && _ref16 !== void 0 ? _ref16 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price, '0.00');
-  var lineCompositeTotal = toPriceString((_ref23 = (_payload$line_total = payload.line_total) !== null && _payload$line_total !== void 0 ? _payload$line_total : payload.total) !== null && _ref23 !== void 0 ? _ref23 : (_payload$_extend = payload._extend) === null || _payload$_extend === void 0 ? void 0 : _payload$_extend.total, sourceProductPrice);
+  var explicitLineTotal = (_ref23 = (_payload$line_total = payload.line_total) !== null && _payload$line_total !== void 0 ? _payload$line_total : payload.total) !== null && _ref23 !== void 0 ? _ref23 : (_payload$_extend = payload._extend) === null || _payload$_extend === void 0 ? void 0 : _payload$_extend.total;
+  var hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
+  var lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
   var hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
   var productOptionItem = normalizeProductSkuOptions(normalizeOptionItems((_ref24 = (_ref25 = (_payload$product_sku$ = (_payload$product_sku = payload.product_sku) === null || _payload$product_sku === void 0 ? void 0 : _payload$product_sku.option) !== null && _payload$product_sku$ !== void 0 ? _payload$product_sku$ : payload.option) !== null && _ref25 !== void 0 ? _ref25 : payload.options) !== null && _ref24 !== void 0 ? _ref24 : payload.product_option_item));
   var productBundle = normalizeBundleItems((_payload$bundle = payload.bundle) !== null && _payload$bundle !== void 0 ? _payload$bundle : payload.product_bundle, hasPriceOverride);
@@ -148,7 +150,7 @@ export function transformBaseProductToOrderProduct(params) {
     mainPrice: 0,
     bundle: productBundle
   });
-  var derivedMainSelling = Number(lineCompositeTotal) - Number(bundleOnlyComposite);
+  var derivedMainSelling = hasExplicitLineTotal ? Number(lineCompositeTotal) - Number(bundleOnlyComposite) : Number(mainProductOriginalPrice);
   var mainProductSellingPrice = toPriceString(Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice));
   var metadata = _objectSpread(_objectSpread({
     unique: payload.unique,

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

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

@@ -0,0 +1,49 @@
+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/Order/index.d.ts

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

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/lib/modules/Product/types.d.ts

@@ -168,6 +168,12 @@ export interface ProductData {
     product_resource?: {
         resources?: ProductResourceItem[];
     };
+    /** 商品级持有人配置，resource_id 对应 holder 表单 id */
+    holder_config?: {
+        status?: string;
+        required?: number | string | boolean;
+        resource_id?: number | string | null;
+    };
     /** 组合商品id，动态附加 */
     product_variant_id?: number;
     /** 套餐信息 */

package/lib/server/index.d.ts

@@ -318,6 +318,13 @@ declare class Server {
      * this.extractQueryDate('2026-04-15 09:58:00') // => '2026-04-15'
      */
     private extractQueryDate;
+    /**
+     * 判断时间范围是否完整落在今天。
+     *
+     * @example
+     * this.isRangeFullyToday('2026-04-15', '2026-04-15') // => true
+     */
+    private isRangeFullyToday;
     /**
      * 判断时间范围是否「开始和结束都不是今天」。
      *
@@ -327,8 +334,8 @@ declare class Server {
     private isRangeBothNotToday;
     /**
      * 订单查询是否走本地：
-     * - 当 start_time 与 end_time 都不是今天时，走远端；
-     * - 其余情况走本地。
+     * - 仅当 start_time 与 end_time 都是今天时，走本地；
+     * - 任意一端不是今天时，走云端，确保跨天查询能拉取非本地窗口数据。
      */
     private shouldUseLocalOrderQuery;
     /**

package/lib/server/index.js

@@ -1988,6 +1988,20 @@ var Server = class {
       return null;
     return text.split("T")[0].split(" ")[0] || null;
   }
+  /**
+   * 判断时间范围是否完整落在今天。
+   *
+   * @example
+   * this.isRangeFullyToday('2026-04-15', '2026-04-15') // => true
+   */
+  isRangeFullyToday(startRaw, endRaw) {
+    const startDate = this.extractQueryDate(startRaw);
+    const endDate = this.extractQueryDate(endRaw);
+    if (!startDate || !endDate)
+      return false;
+    const today = (0, import_dayjs.default)().format("YYYY-MM-DD");
+    return startDate === today && endDate === today;
+  }
   /**
    * 判断时间范围是否「开始和结束都不是今天」。
    *
@@ -2004,11 +2018,11 @@ var Server = class {
   }
   /**
    * 订单查询是否走本地：
-   * - 当 start_time 与 end_time 都不是今天时，走远端；
-   * - 其余情况走本地。
+   * - 仅当 start_time 与 end_time 都是今天时，走本地；
+   * - 任意一端不是今天时，走云端，确保跨天查询能拉取非本地窗口数据。
    */
   shouldUseLocalOrderQuery(data) {
-    return !this.isRangeBothNotToday(data == null ? void 0 : data.start_time, data == null ? void 0 : data.end_time);
+    return this.isRangeFullyToday(data == null ? void 0 : data.start_time, data == null ? void 0 : data.end_time);
   }
   /**
    * 预约查询是否走本地：

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -129,10 +129,9 @@ function transformBaseProductToOrderProduct(params) {
     payload.price ?? payload.selling_price ?? (matchedVariant == null ? void 0 : matchedVariant.price) ?? (matchedVariant == null ? void 0 : matchedVariant.base_price) ?? (origin == null ? void 0 : origin.price) ?? (origin == null ? void 0 : origin.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price) ?? (sourceProduct == null ? void 0 : sourceProduct.selling_price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price),
     "0.00"
   );
-  const lineCompositeTotal = toPriceString(
-    payload.line_total ?? payload.total ?? ((_c = payload._extend) == null ? void 0 : _c.total),
-    sourceProductPrice
-  );
+  const explicitLineTotal = payload.line_total ?? payload.total ?? ((_c = payload._extend) == null ? void 0 : _c.total);
+  const hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
+  const lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
   const hasPriceOverride = payload.price_override !== void 0 && payload.price_override !== null && payload.price_override !== "";
   const productOptionItem = (0, import_utils.normalizeProductSkuOptions)(
     normalizeOptionItems(
@@ -180,7 +179,7 @@ function transformBaseProductToOrderProduct(params) {
   const optionSum = (0, import_utils.sumOptionUnitPrice)(productOptionItem).toNumber();
   const mainProductOriginalPrice = toPriceString(Number(sourceProductPrice) + optionSum);
   const bundleOnlyComposite = (0, import_utils.composeLinePrice)({ mainPrice: 0, bundle: productBundle });
-  const derivedMainSelling = Number(lineCompositeTotal) - Number(bundleOnlyComposite);
+  const derivedMainSelling = hasExplicitLineTotal ? Number(lineCompositeTotal) - Number(bundleOnlyComposite) : Number(mainProductOriginalPrice);
   const mainProductSellingPrice = toPriceString(
     Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice)
   );

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

package/package.json

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