@pisell/pisellos 2.3.3 → 2.3.5

package/dist/core/index.js

@@ -45,7 +45,7 @@ var PisellOSCore = /*#__PURE__*/function () {
       this.serverOptions = options.server;
     }
     this.initialize(options);
-    console.log('constructor1234');
+    console.log('constructor12');
   }
   _createClass(PisellOSCore, [{
     key: "initialize",

package/dist/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -125,6 +125,13 @@ function resolveProductTitle(product, booking, sourceProduct) {
   var metadata = product.metadata || {};
   return (_ref = (_ref2 = (_ref3 = (_ref4 = (_ref5 = (_title = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) !== null && _title !== void 0 ? _title : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.name) !== null && _ref5 !== void 0 ? _ref5 : metadata.product_title) !== null && _ref4 !== void 0 ? _ref4 : metadata.product_name) !== null && _ref3 !== void 0 ? _ref3 : booking === null || booking === void 0 || (_booking$product = booking.product) === null || _booking$product === void 0 ? void 0 : _booking$product.title) !== null && _ref2 !== void 0 ? _ref2 : booking === null || booking === void 0 || (_booking$detail = booking.detail) === null || _booking$detail === void 0 ? void 0 : _booking$detail.product_title) !== null && _ref !== void 0 ? _ref : '';
 }
+function resolveMainProductPrice(product, fallback) {
+  var _metadata$main_produc;
+  var metadata = product.metadata || {};
+  var value = (_metadata$main_produc = metadata.main_product_original_price) !== null && _metadata$main_produc !== void 0 ? _metadata$main_produc : metadata.source_product_price;
+  var parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : fallback;
+}
 
 /**
  * catalog 缺 product_resource 时，从 booking.resources 反推最小 product_resource 结构，
@@ -182,6 +189,7 @@ export function buildCacheItemFromOrderLine(input) {
   var resolvedId = (_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id;
   var selling = Number((_product$selling_pric = product.selling_price) !== null && _product$selling_pric !== void 0 ? _product$selling_pric : 0);
   var original = Number((_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : selling);
+  var mainProductPrice = resolveMainProductPrice(product, selling);
   var startDate = safeFormat(booking.start_date, 'YYYY-MM-DD');
   var endDate = safeFormat(booking.end_date, 'YYYY-MM-DD');
   var startTime = normalizeTimeString(booking.start_time);
@@ -208,7 +216,7 @@ export function buildCacheItemFromOrderLine(input) {
     quantity: (_product$num = product.num) !== null && _product$num !== void 0 ? _product$num : 1,
     product_name: productTitle,
     note: (_ref8 = (_product$note = product.note) !== null && _product$note !== void 0 ? _product$note : booking === null || booking === void 0 || (_booking$detail2 = booking.detail) === null || _booking$detail2 === void 0 ? void 0 : _booking$detail2.note) !== null && _ref8 !== void 0 ? _ref8 : '',
-    price: selling,
+    price: mainProductPrice,
     total: selling,
     origin_total: original,
     resource: resource,

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: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

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

package/lib/core/index.js

@@ -50,7 +50,7 @@ var PisellOSCore = class {
       this.serverOptions = options.server;
     }
     this.initialize(options);
-    console.log("constructor1234");
+    console.log("constructor12");
   }
   initialize(options) {
     if (options == null ? void 0 : options.plugins) {

package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -136,6 +136,12 @@ function resolveProductTitle(product, booking, sourceProduct) {
   const metadata = product.metadata || {};
   return (sourceProduct == null ? void 0 : sourceProduct.title) ?? (sourceProduct == null ? void 0 : sourceProduct.name) ?? metadata.product_title ?? metadata.product_name ?? ((_a = booking == null ? void 0 : booking.product) == null ? void 0 : _a.title) ?? ((_b = booking == null ? void 0 : booking.detail) == null ? void 0 : _b.product_title) ?? "";
 }
+function resolveMainProductPrice(product, fallback) {
+  const metadata = product.metadata || {};
+  const value = metadata.main_product_original_price ?? metadata.source_product_price;
+  const parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : fallback;
+}
 function synthesizeProductResourceFromBooking(booking) {
   const rows = booking == null ? void 0 : booking.resources;
   if (!Array.isArray(rows) || rows.length === 0)
@@ -172,6 +178,7 @@ function buildCacheItemFromOrderLine(input) {
   const resolvedId = product.product_id ?? (sourceProduct == null ? void 0 : sourceProduct.id);
   const selling = Number(product.selling_price ?? 0);
   const original = Number(product.original_price ?? selling);
+  const mainProductPrice = resolveMainProductPrice(product, selling);
   const startDate = safeFormat(booking.start_date, "YYYY-MM-DD");
   const endDate = safeFormat(booking.end_date, "YYYY-MM-DD");
   const startTime = normalizeTimeString(booking.start_time);
@@ -198,7 +205,7 @@ function buildCacheItemFromOrderLine(input) {
     quantity: product.num ?? 1,
     product_name: productTitle,
     note: product.note ?? ((_b = booking == null ? void 0 : booking.detail) == null ? void 0 : _b.note) ?? "",
-    price: selling,
+    price: mainProductPrice,
     total: selling,
     origin_total: original,
     resource,

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: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

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

package/package.json

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