@pisell/pisellos 2.2.267 → 2.2.268

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

@@ -86,29 +86,27 @@ function isGiftProductLine(line) {
 function buildCartView(lines, bookings, options = {}) {
   const productLines = Array.isArray(lines) ? lines : [];
   const bookingList = Array.isArray(bookings) ? bookings : [];
+  const childBookings = bookingList.filter((booking) => booking.parent_id !== 0);
+  const bookingsByProductUid = indexBookingsByProductUid(childBookings);
   const linesByUid = indexProductsByUid(productLines);
   const addTimeLinesByBookingUid = indexAddTimeProductsByBookingUid(productLines);
-  const claimedUids = /* @__PURE__ */ new Set();
   const claimedAddTimeLines = /* @__PURE__ */ new Set();
-  const cartBookings = bookingList.filter((booking) => booking.parent_id !== 0).reduce((acc, booking) => {
-    const uid = booking == null ? void 0 : booking.product_uid;
+  childBookings.forEach((booking) => {
+    const bookingUid = getBookingUid(booking);
+    if (!bookingUid)
+      return;
+    (addTimeLinesByBookingUid[bookingUid] || []).forEach((line) => {
+      claimedAddTimeLines.add(line);
+    });
+  });
+  const claimedBookings = /* @__PURE__ */ new Set();
+  const cartBookings = [];
+  const items = [];
+  const orderedLines = [];
+  const buildBookingView = (booking, product) => {
     const bookingUid = getBookingUid(booking);
-    let product = null;
-    if (uid !== void 0 && uid !== null && uid !== "") {
-      const key = String(uid);
-      if (!claimedUids.has(key)) {
-        const line = linesByUid[key];
-        if (isGiftProductLine(line))
-          return acc;
-        if (line) {
-          claimedUids.add(key);
-          product = line;
-        }
-      }
-    }
     const addTimeProduct = bookingUid ? addTimeLinesByBookingUid[bookingUid] || [] : [];
-    addTimeProduct.forEach((line) => claimedAddTimeLines.add(line));
-    acc.push({
+    return {
       ...booking,
       _extend: {
         product,
@@ -122,21 +120,36 @@ function buildCartView(lines, bookings, options = {}) {
           shopOpeningHours: options.shopOpeningHours
         })
       }
-    });
-    return acc;
-  }, []);
-  const items = productLines.filter((line) => {
+    };
+  };
+  productLines.forEach((line) => {
     var _a;
-    if (isGiftProductLine(line))
-      return false;
-    if (claimedAddTimeLines.has(line))
-      return false;
+    if (isGiftProductLine(line) || claimedAddTimeLines.has(line))
+      return;
     const uid = (_a = line.metadata) == null ? void 0 : _a.unique_identification_number;
-    if (uid === void 0 || uid === null || uid === "")
-      return true;
-    return !claimedUids.has(String(uid));
+    const matchedBooking = uid === void 0 || uid === null || uid === "" ? void 0 : (bookingsByProductUid[String(uid)] || []).find(
+      (booking) => !claimedBookings.has(booking)
+    );
+    if (matchedBooking) {
+      claimedBookings.add(matchedBooking);
+      const bookingView = buildBookingView(matchedBooking, line);
+      cartBookings.push(bookingView);
+      orderedLines.push(bookingView);
+      return;
+    }
+    items.push(line);
+    orderedLines.push(line);
+  });
+  childBookings.forEach((booking) => {
+    if (claimedBookings.has(booking))
+      return;
+    const uid = booking == null ? void 0 : booking.product_uid;
+    const linkedProduct = uid === void 0 || uid === null || uid === "" ? null : linesByUid[String(uid)] || null;
+    if (isGiftProductLine(linkedProduct))
+      return;
+    cartBookings.push(buildBookingView(booking, null));
   });
-  return { bookings: cartBookings, items };
+  return { bookings: cartBookings, items, lines: orderedLines };
 }
 function isWalkInCustomer(customer) {
   if (!customer)

package/package.json

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