@pisell/pisellos 2.2.152 → 2.2.154

package/dist/modules/Order/types.d.ts

@@ -186,6 +186,25 @@ export interface UpdateProductInOrderParams {
     product_bundle?: any[];
 }
 export type AddProductBookingInput = Record<string, any>;
+export interface OrderProductMergeDecisionContext {
+    incomingProduct: Partial<OrderProduct> & OrderProductIdentity;
+    normalizedIncoming: OrderProduct;
+    matchedProduct: OrderProduct;
+    matchedIndex: number;
+    incomingFingerprint: string;
+    existedFingerprint: string;
+    tempOrder: OrderTempOrder;
+    booking?: AddProductBookingInput;
+    defaultShouldMerge: boolean;
+}
+export type OrderProductMergeDecisionResult = boolean | {
+    shouldMerge: boolean;
+    reason?: string;
+    [key: string]: any;
+};
+export interface OrderHooksConfig {
+    onBeforeMergeProductToOrder?: (context: OrderProductMergeDecisionContext) => OrderProductMergeDecisionResult | Promise<OrderProductMergeDecisionResult>;
+}
 /**
  * 订单信息
  */

package/dist/modules/Order/utils.js

@@ -306,16 +306,14 @@ function normalizeSubmitPlatform(platform) {
   return value;
 }
 
-// 出站重命名：后端 checkout 协议字段 option_group_item_id；
-// tempOrder / UI 运行时一律使用 product_option_item_id。仅保留后端契约字段，
-// 与 src/modules/Cart/utils/cartProduct.ts#formatOptionsToOrigin 形状一致。
+// 后端 checkout 协议字段 option_group_item_id；tempOrder 内部也保持同一字段名。
 function formatSubmitOptionItems(options) {
   if (!Array.isArray(options)) return [];
   return options.map(function (d) {
-    var _d$option_group_item_, _d$add_price;
+    var _d$add_price;
     var option = {
       num: d === null || d === void 0 ? void 0 : d.num,
-      option_group_item_id: (_d$option_group_item_ = d === null || d === void 0 ? void 0 : d.option_group_item_id) !== null && _d$option_group_item_ !== void 0 ? _d$option_group_item_ : d === null || d === void 0 ? void 0 : d.product_option_item_id,
+      option_group_item_id: d === null || d === void 0 ? void 0 : d.option_group_item_id,
       option_group_id: d === null || d === void 0 ? void 0 : d.option_group_id
     };
     var addPrice = (_d$add_price = d === null || d === void 0 ? void 0 : d.add_price) !== null && _d$add_price !== void 0 ? _d$add_price : d === null || d === void 0 ? void 0 : d.price;
@@ -602,7 +600,10 @@ export function buildSubmitPayload(params) {
     delivery_type: tempOrder.delivery_type || 'nil',
     schedule_date: scheduleDate,
     created_at: tempOrder.created_at || formatDateTime(now),
-    bookings: (tempOrder.bookings || []).map(function (booking) {
+    bookings: (tempOrder.bookings || []).filter(function (booking) {
+      var _parent_id;
+      return Number((_parent_id = booking.parent_id) !== null && _parent_id !== void 0 ? _parent_id : 0) !== 0;
+    }).map(function (booking) {
       return normalizeSubmitBooking(booking);
     }),
     payments: tempOrder.payments || [],

package/dist/modules/Payment/index.d.ts

@@ -25,6 +25,9 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     private dbManager;
     private logger;
     private voucherUpdateLockByOrderUuid;
+    private payMethodMemoryCache;
+    private payMethodListInFlight;
+    private isRefreshingPaymentMethods;
     protected otherParams: any;
     cash: CashPayment;
     eftpos: EftposPayment;
@@ -59,6 +62,7 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      * 获取支付方式列表
      */
     getPayMethodListAsync(): Promise<PaymentMethod[]>;
+    private loadPayMethodListAsync;
     /**
      * 后台刷新支付方式列表
      */