@pisell/pisellos 0.10.11 → 0.10.13

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

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

@@ -451,19 +451,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/dist/solution/UnifiedBookingSales/index.js

@@ -987,7 +987,9 @@ function buildBookingFromAvailabilitySelection(params) {
     product = params.product,
     _params$resources = params.resources,
     resources = _params$resources === void 0 ? [] : _params$resources,
-    bookingUid = params.bookingUid;
+    bookingUid = params.bookingUid,
+    holder = params.holder,
+    holderIds = params.holderIds;
   var bookingStartAt = candidate.bookingStartAt || candidate.startAt;
   var bookingEndAt = candidate.bookingEndAt || candidate.endAt;
   var startScalar = localDateTimeToScalar(parseLocalDateTime(bookingStartAt));
@@ -1005,14 +1007,19 @@ function buildBookingFromAvailabilitySelection(params) {
       scheduleRefs: candidate.scheduleRefs
     });
   }
-  return {
+  var normalizedHolder = holder && _typeof(holder) === 'object' ? cloneDeep(holder) : undefined;
+  var normalizedHolderIds = Array.isArray(holderIds) ? cloneDeep(holderIds) : holderIds;
+  return _objectSpread(_objectSpread({
     start_date: bookingStartAt.slice(0, 10),
     start_time: bookingStartAt.slice(11, 16),
     end_date: bookingEndAt.slice(0, 10),
     end_time: bookingEndAt.slice(11, 16),
     duration: Math.max(1, Math.trunc((endScalar - startScalar) / (60 * 1000))),
     like_status: 'common',
-    schedule_id: scheduleId !== null && scheduleId !== void 0 ? scheduleId : 0,
+    schedule_id: scheduleId !== null && scheduleId !== void 0 ? scheduleId : 0
+  }, normalizedHolder ? {
+    holder: normalizedHolder
+  } : {}), {}, {
     resources: assignments.map(function (assignment) {
       // requirementSelections 的提交协议只携带资源 ID；购物车展示则需要名称。
       // commit 此时仍持有本次不可变 projection，因此直接按 ID 取回名称并
@@ -1035,7 +1042,7 @@ function buildBookingFromAvailabilitySelection(params) {
         }
       } : {});
     }),
-    metadata: _objectSpread(_objectSpread(_objectSpread({}, bookingUid ? {
+    metadata: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, bookingUid ? {
       unique_identification_number: bookingUid
     } : {}), {}, {
       unified_booking_sales: true,
@@ -1048,8 +1055,12 @@ function buildBookingFromAvailabilitySelection(params) {
       time_slot_id: timeSlotId
     }), {}, {
       product_kind: product.kind
-    })
-  };
+    }, normalizedHolderIds === undefined ? {} : {
+      holder_id: normalizedHolderIds
+    }), normalizedHolder ? {
+      holder: cloneDeep(normalizedHolder)
+    } : {})
+  });
 }
 export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
   _inherits(UnifiedBookingSalesImpl, _BookingTicket);
@@ -4137,7 +4148,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     key: "commitAvailabilitySelection",
     value: (function () {
       var _commitAvailabilitySelection = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(contextId, params) {
-        var normalizedContextId, _params$bookingCount, _ref45, _params$orderProduct$, _params$orderProduct, _params$orderProduct2, _params$orderProduct3, _params$orderProduct$2, _params$orderProduct4, _params$orderProduct5, _editingLine$product_, _baseProjection$meta$, _refreshedProjection$, _baseProjection$meta$2, bookingCount, orderProductQuantity, partySize, _yield$this$ensureAva3, context, projectionEntry, refreshed, boundEditingUids, orderProductId, editingLine, _editingLine$product_2, baseProjection, commitWriteGuard, prepareParams, fallbackResources, commitSnapshot, refreshedProjection, _baseProjection$meta$3, latestContext, refreshedRanges, refreshedCandidateBase, validation, capacityConflict, revalidationEntry, revalidatedContext, refreshedCandidate, product, existingBooking, existingBookingUid, booking, transformed, productLineUid, bookingUid, productLineUids, bookingUids, _transformed$product_, _transformed$product_2, _transformed$product_3, _ref46, _transformed$product_4, _this$getTempOrder4, _this$getTempOrder5, _this$getTempOrder6, beforeProductLineUids, beforeBookingUids, products, addedLines, addedBookings, nextContext, result;
+        var normalizedContextId, _params$bookingCount, _ref45, _params$orderProduct$, _params$orderProduct, _params$orderProduct2, _params$orderProduct3, _params$orderProduct$2, _params$orderProduct4, _params$orderProduct5, _editingLine$product_, _baseProjection$meta$, _refreshedProjection$, _baseProjection$meta$2, _ref46, _params$orderProduct$3, _params$orderProduct6, _existingBooking$meta, _ref47, _ref48, _params$orderProduct$4, _params$orderProduct7, _params$orderProduct8, _existingBooking$meta2, _existingBooking$hold, bookingCount, orderProductQuantity, partySize, _yield$this$ensureAva3, context, projectionEntry, refreshed, boundEditingUids, orderProductId, editingLine, _editingLine$product_2, baseProjection, commitWriteGuard, prepareParams, fallbackResources, commitSnapshot, refreshedProjection, _baseProjection$meta$3, latestContext, refreshedRanges, refreshedCandidateBase, validation, capacityConflict, revalidationEntry, revalidatedContext, refreshedCandidate, product, existingBooking, existingBookingUid, booking, transformed, productLineUid, bookingUid, productLineUids, bookingUids, _transformed$product_, _transformed$product_2, _transformed$product_3, _ref49, _transformed$product_4, _this$getTempOrder4, _this$getTempOrder5, _this$getTempOrder6, beforeProductLineUids, beforeBookingUids, products, addedLines, addedBookings, nextContext, result;
         return _regeneratorRuntime().wrap(function _callee36$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
             case 0:
@@ -4464,7 +4475,9 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 candidate: refreshedCandidate,
                 product: product,
                 resources: refreshedProjection.resources,
-                bookingUid: existingBookingUid || undefined
+                bookingUid: existingBookingUid || undefined,
+                holder: (_ref46 = (_params$orderProduct$3 = (_params$orderProduct6 = params.orderProduct) === null || _params$orderProduct6 === void 0 || (_params$orderProduct6 = _params$orderProduct6._extend) === null || _params$orderProduct6 === void 0 ? void 0 : _params$orderProduct6.holder) !== null && _params$orderProduct$3 !== void 0 ? _params$orderProduct$3 : existingBooking === null || existingBooking === void 0 ? void 0 : existingBooking.holder) !== null && _ref46 !== void 0 ? _ref46 : existingBooking === null || existingBooking === void 0 || (_existingBooking$meta = existingBooking.metadata) === null || _existingBooking$meta === void 0 ? void 0 : _existingBooking$meta.holder,
+                holderIds: (_ref47 = (_ref48 = (_params$orderProduct$4 = (_params$orderProduct7 = params.orderProduct) === null || _params$orderProduct7 === void 0 || (_params$orderProduct7 = _params$orderProduct7._extend) === null || _params$orderProduct7 === void 0 ? void 0 : _params$orderProduct7.holder_id) !== null && _params$orderProduct$4 !== void 0 ? _params$orderProduct$4 : (_params$orderProduct8 = params.orderProduct) === null || _params$orderProduct8 === void 0 || (_params$orderProduct8 = _params$orderProduct8._extend) === null || _params$orderProduct8 === void 0 || (_params$orderProduct8 = _params$orderProduct8.holder) === null || _params$orderProduct8 === void 0 ? void 0 : _params$orderProduct8.form_record) !== null && _ref48 !== void 0 ? _ref48 : existingBooking === null || existingBooking === void 0 || (_existingBooking$meta2 = existingBooking.metadata) === null || _existingBooking$meta2 === void 0 ? void 0 : _existingBooking$meta2.holder_id) !== null && _ref47 !== void 0 ? _ref47 : existingBooking === null || existingBooking === void 0 || (_existingBooking$hold = existingBooking.holder) === null || _existingBooking$hold === void 0 ? void 0 : _existingBooking$hold.form_record
               });
               transformed = this.buildUnifiedOrderProduct(_objectSpread(_objectSpread({}, params.orderProduct), {}, {
                 num: bookingCount,
@@ -4503,7 +4516,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               _context36.next = 107;
               return this.updateOrderProduct({
                 product_id: (_transformed$product_3 = transformed.product_id) !== null && _transformed$product_3 !== void 0 ? _transformed$product_3 : editingLine.product_id,
-                product_variant_id: (_ref46 = (_transformed$product_4 = transformed.product_variant_id) !== null && _transformed$product_4 !== void 0 ? _transformed$product_4 : editingLine.product_variant_id) !== null && _ref46 !== void 0 ? _ref46 : 0,
+                product_variant_id: (_ref49 = (_transformed$product_4 = transformed.product_variant_id) !== null && _transformed$product_4 !== void 0 ? _transformed$product_4 : editingLine.product_variant_id) !== null && _ref49 !== void 0 ? _ref49 : 0,
                 unique_identification_number: params.productLineUid,
                 updates: transformed,
                 booking: booking
@@ -4542,8 +4555,8 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               }).filter(Boolean);
               if (bookingUids.length === 0) {
                 bookingUids = addedLines.map(function (line) {
-                  var _ref47, _line$booking_uid, _line$metadata2;
-                  return String((_ref47 = (_line$booking_uid = line.booking_uid) !== null && _line$booking_uid !== void 0 ? _line$booking_uid : (_line$metadata2 = line.metadata) === null || _line$metadata2 === void 0 ? void 0 : _line$metadata2.booking_uid) !== null && _ref47 !== void 0 ? _ref47 : '');
+                  var _ref50, _line$booking_uid, _line$metadata2;
+                  return String((_ref50 = (_line$booking_uid = line.booking_uid) !== null && _line$booking_uid !== void 0 ? _line$booking_uid : (_line$metadata2 = line.metadata) === null || _line$metadata2 === void 0 ? void 0 : _line$metadata2.booking_uid) !== null && _ref50 !== void 0 ? _ref50 : '');
                 }).filter(Boolean);
               }
               productLineUid = productLineUids[productLineUids.length - 1] || '';

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

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

@@ -451,19 +451,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/solution/UnifiedBookingSales/index.js

@@ -933,7 +933,9 @@ function buildBookingFromAvailabilitySelection(params) {
     candidate,
     product,
     resources = [],
-    bookingUid
+    bookingUid,
+    holder,
+    holderIds
   } = params;
   const bookingStartAt = candidate.bookingStartAt || candidate.startAt;
   const bookingEndAt = candidate.bookingEndAt || candidate.endAt;
@@ -948,6 +950,8 @@ function buildBookingFromAvailabilitySelection(params) {
       scheduleRefs: candidate.scheduleRefs
     });
   }
+  const normalizedHolder = holder && typeof holder === "object" ? (0, import_lodash_es.cloneDeep)(holder) : void 0;
+  const normalizedHolderIds = Array.isArray(holderIds) ? (0, import_lodash_es.cloneDeep)(holderIds) : holderIds;
   return {
     start_date: bookingStartAt.slice(0, 10),
     start_time: bookingStartAt.slice(11, 16),
@@ -956,6 +960,7 @@ function buildBookingFromAvailabilitySelection(params) {
     duration: Math.max(1, Math.trunc((endScalar - startScalar) / (60 * 1e3))),
     like_status: "common",
     schedule_id: scheduleId ?? 0,
+    ...normalizedHolder ? { holder: normalizedHolder } : {},
     resources: assignments.map((assignment) => {
       const matchedResource = resources.find((resource) => sameAvailabilityId(resource.id, assignment.resourceId));
       const resourceName = String((matchedResource == null ? void 0 : matchedResource.name) || "").trim();
@@ -979,7 +984,9 @@ function buildBookingFromAvailabilitySelection(params) {
       availability_slice_end_at: candidate.endAt,
       availability_schedule_refs: candidate.scheduleRefs,
       ...timeSlotId == null ? {} : { time_slot_id: timeSlotId },
-      product_kind: product.kind
+      product_kind: product.kind,
+      ...normalizedHolderIds === void 0 ? {} : { holder_id: normalizedHolderIds },
+      ...normalizedHolder ? { holder: (0, import_lodash_es.cloneDeep)(normalizedHolder) } : {}
     }
   };
 }
@@ -2804,7 +2811,7 @@ var UnifiedBookingSalesImpl = class extends import_BookingTicket.BookingTicket {
   }
   /** Revalidates against the latest landed occupancy cache, then mutates exactly one product line. */
   async commitAvailabilitySelection(contextId, params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
     const normalizedContextId = String(contextId || "").trim();
     if (!normalizedContextId) {
       throw new import_ResourcePlanner.AvailabilityError("INVALID_TARGET_FILTER", "commitAvailabilitySelection 缺少 contextId", {
@@ -3074,7 +3081,9 @@ var UnifiedBookingSalesImpl = class extends import_BookingTicket.BookingTicket {
         candidate: refreshedCandidate,
         product,
         resources: refreshedProjection.resources,
-        bookingUid: existingBookingUid || void 0
+        bookingUid: existingBookingUid || void 0,
+        holder: ((_h = (_g = params.orderProduct) == null ? void 0 : _g._extend) == null ? void 0 : _h.holder) ?? (existingBooking == null ? void 0 : existingBooking.holder) ?? ((_i = existingBooking == null ? void 0 : existingBooking.metadata) == null ? void 0 : _i.holder),
+        holderIds: ((_k = (_j = params.orderProduct) == null ? void 0 : _j._extend) == null ? void 0 : _k.holder_id) ?? ((_n = (_m = (_l = params.orderProduct) == null ? void 0 : _l._extend) == null ? void 0 : _m.holder) == null ? void 0 : _n.form_record) ?? ((_o = existingBooking == null ? void 0 : existingBooking.metadata) == null ? void 0 : _o.holder_id) ?? ((_p = existingBooking == null ? void 0 : existingBooking.holder) == null ? void 0 : _p.form_record)
       });
       const transformed = this.buildUnifiedOrderProduct({
         ...params.orderProduct,
@@ -3121,10 +3130,10 @@ var UnifiedBookingSalesImpl = class extends import_BookingTicket.BookingTicket {
         bookingUids = [bookingUid];
       } else {
         const beforeProductLineUids = new Set(
-          (((_g = this.getTempOrder()) == null ? void 0 : _g.products) || []).map((line) => getProductLineUid(line)).filter(Boolean)
+          (((_q = this.getTempOrder()) == null ? void 0 : _q.products) || []).map((line) => getProductLineUid(line)).filter(Boolean)
         );
         const beforeBookingUids = new Set(
-          (((_h = this.getTempOrder()) == null ? void 0 : _h.bookings) || []).map((item) => getBookingUid(item)).filter(Boolean)
+          (((_r = this.getTempOrder()) == null ? void 0 : _r.bookings) || []).map((item) => getBookingUid(item)).filter(Boolean)
         );
         const products = await this.addProductToOrder(transformed, booking);
         const addedLines = products.filter((line) => {
@@ -3132,7 +3141,7 @@ var UnifiedBookingSalesImpl = class extends import_BookingTicket.BookingTicket {
           return sameAvailabilityId(line.product_id ?? line.id, refreshedCandidate.productId) && ((_a2 = line.metadata) == null ? void 0 : _a2.availability_candidate_key) === refreshedCandidate.key && !beforeProductLineUids.has(getProductLineUid(line));
         });
         productLineUids = addedLines.map((line) => getProductLineUid(line)).filter(Boolean);
-        const addedBookings = (((_i = this.getTempOrder()) == null ? void 0 : _i.bookings) || []).filter((item) => {
+        const addedBookings = (((_s = this.getTempOrder()) == null ? void 0 : _s.bookings) || []).filter((item) => {
           var _a2;
           return ((_a2 = item.metadata) == null ? void 0 : _a2.availability_candidate_key) === refreshedCandidate.key && !beforeBookingUids.has(getBookingUid(item));
         });

package/package.json

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