@pisell/pisellos 2.2.198 → 2.2.200

package/lib/solution/BookingTicket/utils/bookingStatus.d.ts

@@ -9,6 +9,21 @@
  * 字段含义严格对齐既有协议（OrderTempOrder / parseSalesResponse），
  * 不发明等价关系。
  */
+/**
+ * 子预约状态机转移动作（POST /schedule/booking-transition/{schedule_event_id}）。
+ *
+ * @example
+ * await bookingTicket.transitionChildBooking({
+ *   schedule_event_id: 301,
+ *   action: 'confirm',
+ * });
+ */
+export type BookingTransitionAction = 'confirm' | 'reject' | 'arrive' | 'start' | 'complete' | 'cancel' | 'no_show' | 'reschedule';
+/** 子预约状态转移入参 */
+export interface TransitionChildBookingParams {
+    schedule_event_id: number | string;
+    action: BookingTransitionAction;
+}
 /**
  * 从 tempOrder 解析用于调用 appointment-status 接口的 schedule id。
  *
@@ -35,3 +50,28 @@ export declare function applyBookingsStatus(bookings: any[] | null | undefined,
  * 长度不一致时按较短一方对齐（防御式编程，正常路径不会发生）。
  */
 export declare function restoreBookingsStatus(bookings: any[] | null | undefined, previous: Array<string | undefined>): void;
+/**
+ * 将状态机 action 解析为转移后的 `appointment_status`。
+ *
+ * `reschedule` 暂未在状态矩阵启用，返回 null 表示跳过乐观更新。
+ *
+ * @example
+ * resolveStatusAfterTransition('confirm'); // 'confirmed'
+ */
+export declare function resolveStatusAfterTransition(action: BookingTransitionAction): string | null;
+/**
+ * 在 bookings 中按 `schedule_event_id` 定位子预约并乐观写入 `appointment_status`。
+ *
+ * @returns 写入前的 status；未命中时返回 undefined（调用方跳过回滚）
+ *
+ * @example
+ * const prev = applyChildBookingStatus(tempOrder.bookings, 301, 'confirmed');
+ */
+export declare function applyChildBookingStatus(bookings: any[] | null | undefined, scheduleEventId: number | string, status: string): string | undefined;
+/**
+ * 撤销 applyChildBookingStatus 对单条子预约的乐观写入。
+ *
+ * @example
+ * restoreChildBookingStatus(tempOrder.bookings, 301, prev);
+ */
+export declare function restoreChildBookingStatus(bookings: any[] | null | undefined, scheduleEventId: number | string, previous: string | undefined): void;

package/lib/solution/BookingTicket/utils/bookingStatus.js

@@ -20,8 +20,11 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var bookingStatus_exports = {};
 __export(bookingStatus_exports, {
   applyBookingsStatus: () => applyBookingsStatus,
+  applyChildBookingStatus: () => applyChildBookingStatus,
   resolveScheduleId: () => resolveScheduleId,
-  restoreBookingsStatus: () => restoreBookingsStatus
+  resolveStatusAfterTransition: () => resolveStatusAfterTransition,
+  restoreBookingsStatus: () => restoreBookingsStatus,
+  restoreChildBookingStatus: () => restoreChildBookingStatus
 });
 module.exports = __toCommonJS(bookingStatus_exports);
 function resolveScheduleId(tempOrder) {
@@ -57,9 +60,48 @@ function restoreBookingsStatus(bookings, previous) {
       b.appointment_status = previous[i];
   }
 }
+function resolveStatusAfterTransition(action) {
+  const map = {
+    confirm: "confirmed",
+    reject: "rejected",
+    arrive: "arrived",
+    start: "started",
+    complete: "completed",
+    cancel: "cancelled",
+    no_show: "no_show",
+    reschedule: null
+  };
+  return map[action] ?? null;
+}
+function applyChildBookingStatus(bookings, scheduleEventId, status) {
+  var _a;
+  if (!Array.isArray(bookings))
+    return void 0;
+  const idx = bookings.findIndex(
+    (b) => b && String(b.schedule_event_id) === String(scheduleEventId)
+  );
+  if (idx === -1)
+    return void 0;
+  const previous = (_a = bookings[idx]) == null ? void 0 : _a.appointment_status;
+  bookings[idx].appointment_status = status;
+  return previous;
+}
+function restoreChildBookingStatus(bookings, scheduleEventId, previous) {
+  if (!Array.isArray(bookings) || previous === void 0)
+    return;
+  const idx = bookings.findIndex(
+    (b) => b && String(b.schedule_event_id) === String(scheduleEventId)
+  );
+  if (idx === -1)
+    return;
+  bookings[idx].appointment_status = previous;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   applyBookingsStatus,
+  applyChildBookingStatus,
   resolveScheduleId,
-  restoreBookingsStatus
+  resolveStatusAfterTransition,
+  restoreBookingsStatus,
+  restoreChildBookingStatus
 });

package/lib/solution/ScanOrder/types.d.ts

@@ -115,6 +115,7 @@ export interface ScanOrderSummary {
     shipping_tax_fee: string;
     tax_fee: string;
     surcharge_fee: string;
+    surcharges: any[];
     discount_amount: string;
     deposit_amount: string;
     deposit?: {

package/lib/solution/ScanOrder/utils.js

@@ -75,6 +75,7 @@ function createEmptySummary() {
     shipping_tax_fee: "0.00",
     tax_fee: "0.00",
     surcharge_fee: "0.00",
+    surcharges: [],
     discount_amount: "0.00",
     deposit_amount: "0.00",
     expect_amount: "0.00",
@@ -436,16 +437,33 @@ function normalizeOrderProduct(product) {
       };
     });
   }
-  const normalizedBundle = bundleInput.map((item) => ({
-    ...item,
-    bundle_id: item.bundle_id ?? item.id,
-    bundle_product_id: item.bundle_product_id ?? item._bundle_product_id,
-    bundle_group_id: item.bundle_group_id ?? item.group_id,
-    bundle_selling_price: item.bundle_selling_price ?? item.price ?? "0.00",
-    price: item.price ?? item.custom_price ?? item.bundle_selling_price ?? "0.00",
-    price_type: item.price_type ?? item.custom_price_type ?? "",
-    price_type_ext: item.price_type_ext ?? item.custom_price_type_ext ?? ""
-  }));
+  const normalizedBundle = bundleInput.map((item) => {
+    const magnitudeSource = {
+      ...item,
+      // 计算 markdown 净额时，只把真实毛价交给 helper；若只有 bundle_selling_price，
+      // helper 会按历史净额兜底，避免 option 二次扣减。
+      price: item.price ?? item.custom_price
+    };
+    const normalizedItem = {
+      ...item,
+      bundle_id: item.bundle_id ?? item.id,
+      bundle_product_id: item.bundle_product_id ?? item._bundle_product_id,
+      bundle_group_id: item.bundle_group_id ?? item.group_id,
+      // price 保留毛价（markdown 仍为 5），由 price_type 决定符号。
+      price: item.price ?? item.custom_price ?? item.bundle_selling_price ?? "0.00",
+      price_type: item.price_type ?? item.custom_price_type ?? "",
+      price_type_ext: item.price_type_ext ?? item.custom_price_type_ext ?? ""
+    };
+    normalizedItem.bundle_selling_price = (0, import_utils.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
+    if (normalizedItem.price_type === "markdown" && (normalizedItem.price_type_ext === "" || normalizedItem.price_type_ext === void 0 || normalizedItem.price_type_ext === null)) {
+      normalizedItem.custom_price = normalizedItem.custom_price ?? normalizedItem.price;
+      normalizedItem.price = normalizedItem.bundle_selling_price;
+    }
+    if ((normalizedItem.price_type === "markdown" || normalizedItem.price_type === "markup") && (normalizedItem.price_type_ext === "" || normalizedItem.price_type_ext === void 0 || normalizedItem.price_type_ext === null)) {
+      delete normalizedItem.original_total;
+    }
+    return normalizedItem;
+  });
   const normalizedOptions = (0, import_utils.normalizeProductSkuOptions)((_e = product.product_sku) == null ? void 0 : _e.option);
   const optionSum = (0, import_utils.sumOptionUnitPrice)(normalizedOptions);
   const productSku = {

package/lib/solution/VenueBooking/index.js

@@ -1395,7 +1395,8 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
   getOrderProducts() {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    return this.store.order.getOrderProducts();
+    const products = this.store.order.getOrderProducts();
+    return products;
   }
   async getSummary() {
     this.logMethodStart("getSummary");

package/package.json

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