@pisell/pisellos 2.3.89 → 2.3.91

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

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

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

@@ -50,11 +50,12 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      */
     private getTimelineBucketMinutes;
     /**
-     * 解析营业日统计窗口：
+     * 解析 current 所属营业日窗口：
      * - 当 operating_day_boundary.type === 'start_time'
-     *   使用「今天 + boundary.time」到「明天 + boundary.time」
+     *   使用「最近一个 boundary.time」到「下一个 boundary.time」
      * - 否则回退自然日（00:00 到次日 00:00）
      */
+    private getOperatingDayRange;
     private getTimelineRangeByOperatingBoundary;
     /**
      * 统计时间轴每个时间片的预约数量。
@@ -95,7 +96,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      * 2) 若无 active，返回已超时且仍占用中的预约（允许并发多条）
      * 3) 若仍无，返回最近一组未来预约（同 start_time 的并发预约全部返回）
      * 4) 最后兜底返回一条（避免资源有历史预约时完全无反馈）
-     * - includeAllFuture 时，保留选中预约并返回当天全部后续预约；仅详情接口启用。
+     * - includeAllFuture 时，保留选中预约并返回当前营业日全部后续预约；仅详情接口启用。
      */
     private pickBookingsForCurrentPoint;
     /**

package/dist/solution/Sales/index.js

@@ -258,19 +258,19 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
     }
 
     /**
-     * 解析营业日统计窗口：
+     * 解析 current 所属营业日窗口：
      * - 当 operating_day_boundary.type === 'start_time'
-     *   使用「今天 + boundary.time」到「明天 + boundary.time」
+     *   使用「最近一个 boundary.time」到「下一个 boundary.time」
      * - 否则回退自然日（00:00 到次日 00:00）
      */
   }, {
-    key: "getTimelineRangeByOperatingBoundary",
-    value: function getTimelineRangeByOperatingBoundary() {
-      var _appPlugin$getApp, _appPlugin$getApp$get, _appPlugin$getApp$get2, _appPlugin$getApp$get3, _coreData$core;
-      var today = dayjs();
-      var defaultStart = today.startOf('day');
+    key: "getOperatingDayRange",
+    value: function getOperatingDayRange() {
+      var _this$core, _appPlugin$getApp, _appPlugin$getApp$get, _appPlugin$getApp$get2, _appPlugin$getApp$get3, _coreData$core;
+      var referenceTime = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : dayjs();
+      var defaultStart = referenceTime.startOf('day');
       var defaultEndExclusive = defaultStart.add(1, 'day');
-      var appPlugin = this.core.getPlugin('app');
+      var appPlugin = (_this$core = this.core) === null || _this$core === void 0 ? void 0 : _this$core.getPlugin('app');
       var coreData = appPlugin === null || appPlugin === void 0 || (_appPlugin$getApp = appPlugin.getApp()) === null || _appPlugin$getApp === void 0 || (_appPlugin$getApp = _appPlugin$getApp.data) === null || _appPlugin$getApp === void 0 || (_appPlugin$getApp = _appPlugin$getApp.store) === null || _appPlugin$getApp === void 0 || (_appPlugin$getApp$get = _appPlugin$getApp.getStore) === null || _appPlugin$getApp$get === void 0 || (_appPlugin$getApp$get2 = (_appPlugin$getApp$get3 = _appPlugin$getApp$get.call(_appPlugin$getApp)).getDataByModel) === null || _appPlugin$getApp$get2 === void 0 ? void 0 : _appPlugin$getApp$get2.call(_appPlugin$getApp$get3, 'core');
       var operatingDayBoundary = coreData === null || coreData === void 0 || (_coreData$core = coreData.core) === null || _coreData$core === void 0 ? void 0 : _coreData$core.operating_day_boundary;
       if ((operatingDayBoundary === null || operatingDayBoundary === void 0 ? void 0 : operatingDayBoundary.type) !== 'start_time') {
@@ -280,18 +280,24 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
         };
       }
       var boundaryTime = String(operatingDayBoundary.time || '').trim();
-      var startAt = dayjs("".concat(today.format('YYYY-MM-DD'), " ").concat(boundaryTime));
-      if (!startAt.isValid()) {
+      var boundaryStart = dayjs("".concat(referenceTime.format('YYYY-MM-DD'), " ").concat(boundaryTime));
+      if (!boundaryStart.isValid()) {
         return {
           startAt: defaultStart,
           endExclusiveAt: defaultEndExclusive
         };
       }
+      var startAt = referenceTime.isBefore(boundaryStart) ? boundaryStart.subtract(1, 'day') : boundaryStart;
       return {
         startAt: startAt,
         endExclusiveAt: startAt.add(1, 'day')
       };
     }
+  }, {
+    key: "getTimelineRangeByOperatingBoundary",
+    value: function getTimelineRangeByOperatingBoundary() {
+      return this.getOperatingDayRange();
+    }
 
     /**
      * 统计时间轴每个时间片的预约数量。
@@ -485,7 +491,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
      * 2) 若无 active，返回已超时且仍占用中的预约（允许并发多条）
      * 3) 若仍无，返回最近一组未来预约（同 start_time 的并发预约全部返回）
      * 4) 最后兜底返回一条（避免资源有历史预约时完全无反馈）
-     * - includeAllFuture 时，保留选中预约并返回当天全部后续预约；仅详情接口启用。
+     * - includeAllFuture 时，保留选中预约并返回当前营业日全部后续预约；仅详情接口启用。
      */
   }, {
     key: "pickBookingsForCurrentPoint",
@@ -493,15 +499,16 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _this4 = this;
       var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       if (bookings.length === 0) return [];
-      var currentDayStart = current.startOf('day');
-      var currentDayEnd = current.endOf('day');
+      var _this$getOperatingDay = this.getOperatingDayRange(current),
+        operatingDayStart = _this$getOperatingDay.startAt,
+        operatingDayEndExclusive = _this$getOperatingDay.endExclusiveAt;
 
-      // 仅保留与 current 当天有时间交集的预约，避免跨天误命中
+      // 仅保留与 current 所属营业日窗口有时间交集的预约，避免跨营业日误命中
       var dayScopedBookings = bookings.filter(function (booking) {
         var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
         var endAt = _this4.toBookingDateTime(booking.end_date, booking.end_time);
         if (!startAt.isValid() || !endAt.isValid()) return false;
-        return _this4.isSameOrBefore(startAt, currentDayEnd) && _this4.isSameOrAfter(endAt, currentDayStart);
+        return startAt.isBefore(operatingDayEndExclusive) && _this4.isSameOrAfter(endAt, operatingDayStart);
       });
       if (dayScopedBookings.length === 0) return [];
       var appendNextStartGroupIfNeeded = function appendNextStartGroupIfNeeded(selectedBookings) {
@@ -560,7 +567,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       // upcoming: 从未来预约里只取最早那一组（同 start_time）
       var upcoming = dayScopedBookings.filter(function (booking) {
         var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
-        return startAt.isValid() && startAt.isAfter(current) && startAt.isSame(current, 'day');
+        return startAt.isValid() && startAt.isAfter(current);
       });
       if (upcoming.length > 0) {
         if (options.includeAllFuture) return upcoming;

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

@@ -1,46 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.ITEM_REWARD_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "PromotionAdapter", {
-  enumerable: true,
-  get: function () {
-    return _adapter.PromotionAdapter;
-  }
-});
-Object.defineProperty(exports, "PromotionEvaluator", {
-  enumerable: true,
-  get: function () {
-    return _evaluator.PromotionEvaluator;
-  }
-});
-Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function () {
-    return _adapter.default;
-  }
-});
-var _evaluator = require("./evaluator");
-var _adapter = _interopRequireWildcard(require("./adapter"));
-var _examples = require("./examples");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+"use strict";

package/lib/modules/Order/utils.js

@@ -855,6 +855,11 @@ function normalizeSubmitPlatform(platform) {
   if (lower === 'h5') return 'H5';
   return value;
 }
+function normalizeSubmitProductionCode(value) {
+  if (value === undefined || value === null) return undefined;
+  const productionCode = String(value).trim();
+  return productionCode || undefined;
+}
 
 // 后端 checkout 协议字段 option_group_item_id；tempOrder 内部也保持同一字段名。
 function formatSubmitOptionItems(options) {
@@ -866,6 +871,9 @@ function formatSubmitOptionItems(options) {
       option_group_item_id: d?.option_group_item_id,
       option_group_id: d?.option_group_id
     };
+    const productionCode = normalizeSubmitProductionCode(d?.production_code);
+    delete option.production_code;
+    if (productionCode !== undefined) option.production_code = productionCode;
     const addPrice = d?.add_price ?? d?.price;
     if (addPrice !== undefined) option.add_price = String(addPrice);
     delete option.price;
@@ -906,10 +914,13 @@ function formatSubmitBundleItems(bundle) {
     const num = toBundleNumber(rawBundle.num ?? rawBundle.quantity, 1);
     const bundleMapId = resolveSubmitBundleMapId(rawBundle);
     const hasSubmitBundleDiscounts = Array.isArray(rawBundle.discount_list) && rawBundle.discount_list.length > 0;
+    const productionCode = normalizeSubmitProductionCode(rawBundle.production_code);
     return {
       is_charge_tax: rawBundle.is_charge_tax ?? 0,
       bundle_variant_id: rawBundle.bundle_variant_id ?? 0,
-      production_code: rawBundle.production_code,
+      ...(productionCode !== undefined ? {
+        production_code: productionCode
+      } : {}),
       num,
       quantity: toBundleNumber(rawBundle.quantity ?? rawBundle.num, num),
       extension_id: rawBundle.extension_id ?? 0,
@@ -966,8 +977,10 @@ function normalizeSubmitProduct(product) {
     discountway: _deprecatedDiscountway,
     product_discount_reason: _deprecatedProductDiscountReason,
     discount_per: _deprecatedDiscountPer,
+    production_code: rawProductionCode,
     ...productRest
   } = submitProduct;
+  const productionCode = normalizeSubmitProductionCode(rawProductionCode);
   delete productRest[`product_${'option'}_item`];
   const rawMetadata = submitProduct.metadata || {};
   const bookingUid = rawMetadata.booking_uid;
@@ -1001,6 +1014,9 @@ function normalizeSubmitProduct(product) {
   };
   return {
     ...productRest,
+    ...(productionCode !== undefined ? {
+      production_code: productionCode
+    } : {}),
     ...(bookingUid ? {
       booking_uid: bookingUid
     } : {}),

package/lib/server/index.d.ts

@@ -128,6 +128,9 @@ declare class Server {
     private runCheckoutSync;
     private omitCheckoutSyncMode;
     private buildRemoteCheckoutData;
+    private buildCheckoutDeviceHeaders;
+    private applyKioskCheckoutOperator;
+    private resolveKioskCheckoutOperatorId;
     private mergeCheckoutSyncPayments;
     private persistSyncedCheckoutOrder;
     /**

package/lib/server/index.js

@@ -629,12 +629,16 @@ class Server {
     const numberedData = await this.ensureCheckoutOrderNumbers(normalizedData, title);
     const checkoutData = this.applyCheckoutFulfillmentBuzzer(numberedData, title);
     const remoteCheckoutData = this.buildRemoteCheckoutData(checkoutData, title);
+    const deviceHeaders = await this.buildCheckoutDeviceHeaders(title);
     if (!this.app?.request?.post) {
       throw new Error('app.request 不可用');
     }
     const response = await this.app.request.post(backendPath, remoteCheckoutData, {
       isShopApi: true,
-      customToast: () => {}
+      customToast: () => {},
+      ...(Object.keys(deviceHeaders).length > 0 ? {
+        headers: deviceHeaders
+      } : {})
     });
     if (this.isCheckoutResponseRejected(response)) {
       return {
@@ -697,6 +701,7 @@ class Server {
     if (!next || typeof next !== 'object') return next;
     const record = next;
     delete record[OS_FULFILLMENT_REF_MODE_FIELD];
+    this.applyKioskCheckoutOperator(record);
     if (!Array.isArray(record.payments)) return next;
     const originalPayments = record.payments;
     const filteredPayments = originalPayments.filter(payment => !(0, _paymentUtils.isPendingOrderPayment)(payment));
@@ -711,6 +716,44 @@ class Server {
     });
     return next;
   }
+  async buildCheckoutDeviceHeaders(title) {
+    const getAsyncIotDeviceInfo = this.getAppData('async_iot_device_info');
+    if (!getAsyncIotDeviceInfo) return {};
+    let deviceInfo;
+    try {
+      deviceInfo = typeof getAsyncIotDeviceInfo === 'function' ? await getAsyncIotDeviceInfo() : getAsyncIotDeviceInfo;
+    } catch (error) {
+      this.logWarning(`${title}: 读取 async_iot_device_info 失败，跳过 checkout 设备请求头`, {
+        error: this.getUnknownErrorMessage(error)
+      });
+      return {};
+    }
+    if (!deviceInfo || typeof deviceInfo !== 'object') return {};
+    const headers = {};
+    const assignHeader = (key, value) => {
+      if (this.isBlankCheckoutValue(value)) return;
+      headers[key] = String(value);
+    };
+    assignHeader('Device-ID', deviceInfo.id);
+    assignHeader('Device-Type-Code', deviceInfo.type_code);
+    assignHeader('Device-Model-Code', deviceInfo.model_code);
+    return headers;
+  }
+  applyKioskCheckoutOperator(record) {
+    if (record.platform !== 'kiosk') return;
+    record.operator_type = 'customer';
+    record.operator_id = this.resolveKioskCheckoutOperatorId(record.customer_id);
+  }
+  resolveKioskCheckoutOperatorId(customerId) {
+    if (customerId === undefined || customerId === null) return 1;
+    if (typeof customerId === 'string') {
+      const trimmed = customerId.trim();
+      if (trimmed === '' || trimmed === '0' || trimmed === '1') return 1;
+      return customerId;
+    }
+    if (customerId === 0 || customerId === 1) return 1;
+    return customerId;
+  }
   mergeCheckoutSyncPayments(checkoutData, fresh, title) {
     const localPayments = Array.isArray(checkoutData?.payments) ? checkoutData.payments : [];
     const freshRecord = fresh;

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

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

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

@@ -50,11 +50,12 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      */
     private getTimelineBucketMinutes;
     /**
-     * 解析营业日统计窗口：
+     * 解析 current 所属营业日窗口：
      * - 当 operating_day_boundary.type === 'start_time'
-     *   使用「今天 + boundary.time」到「明天 + boundary.time」
+     *   使用「最近一个 boundary.time」到「下一个 boundary.time」
      * - 否则回退自然日（00:00 到次日 00:00）
      */
+    private getOperatingDayRange;
     private getTimelineRangeByOperatingBoundary;
     /**
      * 统计时间轴每个时间片的预约数量。
@@ -95,7 +96,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      * 2) 若无 active，返回已超时且仍占用中的预约（允许并发多条）
      * 3) 若仍无，返回最近一组未来预约（同 start_time 的并发预约全部返回）
      * 4) 最后兜底返回一条（避免资源有历史预约时完全无反馈）
-     * - includeAllFuture 时，保留选中预约并返回当天全部后续预约；仅详情接口启用。
+     * - includeAllFuture 时，保留选中预约并返回当前营业日全部后续预约；仅详情接口启用。
      */
     private pickBookingsForCurrentPoint;
     /**

package/lib/solution/Sales/index.js

@@ -160,16 +160,15 @@ class SalesImpl extends _BaseModule.BaseModule {
   }
 
   /**
-   * 解析营业日统计窗口：
+   * 解析 current 所属营业日窗口：
    * - 当 operating_day_boundary.type === 'start_time'
-   *   使用「今天 + boundary.time」到「明天 + boundary.time」
+   *   使用「最近一个 boundary.time」到「下一个 boundary.time」
    * - 否则回退自然日（00:00 到次日 00:00）
    */
-  getTimelineRangeByOperatingBoundary() {
-    const today = (0, _dayjs.default)();
-    const defaultStart = today.startOf('day');
+  getOperatingDayRange(referenceTime = (0, _dayjs.default)()) {
+    const defaultStart = referenceTime.startOf('day');
     const defaultEndExclusive = defaultStart.add(1, 'day');
-    const appPlugin = this.core.getPlugin('app');
+    const appPlugin = this.core?.getPlugin('app');
     const coreData = appPlugin?.getApp()?.data?.store?.getStore?.().getDataByModel?.('core');
     const operatingDayBoundary = coreData?.core?.operating_day_boundary;
     if (operatingDayBoundary?.type !== 'start_time') {
@@ -179,18 +178,22 @@ class SalesImpl extends _BaseModule.BaseModule {
       };
     }
     const boundaryTime = String(operatingDayBoundary.time || '').trim();
-    const startAt = (0, _dayjs.default)(`${today.format('YYYY-MM-DD')} ${boundaryTime}`);
-    if (!startAt.isValid()) {
+    const boundaryStart = (0, _dayjs.default)(`${referenceTime.format('YYYY-MM-DD')} ${boundaryTime}`);
+    if (!boundaryStart.isValid()) {
       return {
         startAt: defaultStart,
         endExclusiveAt: defaultEndExclusive
       };
     }
+    const startAt = referenceTime.isBefore(boundaryStart) ? boundaryStart.subtract(1, 'day') : boundaryStart;
     return {
       startAt,
       endExclusiveAt: startAt.add(1, 'day')
     };
   }
+  getTimelineRangeByOperatingBoundary() {
+    return this.getOperatingDayRange();
+  }
 
   /**
    * 统计时间轴每个时间片的预约数量。
@@ -343,19 +346,21 @@ class SalesImpl extends _BaseModule.BaseModule {
    * 2) 若无 active，返回已超时且仍占用中的预约（允许并发多条）
    * 3) 若仍无，返回最近一组未来预约（同 start_time 的并发预约全部返回）
    * 4) 最后兜底返回一条（避免资源有历史预约时完全无反馈）
-   * - includeAllFuture 时，保留选中预约并返回当天全部后续预约；仅详情接口启用。
+   * - includeAllFuture 时，保留选中预约并返回当前营业日全部后续预约；仅详情接口启用。
    */
   pickBookingsForCurrentPoint(current, bookings, options = {}) {
     if (bookings.length === 0) return [];
-    const currentDayStart = current.startOf('day');
-    const currentDayEnd = current.endOf('day');
+    const {
+      startAt: operatingDayStart,
+      endExclusiveAt: operatingDayEndExclusive
+    } = this.getOperatingDayRange(current);
 
-    // 仅保留与 current 当天有时间交集的预约，避免跨天误命中
+    // 仅保留与 current 所属营业日窗口有时间交集的预约，避免跨营业日误命中
     const dayScopedBookings = bookings.filter(booking => {
       const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
       const endAt = this.toBookingDateTime(booking.end_date, booking.end_time);
       if (!startAt.isValid() || !endAt.isValid()) return false;
-      return this.isSameOrBefore(startAt, currentDayEnd) && this.isSameOrAfter(endAt, currentDayStart);
+      return startAt.isBefore(operatingDayEndExclusive) && this.isSameOrAfter(endAt, operatingDayStart);
     });
     if (dayScopedBookings.length === 0) return [];
     const appendNextStartGroupIfNeeded = selectedBookings => {
@@ -404,7 +409,7 @@ class SalesImpl extends _BaseModule.BaseModule {
     // upcoming: 从未来预约里只取最早那一组（同 start_time）
     const upcoming = dayScopedBookings.filter(booking => {
       const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
-      return startAt.isValid() && startAt.isAfter(current) && startAt.isSame(current, 'day');
+      return startAt.isValid() && startAt.isAfter(current);
     });
     if (upcoming.length > 0) {
       if (options.includeAllFuture) return upcoming;

package/package.json

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