@pisell/pisellos 2.3.76 → 2.3.77

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 | 5 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -334,7 +334,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -453,19 +453,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/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 | 5 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -334,7 +334,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -453,19 +453,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

@@ -906,7 +906,9 @@ function buildBookingFromAvailabilitySelection(params) {
     candidate,
     product,
     resources = [],
-    bookingUid
+    bookingUid,
+    holder,
+    holderIds
   } = params;
   const bookingStartAt = candidate.bookingStartAt || candidate.startAt;
   const bookingEndAt = candidate.bookingEndAt || candidate.endAt;
@@ -921,6 +923,8 @@ function buildBookingFromAvailabilitySelection(params) {
       scheduleRefs: candidate.scheduleRefs
     });
   }
+  const normalizedHolder = holder && typeof holder === 'object' ? (0, _lodashEs.cloneDeep)(holder) : undefined;
+  const normalizedHolderIds = Array.isArray(holderIds) ? (0, _lodashEs.cloneDeep)(holderIds) : holderIds;
   return {
     start_date: bookingStartAt.slice(0, 10),
     start_time: bookingStartAt.slice(11, 16),
@@ -929,6 +933,9 @@ function buildBookingFromAvailabilitySelection(params) {
     duration: Math.max(1, Math.trunc((endScalar - startScalar) / (60 * 1000))),
     like_status: 'common',
     schedule_id: scheduleId ?? 0,
+    ...(normalizedHolder ? {
+      holder: normalizedHolder
+    } : {}),
     resources: assignments.map(assignment => {
       // requirementSelections 的提交协议只携带资源 ID；购物车展示则需要名称。
       // commit 此时仍持有本次不可变 projection，因此直接按 ID 取回名称并
@@ -963,7 +970,13 @@ function buildBookingFromAvailabilitySelection(params) {
       ...(timeSlotId == null ? {} : {
         time_slot_id: timeSlotId
       }),
-      product_kind: product.kind
+      product_kind: product.kind,
+      ...(normalizedHolderIds === undefined ? {} : {
+        holder_id: normalizedHolderIds
+      }),
+      ...(normalizedHolder ? {
+        holder: (0, _lodashEs.cloneDeep)(normalizedHolder)
+      } : {})
     }
   };
 }
@@ -2939,7 +2952,9 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
         candidate: refreshedCandidate,
         product,
         resources: refreshedProjection.resources,
-        bookingUid: existingBookingUid || undefined
+        bookingUid: existingBookingUid || undefined,
+        holder: params.orderProduct?._extend?.holder ?? existingBooking?.holder ?? existingBooking?.metadata?.holder,
+        holderIds: params.orderProduct?._extend?.holder_id ?? params.orderProduct?._extend?.holder?.form_record ?? existingBooking?.metadata?.holder_id ?? existingBooking?.holder?.form_record
       });
       const transformed = this.buildUnifiedOrderProduct({
         ...params.orderProduct,

package/package.json

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