@pisell/pisellos 2.3.33 → 2.3.35

package/lib/solution/BaseSales/utils/cartPromotion.js

@@ -179,6 +179,7 @@ function mergeIdenticalPromotionCartLines(products) {
       promotion.finalPrice ?? ((_c = line.metadata) == null ? void 0 : _c.main_product_selling_price) ?? ""
     );
     const noteSignature = getProductLineNoteSignature(line);
+    const lineMergeBoundary = getPromotionLineMergeBoundary(line);
     const bookingUid = (line == null ? void 0 : line.booking_uid) ?? ((_d = line == null ? void 0 : line.metadata) == null ? void 0 : _d.booking_uid);
     const orderDetailId = (line == null ? void 0 : line.order_detail_id) ?? (line == null ? void 0 : line.orderDetailId);
     const mergeKey = [
@@ -186,6 +187,7 @@ function mergeIdenticalPromotionCartLines(products) {
       line.product_variant_id ?? 0,
       fingerprint,
       noteSignature,
+      lineMergeBoundary,
       bookingUid ? String(bookingUid) : "",
       orderDetailId !== void 0 && orderDetailId !== null && orderDetailId !== "" ? String(orderDetailId) : "",
       promotion.strategyId,
@@ -329,6 +331,12 @@ function getProductLineNoteSignature(product) {
   const uid = getOrderProductUid(product);
   return uid ? `note:${uid}` : `note:${normalizedNote}`;
 }
+function getPromotionLineMergeBoundary(product) {
+  var _a;
+  if (((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.is_edit_for_runtime) !== true)
+    return "";
+  return `edit:${getOrderProductUid(product)}`;
+}
 function isPersistedGeneratedVoucher(product) {
   const orderDetailId = (product == null ? void 0 : product.order_detail_id) ?? (product == null ? void 0 : product.orderDetailId);
   if (orderDetailId === void 0 || orderDetailId === null || orderDetailId === "") {
@@ -356,6 +364,7 @@ function buildConsolidateKeyForPromotion(item) {
     item.product_bundle
   );
   const noteSignature = getProductLineNoteSignature(item);
+  const lineMergeBoundary = getPromotionLineMergeBoundary(item);
   const bookingUid = (item == null ? void 0 : item.booking_uid) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.booking_uid);
   const orderDetailId = (item == null ? void 0 : item.order_detail_id) ?? (item == null ? void 0 : item.orderDetailId);
   if (orderDetailId !== void 0 && orderDetailId !== null && orderDetailId !== "") {
@@ -364,6 +373,7 @@ function buildConsolidateKeyForPromotion(item) {
       item.product_variant_id ?? 0,
       fingerprint,
       noteSignature,
+      lineMergeBoundary,
       String(orderDetailId)
     ].join("#");
   }
@@ -373,6 +383,7 @@ function buildConsolidateKeyForPromotion(item) {
       item.product_variant_id ?? 0,
       fingerprint,
       noteSignature,
+      lineMergeBoundary,
       String(bookingUid)
     ].join("#");
   }
@@ -380,7 +391,8 @@ function buildConsolidateKeyForPromotion(item) {
     item.product_id,
     item.product_variant_id ?? 0,
     fingerprint,
-    noteSignature
+    noteSignature,
+    lineMergeBoundary
   ].join("#");
 }
 function consolidateMainProductsForPromotion(entries) {

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -83,6 +83,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private getBookingAppointmentStatus;
     private isBookingIncludedInStats;
     private getBookingOrderPaymentStatus;
+    private isUnpaidBooking;
     private countBookingOrders;
     private countCompletedBookings;
     private groupBookingsByResource;

package/lib/solution/Sales/index.js

@@ -39,6 +39,7 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_BaseModule = require("../../modules/BaseModule");
 var import_types = require("./types");
 __reExport(Sales_exports, require("./types"), module.exports);
+var UNPAID_PAYMENT_STATUSES = /* @__PURE__ */ new Set(["unpaid", "partially_paid", "payment_processing"]);
 var SalesImpl = class extends import_BaseModule.BaseModule {
   // LoggerManager 实例
   constructor(name, version) {
@@ -258,6 +259,9 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     var _a;
     return String(((_a = booking.order) == null ? void 0 : _a.payment_status) ?? "");
   }
+  isUnpaidBooking(booking) {
+    return UNPAID_PAYMENT_STATUSES.has(this.getBookingOrderPaymentStatus(booking));
+  }
   countBookingOrders(bookings) {
     const orderIds = /* @__PURE__ */ new Set();
     bookings.forEach((booking) => {
@@ -631,9 +635,7 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const completedBookingList = matchedBookingList.filter(
       (booking) => this.getBookingAppointmentStatus(booking) === "completed"
     );
-    const unpaidBookingList = matchedBookingList.filter(
-      (booking) => this.getBookingOrderPaymentStatus(booking) === "unpaid" || this.getBookingOrderPaymentStatus(booking) === "payment_processing"
-    );
+    const unpaidBookingList = matchedBookingList.filter((booking) => this.isUnpaidBooking(booking));
     const bookings = this.pickBookingsForCurrentPoint(
       current,
       this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList)

package/package.json

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