@pisell/pisellos 2.2.245 → 2.2.247

package/lib/modules/Order/index.js

@@ -76,6 +76,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.giftSelectResolver = null;
     /** applyPromotion 递归保护 flag（写路径同步调 applyPromotion，禁止重入） */
     this.isApplyingPromotion = false;
+    /** 商品曾应用过客户券卡，客户变更剥离后需强制跑一次 calcDiscount 复位价格 */
+    this.hasActiveCustomerBoundDiscount = false;
     /** 最近一次 applyPromotion 的未满足促销提示 */
     this.lastUnfulfilledPromotions = [];
     /** 最近一次 applyPromotion 的赠品操作 diff（debug / SDK 读取使用） */
@@ -471,6 +473,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!tempOrder)
       return;
     delete tempOrder.discount_list;
+    if (this.shouldSkipDiscountCalculation(tempOrder))
+      return;
     const rulesModule = this.store.rules;
     if (!rulesModule)
       return;
@@ -512,6 +516,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       );
       (_e = this.store.discount) == null ? void 0 : _e.setDiscountList(result.discountList);
     }
+    this.hasActiveCustomerBoundDiscount = (tempOrder.products || []).some(
+      (product) => this.productHasCustomerBoundDiscount(product)
+    );
   }
   // ─── 促销/赠品 ──────────────────────────────────────
   /**
@@ -556,7 +563,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * - 不主动调用 applyDiscount / recalculateSummary，调用方负责跟进。
    */
   async applyPromotion() {
-    var _a;
+    var _a, _b, _c;
     if (this.isApplyingPromotion) {
       return;
     }
@@ -567,6 +574,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!tempOrder) {
       return;
     }
+    const strategyConfigs = (_b = (_a = this.promotionEvaluator).getStrategyConfigs) == null ? void 0 : _b.call(_a);
+    if (Array.isArray(strategyConfigs) && strategyConfigs.length === 0) {
+      return;
+    }
     this.isApplyingPromotion = true;
     try {
       const result = (0, import_cartPromotion.processCartPromotion)(
@@ -608,11 +619,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
             if (addAction.giftOptions.length === 1) {
               const sameStrategy = result.products.find(
                 (p) => {
-                  var _a2, _b;
-                  return ((_b = (_a2 = p.metadata) == null ? void 0 : _a2._giftInfo) == null ? void 0 : _b.strategyId) === addAction.strategyId;
+                  var _a2, _b2;
+                  return ((_b2 = (_a2 = p.metadata) == null ? void 0 : _a2._giftInfo) == null ? void 0 : _b2.strategyId) === addAction.strategyId;
                 }
               );
-              if (sameStrategy && !sameStrategy.booking_uid && !((_a = sameStrategy.metadata) == null ? void 0 : _a.booking_uid)) {
+              if (sameStrategy && !sameStrategy.booking_uid && !((_c = sameStrategy.metadata) == null ? void 0 : _c.booking_uid)) {
                 sameStrategy.num = (Number(sameStrategy.num) || 0) + (addAction.giftCount || 1);
                 continue;
               }
@@ -1256,6 +1267,33 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     items.sort((left, right) => JSON.stringify(left).localeCompare(JSON.stringify(right)));
     return JSON.stringify(items);
   }
+  getManualDepositOverride(tempOrder) {
+    var _a;
+    const override = (_a = tempOrder._extend) == null ? void 0 : _a.manualDepositOverride;
+    if (!override || typeof override !== "object")
+      return null;
+    if (typeof override.amount !== "string")
+      return null;
+    if (typeof override.productStructuralFingerprint !== "string")
+      return null;
+    return override;
+  }
+  setManualDepositOverride(tempOrder, amount) {
+    tempOrder._extend = {
+      ...tempOrder._extend || {},
+      manualDepositOverride: {
+        amount,
+        productStructuralFingerprint: this.buildOrderProductsStructuralFingerprint(tempOrder.products)
+      }
+    };
+  }
+  clearManualDepositOverride(tempOrder) {
+    var _a;
+    if (!((_a = tempOrder._extend) == null ? void 0 : _a.manualDepositOverride))
+      return;
+    tempOrder._extend = { ...tempOrder._extend };
+    delete tempOrder._extend.manualDepositOverride;
+  }
   getOriginalSalesSnapshot(tempOrder) {
     var _a;
     const snapshot = (_a = tempOrder._extend) == null ? void 0 : _a.originalSalesSnapshot;
@@ -1717,18 +1755,28 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const depositSummary = (0, import_utils.calculateOrderProductsDeposit)(tempOrder.products || [], {
       productsByUid: (_a = tempOrder._extend) == null ? void 0 : _a.productsByUid
     });
+    const manualDepositOverride = this.getManualDepositOverride(tempOrder);
+    const currentStructuralFingerprint = manualDepositOverride ? this.buildOrderProductsStructuralFingerprint(tempOrder.products) : "";
+    const shouldUseManualDepositOverride = Boolean(
+      manualDepositOverride && manualDepositOverride.productStructuralFingerprint === currentStructuralFingerprint
+    );
+    if (manualDepositOverride && !shouldUseManualDepositOverride) {
+      this.clearManualDepositOverride(tempOrder);
+    }
+    const depositAmount = shouldUseManualDepositOverride ? manualDepositOverride.amount : depositSummary.totalText;
+    const hasDepositAmount = new import_decimal.default(depositAmount).gt(0);
     const nextSummary = {
       ...summary,
-      deposit_amount: depositSummary.totalText,
-      deposit: depositSummary.hasDeposit ? {
-        total: depositSummary.totalText,
+      deposit_amount: depositAmount,
+      deposit: hasDepositAmount ? {
+        total: depositAmount,
         deposit_policy_ids: depositSummary.deposit_policy_ids,
         deposit_policy_data: depositSummary.protocols,
         hasDeposit: true
       } : void 0
     };
-    tempOrder.deposit_amount = depositSummary.totalText;
-    tempOrder.is_deposit = depositSummary.hasDeposit ? 1 : 0;
+    tempOrder.deposit_amount = depositAmount;
+    tempOrder.is_deposit = hasDepositAmount ? 1 : 0;
     return nextSummary;
   }
   async recalculateSummary(options) {
@@ -1887,6 +1935,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       },
       depositAmount
     );
+    this.setManualDepositOverride(tempOrder, depositAmount);
     const paidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
     const summary = {
       ...summaryWithDeposit,
@@ -1939,12 +1988,37 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const type = (discount == null ? void 0 : discount.type) ?? (discount == null ? void 0 : discount.tag);
     return type === "good_pass" || type === "discount_card" || type === "product_discount_card";
   }
+  productHasCustomerBoundDiscount(product) {
+    if (((product == null ? void 0 : product.discount_list) || []).some((discount) => this.isCustomerBoundDiscount(discount))) {
+      return true;
+    }
+    return ((product == null ? void 0 : product.product_bundle) || []).some(
+      (bundle) => ((bundle == null ? void 0 : bundle.discount_list) || []).some((discount) => this.isCustomerBoundDiscount(discount))
+    );
+  }
+  shouldSkipDiscountCalculation(tempOrder) {
+    var _a, _b;
+    if (this.hasActiveCustomerBoundDiscount)
+      return false;
+    const discountList = ((_b = (_a = this.store.discount) == null ? void 0 : _a.getDiscountList) == null ? void 0 : _b.call(_a)) || [];
+    if (discountList.length > 0)
+      return false;
+    return !(tempOrder.products || []).some(
+      (product) => this.productHasCustomerBoundDiscount(product)
+    );
+  }
   clearCustomerBoundDiscounts(tempOrder) {
     var _a, _b, _c, _d;
+    let didRemoveCustomerBoundDiscount = false;
     const filterDiscountList = (discountList) => {
       if (!Array.isArray(discountList))
         return [];
-      return discountList.filter((discount) => !this.isCustomerBoundDiscount(discount));
+      return discountList.filter((discount) => {
+        const shouldRemove = this.isCustomerBoundDiscount(discount);
+        if (shouldRemove)
+          didRemoveCustomerBoundDiscount = true;
+        return !shouldRemove;
+      });
     };
     tempOrder.products = (tempOrder.products || []).map((product) => {
       const nextProduct = {
@@ -1960,6 +2034,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return nextProduct;
     });
     delete tempOrder.discount_list;
+    if (didRemoveCustomerBoundDiscount) {
+      this.hasActiveCustomerBoundDiscount = true;
+    }
     const discountModule = this.store.discount;
     if (!discountModule)
       return;
@@ -2858,10 +2935,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * await order.removeProductsFromOrder([identityA, identityB]);
    */
   async removeProductsFromOrder(identities) {
+    var _a, _b, _c, _d;
     const tempOrder = this.ensureTempOrder();
     if (!identities.length) {
       return tempOrder.products;
     }
+    const productsBeforeRemove = tempOrder.products || [];
+    const bookingsBeforeRemove = tempOrder.bookings || [];
+    const matchedProducts = productsBeforeRemove.filter((item) => {
+      return identities.some((identity) => (0, import_utils3.isIdentityMatch)(item, identity));
+    });
     const removedProducts = [];
     tempOrder.products = tempOrder.products.filter((item) => {
       const shouldRemove = identities.some((identity) => (0, import_utils3.isIdentityMatch)(item, identity));
@@ -2872,6 +2955,33 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     for (const product of removedProducts) {
       this.removeLinkedBookingsForProduct(tempOrder, product);
     }
+    const linkedBookingUidsToRemove = /* @__PURE__ */ new Set();
+    for (const product of matchedProducts) {
+      const productUid = ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.unique_identification_number) || (product == null ? void 0 : product.unique_identification_number);
+      const productBookingUid = (product == null ? void 0 : product.booking_uid) || ((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.booking_uid);
+      const isAddTimeProduct = ((_c = product == null ? void 0 : product.metadata) == null ? void 0 : _c.product_add_schedule_time) !== void 0 && ((_d = product == null ? void 0 : product.metadata) == null ? void 0 : _d.product_add_schedule_time) !== null;
+      if (isAddTimeProduct)
+        continue;
+      if (productBookingUid !== void 0 && productBookingUid !== null && productBookingUid !== "") {
+        linkedBookingUidsToRemove.add(String(productBookingUid));
+      }
+      if (productUid !== void 0 && productUid !== null && productUid !== "") {
+        bookingsBeforeRemove.forEach((booking) => {
+          const bookingUid = this.getBookingUniqueIdentificationNumber(booking);
+          if (bookingUid && String((booking == null ? void 0 : booking.product_uid) || "") === String(productUid)) {
+            linkedBookingUidsToRemove.add(bookingUid);
+          }
+        });
+      }
+    }
+    if (linkedBookingUidsToRemove.size > 0) {
+      tempOrder.products = (tempOrder.products || []).filter((line) => {
+        var _a2, _b2, _c2;
+        const lineBookingUid = ((_a2 = line == null ? void 0 : line.metadata) == null ? void 0 : _a2.booking_uid) || (line == null ? void 0 : line.booking_uid);
+        const isAddTimeProduct = ((_b2 = line == null ? void 0 : line.metadata) == null ? void 0 : _b2.product_add_schedule_time) !== void 0 && ((_c2 = line == null ? void 0 : line.metadata) == null ? void 0 : _c2.product_add_schedule_time) !== null;
+        return !(isAddTimeProduct && lineBookingUid !== void 0 && lineBookingUid !== null && linkedBookingUidsToRemove.has(String(lineBookingUid)));
+      });
+    }
     await this.finalizeAfterProductsMutation(tempOrder);
     return tempOrder.products;
   }

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

@@ -34,6 +34,7 @@ export interface OrderPromotionEvaluator {
         products: any[];
         channel?: string;
     }, matchVariant?: boolean): any[];
+    getStrategyConfigs?: () => unknown[];
 }
 /** 赠品解析回调 context（OS → SDK 的请求体） */
 export interface OrderGiftSelectContext {

package/lib/modules/Payment/walletpass.js

@@ -214,7 +214,7 @@ var WalletPassPaymentImpl = class {
       };
       const [allList, orderBasicDetail] = await Promise.all([
         this.getUserIdentificationCodeListAsync(identificationParams),
-        baseParams.payment_order_id ? this.getOrderBasicDetailAsync(baseParams.payment_order_id) : Promise.resolve(null)
+        baseParams.payment_order_id && typeof baseParams.payment_order_id === "string" && !baseParams.payment_order_id.startsWith("LOCAL_") ? this.getOrderBasicDetailAsync(baseParams.payment_order_id) : Promise.resolve(null)
       ]);
       const walletPassEvaluator = (_b = (_a = this.paymentModule.window) == null ? void 0 : _a.getWalletPassEvaluator) == null ? void 0 : _b.call(_a);
       if (!walletPassEvaluator) {

package/lib/server/modules/order/index.js

@@ -621,7 +621,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const matchIndex = this.findOrderIndexByIdentity(updatedList, pendingOrder);
       if (matchIndex < 0)
         continue;
-      updatedList[matchIndex] = this.mergeOrderRecords(updatedList[matchIndex], pendingOrder);
+      updatedList[matchIndex] = this.mergeOrderRecords(updatedList[matchIndex], pendingOrder, {
+        preferIncomingProducts: true
+      });
       pendingMap.delete(storageKey);
       memoryPendingMap.delete(storageKey);
       mergeActions[storageKey] = "update";
@@ -1181,7 +1183,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     return result;
   }
-  mergeOrderRecords(existing, incoming) {
+  mergeOrderRecords(existing, incoming, options) {
     const preferred = this.pickPreferredOrder(existing, incoming);
     const secondary = preferred === existing ? incoming : existing;
     const merged = {
@@ -1219,6 +1221,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         mergedRecord[field] = secondaryRecord[field];
       }
     }
+    const hasIncomingProducts = Object.prototype.hasOwnProperty.call(incomingRecord, "products");
+    const shouldUseIncomingProductsSnapshot = (options == null ? void 0 : options.preferIncomingProducts) === true && hasIncomingProducts && incomingRecord.products !== void 0 && incomingRecord.products !== null;
     for (const field of incomingPatchFields) {
       if (!Object.prototype.hasOwnProperty.call(incomingRecord, field))
         continue;
@@ -1228,7 +1232,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         continue;
       mergedRecord[field] = (0, import_lodash_es.cloneDeep)(incomingRecord[field]);
     }
-    mergedRecord.products = this.mergeOrderProductLists(preferredRecord.products, secondaryRecord.products);
+    mergedRecord.products = shouldUseIncomingProductsSnapshot ? (0, import_lodash_es.cloneDeep)(incomingRecord.products) : this.mergeOrderProductLists(preferredRecord.products, secondaryRecord.products);
     if (!this.isPendingSyncOrder(preferred) || !this.isPendingSyncOrder(secondary)) {
       merged.need_sync = 0;
     }

package/lib/server/utils/small-ticket.d.ts

@@ -35,6 +35,7 @@ export interface SmallTicketProduct {
     original_price: string;
     total_original_price: string;
     extension_list: any[];
+    discount_list?: any[];
     options?: Array<{
         name: string;
         num?: number;

package/lib/server/utils/small-ticket.js

@@ -57,6 +57,7 @@ var LABELS = {
     remainingPoints: "Remaining points",
     table: "Table",
     orderDiscount: "Order discount",
+    manualDiscount: "Manual discount",
     payProcessingFee: "Pay processing fee",
     rounding: "Rounding"
   },
@@ -80,6 +81,7 @@ var LABELS = {
     remainingPoints: "剩余积分",
     table: "桌台",
     orderDiscount: "整单折扣",
+    manualDiscount: "手动折扣",
     payProcessingFee: "支付手续费",
     rounding: "抹零"
   },
@@ -103,6 +105,7 @@ var LABELS = {
     remainingPoints: "剩餘積分",
     table: "桌台",
     orderDiscount: "整單折扣",
+    manualDiscount: "手動折扣",
     payProcessingFee: "支付手續費",
     rounding: "抹零"
   }
@@ -184,6 +187,7 @@ function buildProducts(order, locale, productMap) {
       parentProduct
     });
     const resolvedVariant = resolveProductVariantText({ product, parentProduct, locale });
+    const discountList = normalizeProductDiscounts({ product, locale, currencySymbol });
     return {
       product_title: productTitle,
       product_quantity: quantity,
@@ -191,12 +195,40 @@ function buildProducts(order, locale, productMap) {
       original_price: formatMoney(originalPrice, currencySymbol),
       total_original_price: formatMoney(new import_decimal.default(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
       extension_list: Array.isArray(product.extension_list) ? product.extension_list : [],
+      ...discountList.length ? { discount_list: discountList } : {},
       ...options.length ? { options } : {},
       ...resolvedVariant ? { variant: resolvedVariant } : {},
       ...Array.isArray(product.combinations) ? { combinations: product.combinations } : combinations.length ? { combinations } : {}
     };
   });
 }
+function normalizeProductDiscounts(params) {
+  const { product, locale, currencySymbol } = params;
+  return normalizeArray(product.discount_list).map((discount) => {
+    const title = resolveDiscountTitle(discount, locale);
+    const amount = discount.amount ?? discount.value ?? discount.discount_amount;
+    const formattedAmount = formatNegativeMoney(amount, currencySymbol);
+    return {
+      ...discount,
+      item: title,
+      name: title,
+      title,
+      value: formattedAmount
+    };
+  });
+}
+function resolveDiscountTitle(discount, locale) {
+  var _a, _b, _c;
+  const title = getLocalizedValue(
+    ((_a = discount.discount) == null ? void 0 : _a.name) ?? ((_b = discount.discount) == null ? void 0 : _b.title) ?? ((_c = discount.discount) == null ? void 0 : _c.message) ?? discount.name ?? discount.title ?? discount.message,
+    locale
+  );
+  if (title)
+    return title;
+  if (discount.type === "product")
+    return label(locale, "manualDiscount");
+  return "";
+}
 function resolveProductTitle(params) {
   const { product, productMap, locale } = params;
   const ownTitle = getProductTitleSource(product, locale);
@@ -480,11 +512,11 @@ function buildFees(params) {
       value: formatMoney(value, currencySymbol)
     });
   }
-  const discountAmount = summary.discount_amount || order.discount_amount || order.shop_discount;
+  const discountAmount = order.shop_discount ?? summary.discount_amount ?? order.discount_amount;
   if (isNonZero(discountAmount)) {
     fees.push({
       item: label(locale, "orderDiscount"),
-      value: formatMoney(new import_decimal.default(toMoneyNumber(discountAmount)).neg(), currencySymbol)
+      value: formatNegativeMoney(discountAmount, currencySymbol)
     });
   }
   const taxFee = summary.tax_fee || order.tax_fee;
@@ -712,8 +744,9 @@ function getLocalizedValue(value, locale) {
   if (typeof value !== "object")
     return stringify(value);
   const dashedLocale = locale.replace("_", "-");
+  const underscoredLocale = locale.replace("-", "_");
   return stringify(
-    value[locale] ?? value[dashedLocale] ?? value.default ?? value.en ?? ""
+    value[locale] ?? value[dashedLocale] ?? value[underscoredLocale] ?? value.original ?? value.auto ?? value.default ?? value.en ?? ""
   );
 }
 function buildShopAddress(shopInfo) {
@@ -742,6 +775,10 @@ function formatMoney(value, currencySymbol) {
   const amount = new import_decimal.default(toMoneyNumber(value));
   return `${currencySymbol}${amount.toFixed(2)}`;
 }
+function formatNegativeMoney(value, currencySymbol) {
+  const amount = new import_decimal.default(toMoneyNumber(value)).abs();
+  return `-${currencySymbol}${amount.toFixed(2)}`;
+}
 function calculateReceiptPaidAmount(order, summary) {
   const paidAmount = sumPayments(order.payments);
   const payProcessingFee = new import_decimal.default(

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 | 2 | 1 | 5 | 3 | 6 | 4;
+        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -322,7 +322,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

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