@pisell/pisellos 2.3.67 → 2.3.69

package/dist/solution/BaseSales/utils.js

@@ -37,35 +37,46 @@ export function createEmptySummary() {
  * 数组元素先按主键排序再序列化，避免顺序差异导致误判为不同行。
  */
 export function buildProductLineFingerprint(productOptionItem, productBundle) {
-  var optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
-  var normalizedOpts = optArr.map(function (item) {
-    var _ref, _item$add_price;
-    return {
-      option_group_item_id: Number(item === null || item === void 0 ? void 0 : item.option_group_item_id) || 0,
-      option_group_id: Number(item === null || item === void 0 ? void 0 : item.option_group_id) || 0,
-      num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-      price: String((_ref = (_item$add_price = item === null || item === void 0 ? void 0 : item.add_price) !== null && _item$add_price !== void 0 ? _item$add_price : item === null || item === void 0 ? void 0 : item.price) !== null && _ref !== void 0 ? _ref : '')
-    };
-  }).sort(function (p, q) {
-    if (p.option_group_item_id !== q.option_group_item_id) {
-      return p.option_group_item_id - q.option_group_item_id;
-    }
-    if (p.option_group_id !== q.option_group_id) return p.option_group_id - q.option_group_id;
-    if (p.num !== q.num) return p.num - q.num;
-    return p.price.localeCompare(q.price);
-  });
+  var normalizeOptions = function normalizeOptions(options) {
+    var optionArr = Array.isArray(options) ? options : [];
+    return optionArr.map(function (item) {
+      var _ref, _item$add_price;
+      return {
+        option_group_item_id: Number(item === null || item === void 0 ? void 0 : item.option_group_item_id) || 0,
+        option_group_id: Number(item === null || item === void 0 ? void 0 : item.option_group_id) || 0,
+        num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+        price: String((_ref = (_item$add_price = item === null || item === void 0 ? void 0 : item.add_price) !== null && _item$add_price !== void 0 ? _item$add_price : item === null || item === void 0 ? void 0 : item.price) !== null && _ref !== void 0 ? _ref : '')
+      };
+    }).sort(function (p, q) {
+      if (p.option_group_item_id !== q.option_group_item_id) {
+        return p.option_group_item_id - q.option_group_item_id;
+      }
+      if (p.option_group_id !== q.option_group_id) {
+        return p.option_group_id - q.option_group_id;
+      }
+      if (p.num !== q.num) return p.num - q.num;
+      return p.price.localeCompare(q.price);
+    });
+  };
+  var normalizedOpts = normalizeOptions(productOptionItem);
   var bundleArr = Array.isArray(productBundle) ? productBundle : [];
   var normalizedBundles = bundleArr.map(function (item) {
-    var _ref2, _item$bundle_id;
+    var _ref2, _item$bundle_id, _item$bundle_variant_;
     return {
       bundle_id: Number((_ref2 = (_item$bundle_id = item === null || item === void 0 ? void 0 : item.bundle_id) !== null && _item$bundle_id !== void 0 ? _item$bundle_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref2 !== void 0 ? _ref2 : 0) || 0,
       product_id: Number(item === null || item === void 0 ? void 0 : item.product_id) || 0,
-      num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1
+      product_variant_id: Number((_item$bundle_variant_ = item === null || item === void 0 ? void 0 : item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item === null || item === void 0 ? void 0 : item.product_variant_id) || 0,
+      num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+      option: normalizeOptions(item === null || item === void 0 ? void 0 : item.option)
     };
   }).sort(function (p, q) {
     if (p.bundle_id !== q.bundle_id) return p.bundle_id - q.bundle_id;
     if (p.product_id !== q.product_id) return p.product_id - q.product_id;
-    return p.num - q.num;
+    if (p.product_variant_id !== q.product_variant_id) {
+      return p.product_variant_id - q.product_variant_id;
+    }
+    if (p.num !== q.num) return p.num - q.num;
+    return JSON.stringify(p.option).localeCompare(JSON.stringify(q.option));
   });
   return JSON.stringify([normalizedOpts, normalizedBundles]);
 }

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

@@ -29,6 +29,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private addTimeProductsCatalog;
     private orderCustomerDiscountRefreshInFlight;
     private orderCustomerDiscountRefreshCustomerId;
+    private orderCustomerPromotionRefreshInFlight;
     private loadOpenDataConfigInFlight;
     /**
      * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
@@ -63,6 +64,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
     private hydrateOrderCustomerFromScanDiscounts;
     private getDiscountCustomerId;
+    resolveCustomerById(customerId: string | number): Promise<ICustomer | null>;
+    /** 兼容既有优惠码扫码逻辑。 */
     private resolveCustomerByDiscountCustomerId;
     private findCustomerById;
     private normalizeCustomer;
@@ -282,7 +285,10 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     restoreOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     /** 内部：基于 OrderModule 当前状态构造一份 OrderCustomerChangePayload。 */
     private buildOrderCustomerPayload;
-    private refreshDiscountConfigAfterOrderCustomerChange;
+    protected refreshDiscountConfigAfterOrderCustomerChange(customerId: number | null): Promise<void>;
+    protected waitForOrderCustomerPromotionRefresh(): Promise<void>;
+    protected prepareProductPriceQueryContext(customerId?: number | string): Promise<void>;
+    protected preferAuthoritativeProductQueryPrice(): boolean;
     /**
      * 获取客户分页信息
      * @returns 分页信息