@pisell/pisellos 2.2.229 → 2.2.231

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

@@ -372,6 +372,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     private markLocalOrderSynced;
+    private applyRemoteOrderNumbersToTempOrder;
     private isSubmitResponseRejected;
     private isLocalPendingSubmitResult;
     private isSubmitErrorResponse;

package/dist/modules/Order/index.js

@@ -1,8 +1,8 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -821,7 +821,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _iterator4 = _createForOfIteratorHelper(result.giftActions.toAdd);
               _context7.prev = 48;
               _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
-                var addAction, sameStrategy, giftProducts, _iterator5, _step5, gp;
+                var addAction, _sameStrategy$metadat, sameStrategy, giftResult, giftProducts, giftBookings, _iterator5, _step5, _step5$value, index, gp, booking, linked;
                 return _regeneratorRuntime().wrap(function _loop$(_context5) {
                   while (1) switch (_context5.prev = _context5.next) {
                     case 0:
@@ -834,7 +834,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         var _p$metadata;
                         return ((_p$metadata = p.metadata) === null || _p$metadata === void 0 || (_p$metadata = _p$metadata._giftInfo) === null || _p$metadata === void 0 ? void 0 : _p$metadata.strategyId) === addAction.strategyId;
                       });
-                      if (!sameStrategy) {
+                      if (!(sameStrategy && !sameStrategy.booking_uid && !((_sameStrategy$metadat = sameStrategy.metadata) !== null && _sameStrategy$metadat !== void 0 && _sameStrategy$metadat.booking_uid))) {
                         _context5.next = 6;
                         break;
                       }
@@ -851,55 +851,70 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         sourceProductIds: addAction.sourceProductIds
                       });
                     case 9:
-                      giftProducts = _context5.sent;
+                      giftResult = _context5.sent;
+                      giftProducts = Array.isArray(giftResult) ? giftResult : giftResult === null || giftResult === void 0 ? void 0 : giftResult.products;
+                      giftBookings = Array.isArray(giftResult) ? [] : (giftResult === null || giftResult === void 0 ? void 0 : giftResult.bookings) || [];
                       if (!(Array.isArray(giftProducts) && giftProducts.length > 0)) {
-                        _context5.next = 29;
+                        _context5.next = 37;
                         break;
                       }
-                      _iterator5 = _createForOfIteratorHelper(giftProducts);
-                      _context5.prev = 12;
+                      _iterator5 = _createForOfIteratorHelper(giftProducts.entries());
+                      _context5.prev = 14;
                       _iterator5.s();
-                    case 14:
+                    case 16:
                       if ((_step5 = _iterator5.n()).done) {
-                        _context5.next = 21;
+                        _context5.next = 29;
                         break;
                       }
-                      gp = _step5.value;
+                      _step5$value = _slicedToArray(_step5.value, 2), index = _step5$value[0], gp = _step5$value[1];
                       if (gp) {
-                        _context5.next = 18;
+                        _context5.next = 20;
                         break;
                       }
-                      return _context5.abrupt("continue", 19);
-                    case 18:
-                      // normalize 略过：调用方应保证返回完整 OrderProduct
+                      return _context5.abrupt("continue", 27);
+                    case 20:
+                      booking = giftBookings[index];
+                      if (!booking) {
+                        _context5.next = 26;
+                        break;
+                      }
+                      linked = _this2.createLinkedProductAndBooking({
+                        product: gp,
+                        booking: booking
+                      });
+                      result.products.push(linked.product);
+                      tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
+                      return _context5.abrupt("continue", 27);
+                    case 26:
+                      // normalize 略过：调用方应保证返回完整 OrderProduct。
                       result.products.push(gp);
-                    case 19:
-                      _context5.next = 14;
-                      break;
-                    case 21:
-                      _context5.next = 26;
+                    case 27:
+                      _context5.next = 16;
                       break;
-                    case 23:
-                      _context5.prev = 23;
-                      _context5.t0 = _context5["catch"](12);
-                      _iterator5.e(_context5.t0);
-                    case 26:
-                      _context5.prev = 26;
-                      _iterator5.f();
-                      return _context5.finish(26);
                     case 29:
                       _context5.next = 34;
                       break;
                     case 31:
                       _context5.prev = 31;
+                      _context5.t0 = _context5["catch"](14);
+                      _iterator5.e(_context5.t0);
+                    case 34:
+                      _context5.prev = 34;
+                      _iterator5.f();
+                      return _context5.finish(34);
+                    case 37:
+                      _context5.next = 42;
+                      break;
+                    case 39:
+                      _context5.prev = 39;
                       _context5.t1 = _context5["catch"](6);
                       // 用户取消 / 选择失败 → 视为放弃本次新增
                       console.warn('[OrderModule] giftSelectResolver rejected, skip add gift', addAction.strategyId, _context5.t1);
-                    case 34:
+                    case 42:
                     case "end":
                       return _context5.stop();
                   }
-                }, _loop, null, [[6, 31], [12, 23, 26, 29]]);
+                }, _loop, null, [[6, 39], [14, 31, 34, 37]]);
               });
               _iterator4.s();
             case 51:
@@ -3740,7 +3755,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 var enhancedPayload = params !== null && params !== void 0 && params.enhancePayload ? params.enhancePayload(nextPayload, ctx) : nextPayload;
                 return enhancedPayload;
               } : undefined;
-              debugger;
               payload = buildSubmitPayload({
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
@@ -3754,10 +3768,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!payload.created_at) {
                 payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              _context26.next = 21;
+              _context26.next = 20;
               return this.saveDraft();
-            case 21:
-              _context26.prev = 21;
+            case 20:
+              _context26.prev = 20;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -3766,26 +3780,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments = payload.payments) === null || _payload$payments === void 0 ? void 0 : _payload$payments.length) || 0,
                 smallTicketDataFlag: payload.small_ticket_data_flag
               });
-              _context26.next = 25;
+              _context26.next = 24;
               return this.submitSalesOrder({
                 query: payload
               });
-            case 25:
+            case 24:
               result = _context26.sent;
-              _context26.next = 38;
+              _context26.next = 37;
               break;
-            case 28:
-              _context26.prev = 28;
-              _context26.t2 = _context26["catch"](21);
+            case 27:
+              _context26.prev = 27;
+              _context26.t2 = _context26["catch"](20);
               backendErrorResponse = this.extractSubmitErrorResponse(_context26.t2);
               if (!backendErrorResponse) {
-                _context26.next = 35;
+                _context26.next = 34;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
               return _context26.abrupt("return", backendErrorResponse);
-            case 35:
+            case 34:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
                 error: _context26.t2 instanceof Error ? _context26.t2.message : String(_context26.t2),
@@ -3795,40 +3809,40 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
               throw _context26.t2;
-            case 38:
+            case 37:
               if (!this.isSubmitResponseRejected(result)) {
-                _context26.next = 42;
+                _context26.next = 41;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
               return _context26.abrupt("return", result);
-            case 42:
+            case 41:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context26.next = 50;
+                _context26.next = 49;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context26.next = 48;
+              _context26.next = 47;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
-            case 48:
-              _context26.next = 51;
+            case 47:
+              _context26.next = 50;
               break;
-            case 50:
+            case 49:
               if (this.isLocalPendingSubmitResult(result)) {
                 this.store.syncState = 'local';
               } else {
                 this.store.syncState = 'submitted';
               }
-            case 51:
+            case 50:
               return _context26.abrupt("return", result);
-            case 52:
+            case 51:
             case "end":
               return _context26.stop();
           }
-        }, _callee24, this, [[21, 28]]);
+        }, _callee24, this, [[20, 27]]);
       }));
       function submitTempOrder(_x26) {
         return _submitTempOrder.apply(this, arguments);
@@ -3845,12 +3859,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.order_id = orderId;
+              this.applyRemoteOrderNumbersToTempOrder(tempOrder, remoteOrder);
               this.store.lastOrderInfo = remoteOrder;
               this.store.syncState = 'submitted';
               this.persistTempOrder();
-              _context27.next = 7;
+              _context27.next = 8;
               return this.saveDraft();
-            case 7:
+            case 8:
             case "end":
               return _context27.stop();
           }
@@ -3861,6 +3876,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return markLocalOrderSynced;
     }()
+  }, {
+    key: "applyRemoteOrderNumbersToTempOrder",
+    value: function applyRemoteOrderNumbersToTempOrder(tempOrder, remoteOrder) {
+      var applyOrderNumber = function applyOrderNumber(key) {
+        var value = remoteOrder === null || remoteOrder === void 0 ? void 0 : remoteOrder[key];
+        if (value !== undefined && value !== null && value !== '') {
+          tempOrder[key] = String(value);
+        }
+      };
+      applyOrderNumber('order_number');
+      applyOrderNumber('shop_order_number');
+      applyOrderNumber('shop_full_order_number');
+    }
   }, {
     key: "isSubmitResponseRejected",
     value: function isSubmitResponseRejected(response) {

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

@@ -47,6 +47,18 @@ export interface OrderGiftSelectContext {
     /** 触发此赠品的主商品 metadata.unique_identification_number 列表 */
     sourceProductIds: string[];
 }
+/**
+ * 赠品 resolver 返回值。
+ *
+ * @example
+ * return { products: [giftProduct], bookings: [giftBooking] };
+ */
+export interface OrderGiftSelectResult {
+    /** 完整赠品购物车行，必须带 metadata._giftInfo。 */
+    products: Partial<OrderProduct>[];
+    /** 预约赠品对应的 booking，按 products 下标一一关联。 */
+    bookings?: AddProductBookingInput[];
+}
 /**
  * 赠品解析回调签名（SDK → OS 的返回值）。
  *
@@ -54,9 +66,9 @@ export interface OrderGiftSelectContext {
  * - 多选项：SDK 弹窗等用户确认后构造
  * - 用户取消：抛错或返回空数组（OS 视为放弃本次添加）
  *
- * 返回的 OrderProduct 必须是完整的购物车行（含 metadata._giftInfo 标记），OS 会直接 push 入 tempOrder.products。
+ * 返回数组时沿用旧协议，只写 tempOrder.products；返回对象时可同时写入预约 bookings。
  */
-export type OrderGiftSelectResolver = (ctx: OrderGiftSelectContext) => Promise<Partial<OrderProduct>[] | null>;
+export type OrderGiftSelectResolver = (ctx: OrderGiftSelectContext) => Promise<Partial<OrderProduct>[] | OrderGiftSelectResult | null>;
 /** 未满足的促销策略（购物车底部 alert 渲染源） */
 export interface OrderUnfulfilledPromotion {
     strategyId: string;

package/dist/modules/Order/types.js

@@ -20,6 +20,13 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
 
 /** 赠品解析回调 context（OS → SDK 的请求体） */
 
+/**
+ * 赠品 resolver 返回值。
+ *
+ * @example
+ * return { products: [giftProduct], bookings: [giftBooking] };
+ */
+
 /**
  * 赠品解析回调签名（SDK → OS 的返回值）。
  *
@@ -27,7 +34,7 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
  * - 多选项：SDK 弹窗等用户确认后构造
  * - 用户取消：抛错或返回空数组（OS 视为放弃本次添加）
  *
- * 返回的 OrderProduct 必须是完整的购物车行（含 metadata._giftInfo 标记），OS 会直接 push 入 tempOrder.products。
+ * 返回数组时沿用旧协议，只写 tempOrder.products；返回对象时可同时写入预约 bookings。
  */
 
 /** 未满足的促销策略（购物车底部 alert 渲染源） */

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

@@ -1,5 +1,6 @@
 import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
+import { ProductListLoadProductsParams } from './types';
 import { ProductData } from '../Product/types';
 export * from './types';
 export declare class ProductList extends BaseModule implements Module {
@@ -18,18 +19,14 @@ export declare class ProductList extends BaseModule implements Module {
      */
     updateOtherParams(params: Record<string, any>): void;
     storeChange(path?: string, value?: any): Promise<void>;
-    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, }: {
-        category_ids?: number[];
-        product_ids?: number[];
-        collection?: number | string[];
-        schedule_date?: string;
-        cacheId?: string;
-        customer_id?: number;
-        menu_list_ids?: number[];
-        schedule_datetime?: string;
-        with_count?: string[];
-        with_schedule?: number;
-    }, options?: {
+    /**
+     * 获取加时商品列表。
+     *
+     * @example
+     * const products = await productList.getAddTimeProducts({ schedule_date: '2026-06-16' });
+     */
+    getAddTimeProducts(params?: ProductListLoadProductsParams): Promise<any>;
+    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, }?: ProductListLoadProductsParams, options?: {
         callback?: (result: any) => void;
         subscriberId?: string;
     }): Promise<any>;