@pisell/pisellos 2.2.178 → 2.2.180

package/lib/modules/Order/utils.js

@@ -29,50 +29,32 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/modules/Order/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
-  buildManualProductDiscountItem: () => import_manualProductDiscount.buildManualProductDiscountItem,
   buildSubmitPayload: () => buildSubmitPayload,
-  clearTempOrderHolderAssignments: () => clearTempOrderHolderAssignments,
   composeLinePrice: () => composeLinePrice,
   createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
   createDefaultTempOrder: () => createDefaultTempOrder,
   createEmptySummary: () => import_utils2.createEmptySummary,
   createUuidV4: () => createUuidV4,
-  ensureManualProductDiscountList: () => import_manualProductDiscount.ensureManualProductDiscountList,
-  findManualProductDiscountItem: () => import_manualProductDiscount.findManualProductDiscountItem,
   formatDateTime: () => formatDateTime,
   formatV1Product: () => formatV1Product,
   generateDuration: () => generateDuration,
   getAllDiscountList: () => getAllDiscountList,
-  hasAssignedHolderId: () => hasAssignedHolderId,
   isTempOrder: () => isTempOrder,
   mapPaymentItemToOrderPayment: () => mapPaymentItemToOrderPayment,
   mapPaymentItemsToOrderPayments: () => mapPaymentItemsToOrderPayments,
-  mergeManualProductDiscountIntoList: () => import_manualProductDiscount.mergeManualProductDiscountIntoList,
   mergeRelationForms: () => mergeRelationForms,
   normalizeBookingIsAll: () => normalizeBookingIsAll,
   normalizeBookingSubType: () => normalizeBookingSubType,
-  normalizeOrderProductDiscountList: () => normalizeOrderProductDiscountList,
   normalizeSubmitBooking: () => normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue: () => normalizeSubmitCollectPaxValue,
-  resolveEffectivePerUnitDiscount: () => resolveEffectivePerUnitDiscount,
-  resolveManualDiscountMessage: () => import_manualProductDiscount.resolveManualDiscountMessage,
-  resolveManualDiscountOriginTotal: () => import_manualProductDiscount.resolveManualDiscountOriginTotal,
-  resolveManualDiscountReasonFromSources: () => import_manualProductDiscount.resolveManualDiscountReasonFromSources,
-  resolveManualOverrideLineOriginalPrice: () => resolveManualOverrideLineOriginalPrice,
-  resolveRulesManualDiscountFlag: () => resolveRulesManualDiscountFlag,
-  resolveSafeProductNum: () => import_manualProductDiscount.resolveSafeProductNum,
   resolveSubmitCollectPax: () => resolveSubmitCollectPax,
-  shouldBuildManualProductDiscount: () => import_manualProductDiscount.shouldBuildManualProductDiscount,
-  stripManualProductDiscountItems: () => import_manualProductDiscount.stripManualProductDiscountItems,
-  sumOptionUnitPrice: () => sumOptionUnitPrice,
-  syncManualProductDiscountProductNum: () => import_manualProductDiscount.syncManualProductDiscountProductNum
+  sumOptionUnitPrice: () => sumOptionUnitPrice
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../solution/ScanOrder/utils");
 var import_utils2 = require("../../solution/ScanOrder/utils");
-var import_manualProductDiscount = require("./utils/manualProductDiscount");
 function composeLinePrice(params) {
   const { mainPrice, bundle, useOriginalBundle } = params;
   let total = new import_decimal.default(Number(mainPrice) || 0);
@@ -98,105 +80,6 @@ function sumOptionUnitPrice(options) {
   }
   return total;
 }
-function resolveRulesManualDiscountFlag(metadata) {
-  if (!metadata)
-    return void 0;
-  if (metadata.is_manual_discount === true || metadata.is_manual_discount === 1) {
-    return true;
-  }
-  const priceOverride = metadata.price_override;
-  if (priceOverride !== void 0 && priceOverride !== null && priceOverride !== "") {
-    return true;
-  }
-  return void 0;
-}
-function normalizeOrderProductDiscountAmount(amount) {
-  if (amount === void 0 || amount === null)
-    return void 0;
-  return String(amount);
-}
-function normalizeOrderProductDiscountList(discountList) {
-  if (!Array.isArray(discountList))
-    return [];
-  return discountList.filter((item) => !!item && typeof item === "object").map((item) => {
-    const normalized = {
-      discount_id: Number.isFinite(Number(item.discount_id)) ? Number(item.discount_id) : 0
-    };
-    if (item.order_discount_id === null) {
-      normalized.order_discount_id = null;
-    } else if (item.order_discount_id !== void 0) {
-      const orderDiscountId = Number(item.order_discount_id);
-      if (Number.isFinite(orderDiscountId)) {
-        normalized.order_discount_id = orderDiscountId;
-      }
-    }
-    if (item.type !== void 0)
-      normalized.type = item.type;
-    const amount = normalizeOrderProductDiscountAmount(item.amount);
-    if (amount !== void 0)
-      normalized.amount = amount;
-    if (item.discount && typeof item.discount === "object") {
-      normalized.discount = { ...item.discount };
-    }
-    if (item.metadata === null) {
-      normalized.metadata = null;
-    } else if (item.metadata && typeof item.metadata === "object") {
-      normalized.metadata = { ...item.metadata };
-    }
-    return normalized;
-  });
-}
-function resolveManualOverrideLineOriginalPrice(params, fallbackCompositeOriginal) {
-  var _a, _b;
-  const metadata = params.metadata || {};
-  const priceOverride = metadata.price_override;
-  if (priceOverride === void 0 || priceOverride === null || priceOverride === "") {
-    return fallbackCompositeOriginal;
-  }
-  const refTotal = (_b = (_a = metadata.origin) == null ? void 0 : _a._extend) == null ? void 0 : _b.origin_total;
-  if (refTotal !== void 0 && refTotal !== null && refTotal !== "") {
-    const parsed = Number(refTotal);
-    if (Number.isFinite(parsed)) {
-      return new import_decimal.default(parsed).toDecimalPlaces(2).toFixed(2);
-    }
-  }
-  const lineOriginal = params.lineOriginalPrice;
-  if (lineOriginal !== void 0 && lineOriginal !== null && lineOriginal !== "") {
-    const parsedLine = Number(lineOriginal);
-    const parsedFallback = Number(fallbackCompositeOriginal);
-    if (Number.isFinite(parsedLine) && Number.isFinite(parsedFallback) && parsedLine > parsedFallback) {
-      return new import_decimal.default(parsedLine).toDecimalPlaces(2).toFixed(2);
-    }
-  }
-  return fallbackCompositeOriginal;
-}
-function resolveEffectivePerUnitDiscount(product) {
-  const discountList = Array.isArray(product == null ? void 0 : product.discount_list) ? product.discount_list : [];
-  const fromList = discountList.reduce(
-    (sum, discount) => sum + Number((discount == null ? void 0 : discount.amount) || 0),
-    0
-  );
-  const hasPromoDiscountItem = discountList.some((item) => (item == null ? void 0 : item.type) === "promotion");
-  if (hasPromoDiscountItem)
-    return fromList;
-  const metadata = (product == null ? void 0 : product.metadata) || {};
-  const optionSum = sumOptionUnitPrice(product == null ? void 0 : product.product_option_item).toNumber();
-  if (metadata.source_product_price != null && metadata.main_product_selling_price != null) {
-    const source = Number(metadata.source_product_price);
-    const selling = Number(metadata.main_product_selling_price) - optionSum;
-    if (Number.isFinite(source) && Number.isFinite(selling) && source !== selling) {
-      return fromList + (source - selling);
-    }
-  }
-  const promo = metadata._promotion;
-  if ((promo == null ? void 0 : promo.inPromotion) !== true)
-    return fromList;
-  const originalPrice = Number(promo.originalPrice);
-  const finalPrice = Number(promo.finalPrice);
-  if (!Number.isFinite(originalPrice) || !Number.isFinite(finalPrice))
-    return fromList;
-  return fromList + (originalPrice - finalPrice);
-}
 function createDefaultOrderRulesHooks() {
   const toUnitPriceString = (totalLike, num) => {
     const effectiveNum = Number(num) > 0 ? Number(num) : 1;
@@ -231,7 +114,7 @@ function createDefaultOrderRulesHooks() {
         id: product.product_id,
         // Rules 引擎用 _id 作为 processedProductsMap 键；必须与购物车行级 identity 一致，
         // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
-        // 不透明 identity 契约下，normalizeOrderProduct / hydrate 已保证唯一值存在；
+        // 不透明 identity 契约下，normalizeOrderProduct / restoreTempOrderFromStorage 已保证唯一值存在；
         // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
         _id: ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? `${product.product_id}_${product.product_variant_id}_${product.metadata.unique_identification_number}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils.buildProductLineFingerprint)(
           product.product_option_item,
@@ -252,14 +135,9 @@ function createDefaultOrderRulesHooks() {
         bundle: product.product_bundle || [],
         booking_id: ((_b = product.metadata) == null ? void 0 : _b.booking_id) || null,
         isClient: false,
-        // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
-        // 无券时会把 bundle 价还原成 original_price（手动改价套餐会从 20 回到 30）。
-        isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
-        holder_id: (_c = product.metadata) == null ? void 0 : _c.holder_id,
-        startDate: ((_d = product.metadata) == null ? void 0 : _d.start_date) || ((_e = product.metadata) == null ? void 0 : _e.startDate),
-        main_product_selling_price: metadataAny.main_product_selling_price !== void 0 ? new import_decimal.default(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString() : void 0,
-        inPromotion: ((_f = metadataAny._promotion) == null ? void 0 : _f.inPromotion) === true,
-        _promotion: metadataAny._promotion
+        isManualDiscount: ((_c = product.metadata) == null ? void 0 : _c.is_manual_discount) || false,
+        holder_id: (_d = product.metadata) == null ? void 0 : _d.holder_id,
+        startDate: ((_e = product.metadata) == null ? void 0 : _e.start_date) || ((_f = product.metadata) == null ? void 0 : _f.startDate)
       };
     },
     setProduct: (product, values) => {
@@ -282,14 +160,10 @@ function createDefaultOrderRulesHooks() {
         bundle: nextBundle,
         useOriginalBundle: true
       });
-      const finalOriginalPrice = resolveManualOverrideLineOriginalPrice(
-        { num: nextNum, metadata: metadataAny, lineOriginalPrice: product.original_price },
-        composedOriginalPrice
-      );
       return {
         ...product,
         selling_price: composedSellingPrice,
-        original_price: finalOriginalPrice,
+        original_price: composedOriginalPrice,
         discount_list: values.discount_list ?? product.discount_list,
         num: values.quantity ?? product.num,
         product_bundle: nextBundle,
@@ -447,11 +321,6 @@ function normalizeSubmitProduct(product) {
     num,
     product_option_item: productOptionItem,
     surcharge_fee: _productSurchargeFee,
-    discount_amount: _deprecatedDiscountAmount,
-    discount_type: _deprecatedDiscountType,
-    discountway: _deprecatedDiscountway,
-    product_discount_reason: _deprecatedProductDiscountReason,
-    discount_per: _deprecatedDiscountPer,
     ...productRest
   } = submitProduct;
   const rawMetadata = submitProduct.metadata || {};
@@ -496,7 +365,7 @@ function normalizeSubmitProduct(product) {
     ...bookingUid ? { booking_uid: bookingUid } : {},
     product_quantity: toBundleNumber(num ?? submitProduct.product_quantity, 1),
     product_sku: productSku,
-    discount_list: normalizeOrderProductDiscountList(submitProduct.discount_list),
+    discount_list: submitProduct.discount_list || [],
     product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
     metadata: cleanMetadata,
     // 出站兼容：后端消费 payment_price 字段，这里从 selling_price 直接派生。
@@ -556,23 +425,22 @@ function createDefaultTempOrder(params) {
   return {
     order_id: null,
     external_sale_number: "",
-    order_number: null,
-    shop_order_number: null,
-    shop_full_order_number: null,
-    type: "",
-    business_code: void 0,
+    order_number: "",
+    shop_order_number: "",
+    shop_full_order_number: "",
+    type: "appointment_booking",
+    business_code: "appointment_booking",
     platform: "h5",
     sales_channel: "my_pisel",
     order_sales_channel: "online_store",
     status: "normal",
     payment_status: "payment_processing",
     shipping_status: "unfulfilled",
-    customer_id: 0,
+    customer_id: null,
     customer_name: "",
     country_calling_code: "",
     phone: "",
     email: "",
-    customer: null,
     is_price_include_tax: 1,
     tax_title: "",
     tax_country_code: "",
@@ -587,10 +455,12 @@ function createDefaultTempOrder(params) {
     schedule_date: params.now,
     created_at: params.now,
     request_unique_idempotency_token: "",
+    vouchers: [],
     products: [],
     bookings: [],
     payments: [],
     surcharges: [],
+    discount_list: [],
     relation_forms: [],
     contacts: [],
     contacts_info: null,
@@ -602,7 +472,6 @@ function createDefaultTempOrder(params) {
   };
 }
 function buildSubmitPayload(params) {
-  var _a;
   const {
     tempOrder,
     cacheId,
@@ -628,7 +497,7 @@ function buildSubmitPayload(params) {
     shop_service_type: _shopServiceType,
     start_time: _startTime,
     customer: _customer,
-    discount_list: _discountList,
+    shop_full_order_number: _shopFullOrderNumber,
     tax_fee: _rootTaxFee,
     total_amount: _totalAmount,
     total_refund_amount: _totalRefundAmount,
@@ -636,25 +505,12 @@ function buildSubmitPayload(params) {
     holder_id: _holderId,
     ...tempOrderRest
   } = tempOrder;
-  let submitType = type ?? tempOrder.type;
-  if (!submitType) {
-    if ((_a = tempOrder == null ? void 0 : tempOrder.bookings) == null ? void 0 : _a.length) {
-      submitType = "appointment_booking";
-    } else {
-      submitType = "virtual";
-    }
-  }
   const payload = {
     ...tempOrderRest,
-    customer_id: tempOrder.customer_id ?? 1,
-    customer_name: tempOrder.customer_name || "Select a customer",
-    order_number: null,
-    shop_order_number: null,
-    shop_full_order_number: null,
     platform: normalizeSubmitPlatform(platform),
     request_unique_idempotency_token: tempOrder.request_unique_idempotency_token || `${tempOrder.external_sale_number}_${now.getTime()}`,
-    type: submitType,
-    business_code: businessCode ?? tempOrder.business_code,
+    type: type ?? tempOrder.type ?? "table-order",
+    business_code: businessCode ?? tempOrder.business_code ?? "table-order",
     sales_channel: tempOrder.sales_channel || "my_pisel",
     order_sales_channel: channel ?? tempOrder.order_sales_channel ?? "online_store",
     status: tempOrder.status || "normal",
@@ -669,11 +525,12 @@ function buildSubmitPayload(params) {
     note: tempOrder.note || "",
     delivery_type: tempOrder.delivery_type || "nil",
     schedule_date: scheduleDate,
-    // created_at: tempOrder.created_at || formatDateTime(now), 和后端协定这个字段先不提交到接口
+    created_at: tempOrder.created_at || formatDateTime(now),
     bookings: (tempOrder.bookings || []).filter(
-      (booking) => Number(booking.parent_id) !== 0
+      (booking) => Number(booking.parent_id ?? 0) !== 0
     ).map((booking) => normalizeSubmitBooking(booking)),
     payments: tempOrder.payments || [],
+    // discount_list: tempOrder.discount_list || [],
     relation_forms: tempOrder.relation_forms || [],
     // contacts: tempOrder.contacts || [],
     contacts_info: tempOrder.contacts_info && !Array.isArray(tempOrder.contacts_info) ? tempOrder.contacts_info : null,
@@ -754,90 +611,26 @@ function formatV1Product(products) {
     };
   });
 }
-function hasAssignedHolderId(value) {
-  if (value === void 0 || value === null || value === "")
-    return false;
-  if (Array.isArray(value))
-    return value.length > 0;
-  return true;
-}
-function clearTempOrderHolderAssignments(tempOrder) {
-  var _a;
-  let changed = false;
-  const resetHolderField = (target, key = "holder_id") => {
-    if (!hasAssignedHolderId(target[key]))
-      return;
-    target[key] = null;
-    changed = true;
-  };
-  for (const product of tempOrder.products || []) {
-    if (product.metadata && typeof product.metadata === "object") {
-      resetHolderField(product.metadata);
-    }
-  }
-  for (const booking of tempOrder.bookings || []) {
-    const bookingRecord = booking;
-    if (booking.metadata && typeof booking.metadata === "object") {
-      resetHolderField(booking.metadata);
-    }
-    if (bookingRecord.holder !== void 0 && bookingRecord.holder !== null) {
-      delete bookingRecord.holder;
-      changed = true;
-    }
-  }
-  const productsByUid = (_a = tempOrder._extend) == null ? void 0 : _a.productsByUid;
-  if (productsByUid && typeof productsByUid === "object") {
-    for (const entry of Object.values(productsByUid)) {
-      const origin = entry == null ? void 0 : entry.origin;
-      if (!origin || typeof origin !== "object")
-        continue;
-      if (origin.metadata && typeof origin.metadata === "object") {
-        resetHolderField(origin.metadata);
-      }
-      if (origin._extend && typeof origin._extend === "object") {
-        resetHolderField(origin._extend);
-      }
-    }
-  }
-  return changed;
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  buildManualProductDiscountItem,
   buildSubmitPayload,
-  clearTempOrderHolderAssignments,
   composeLinePrice,
   createDefaultOrderRulesHooks,
   createDefaultTempOrder,
   createEmptySummary,
   createUuidV4,
-  ensureManualProductDiscountList,
-  findManualProductDiscountItem,
   formatDateTime,
   formatV1Product,
   generateDuration,
   getAllDiscountList,
-  hasAssignedHolderId,
   isTempOrder,
   mapPaymentItemToOrderPayment,
   mapPaymentItemsToOrderPayments,
-  mergeManualProductDiscountIntoList,
   mergeRelationForms,
   normalizeBookingIsAll,
   normalizeBookingSubType,
-  normalizeOrderProductDiscountList,
   normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue,
-  resolveEffectivePerUnitDiscount,
-  resolveManualDiscountMessage,
-  resolveManualDiscountOriginTotal,
-  resolveManualDiscountReasonFromSources,
-  resolveManualOverrideLineOriginalPrice,
-  resolveRulesManualDiscountFlag,
-  resolveSafeProductNum,
   resolveSubmitCollectPax,
-  shouldBuildManualProductDiscount,
-  stripManualProductDiscountItems,
-  sumOptionUnitPrice,
-  syncManualProductDiscountProductNum
+  sumOptionUnitPrice
 });

package/lib/modules/Quotation/index.d.ts

@@ -47,6 +47,7 @@ export declare class QuotationModule extends BaseModule implements Module {
         customer_id?: number | string;
     }): Map<string, string | null>;
     setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
+    private filterQuotationsByCustomer;
     private isQuotationVisibleForCustomer;
     private hasValidCustomerId;
     private isQuotationActiveAt;

package/lib/modules/Quotation/index.js

@@ -43,6 +43,8 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
     const query = {};
     if (params == null ? void 0 : params.channel)
       query.channel = params.channel;
+    if (params == null ? void 0 : params.customer_id)
+      query.customer_id = String(params.customer_id);
     if ((params == null ? void 0 : params.channel) === "online_store") {
       query.channel = "online-store";
     }
@@ -51,7 +53,10 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
       query,
       { useCache: false }
     );
-    const list = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [];
+    const list = this.filterQuotationsByCustomer(
+      ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [],
+      params == null ? void 0 : params.customer_id
+    );
     list.sort((a, b) => a.sort - b.sort);
     this.store.list = list;
   }
@@ -69,11 +74,9 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
   getPriceForProduct(params) {
     const { productId, variantId, datetime, customer_id } = params;
     for (const quotation of this.store.list) {
-      const visible = this.isQuotationVisibleForCustomer(quotation, customer_id);
-      if (!visible)
+      if (!this.isQuotationVisibleForCustomer(quotation, customer_id))
         continue;
-      const active = this.isQuotationActiveAt(quotation, datetime);
-      if (!active)
+      if (!this.isQuotationActiveAt(quotation, datetime))
         continue;
       const match = this.findProductData(quotation.product_data, productId, variantId);
       if (!match)
@@ -125,6 +128,9 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
   setScheduleResolver(resolver) {
     this.scheduleResolver = resolver;
   }
+  filterQuotationsByCustomer(list, customerId) {
+    return list.filter((quotation) => this.isQuotationVisibleForCustomer(quotation, customerId));
+  }
   isQuotationVisibleForCustomer(quotation, customerId) {
     const customers = quotation.customer || [];
     if (customers.length === 0)
@@ -142,27 +148,18 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
     var _a;
     if (!((_a = quotation.schedule) == null ? void 0 : _a.length))
       return false;
-    const scheduleItems = [];
-    quotation.schedule.forEach((s) => {
+    const scheduleItems = quotation.schedule.map((s) => {
       var _a2;
       const full = (_a2 = this.scheduleResolver) == null ? void 0 : _a2.call(this, s.id);
-      if (full) {
-        scheduleItems.push(full);
-        return;
-      }
-      if (this.scheduleResolver) {
-        return;
-      }
-      const fallbackSchedule = {
+      if (full)
+        return full;
+      return {
         ...s,
         repeat_type: s.repeat_type || "none",
         repeat_rule: s.repeat_rule || null,
         time_slot: s.time_slot || []
       };
-      scheduleItems.push(fallbackSchedule);
     });
-    if (!scheduleItems.length)
-      return false;
     return (0, import_getDateIsInSchedule.getDateIsInSchedule)(datetime, scheduleItems);
   }
   findProductData(productData, productId, variantId) {

package/lib/modules/Rules/index.d.ts

@@ -32,10 +32,6 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         unavailableReason?: UnavailableReason;
     };
     filterDiscountListByType(discountList: Discount[], type: string): Discount[];
-    /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
-    excludeDiscountListByType(discountList: Discount[], type: string): Discount[];
-    /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
-    resolveDiscountListForManualOverride(discountList: Discount[]): Discount[];
     private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];

package/lib/modules/Rules/index.js

@@ -159,14 +159,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   filterDiscountListByType(discountList, type) {
     return (discountList || []).filter((item) => item.type === type || item.tag === type);
   }
-  /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
-  excludeDiscountListByType(discountList, type) {
-    return (discountList || []).filter((item) => item.type !== type && item.tag !== type);
-  }
-  /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
-  resolveDiscountListForManualOverride(discountList) {
-    return this.excludeDiscountListByType(discountList, "promotion");
-  }
   // 获取券不可用的原因
   getUnavailableReason(discountList, productList) {
     var _a;
@@ -681,7 +673,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }, 0);
     };
     sortedFlattenedList.forEach((flatItem, index) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -904,7 +896,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   price: product.price,
                   options: restoredOptions
                 },
-                discount_list: isManualDiscount ? this.resolveDiscountListForManualOverride(product.discount_list) : this.filterDiscountListByType(product.discount_list, "promotion")
+                discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })
             ]);
           } else {
@@ -926,14 +918,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   main_product_selling_price,
                   options: restoredOptions
                 },
-                discount_list: isManualDiscount ? this.resolveDiscountListForManualOverride(product.discount_list) : this.filterDiscountListByType(product.discount_list, "promotion")
+                discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })
             ]);
           }
         } else {
           processedFlatItemsMap.set(flatItem._id, [{
             ...flatItem,
-            discount_list: isManualDiscount ? this.resolveDiscountListForManualOverride(((_v = flatItem.bundleItem) == null ? void 0 : _v.discount_list) || []) : this.filterDiscountListByType(((_w = flatItem.bundleItem) == null ? void 0 : _w.discount_list) || [], "promotion"),
+            discount_list: this.filterDiscountListByType(((_v = flatItem.bundleItem) == null ? void 0 : _v.discount_list) || [], "promotion"),
             price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
             processed: true
           }]);
@@ -984,13 +976,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           if (this.filterDiscountListByType(product.discount_list, "promotion").length && product.origin_total) {
             productOriginTotal = product.origin_total;
           }
-          if (Number(((_x = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _x.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
+          if (Number(((_w = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _w.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
             productOriginTotal = product.total;
           }
           const isOrderLevel = (0, import_utils3.isOrderLevelFixedAmountDiscount)(selectedDiscount2);
           const orderLevelAllocation = isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount2.id) : null;
           const productAllocation = orderLevelAllocation == null ? void 0 : orderLevelAllocation.get(flatItem._id);
-          const isDeductOptionPrice = !!((_y = selectedDiscount2.config) == null ? void 0 : _y.deductOptionPrice);
+          const isDeductOptionPrice = !!((_x = selectedDiscount2.config) == null ? void 0 : _x.deductOptionPrice);
           let mainProductSellingPrice;
           let amount;
           let productDiscountDifference;
@@ -1008,7 +1000,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             );
             amount = new import_decimal.default(product.price).minus(new import_decimal.default(mainProductSellingPrice)).toNumber();
           }
-          if (isDeductOptionPrice && ((_z = product.options) == null ? void 0 : _z.length)) {
+          if (isDeductOptionPrice && ((_y = product.options) == null ? void 0 : _y.length)) {
             const optionResult = applyDiscountToOptions(
               product.options,
               selectedDiscount2
@@ -1016,7 +1008,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             discountedOptions = optionResult.discountedOptions;
             optionDiscountAmount = optionResult.optionDiscountAmount;
           }
-          const optionsForLineTotal = isDeductOptionPrice && ((_A = product.options) == null ? void 0 : _A.length) ? discountedOptions : product.options;
+          const optionsForLineTotal = isDeductOptionPrice && ((_z = product.options) == null ? void 0 : _z.length) ? discountedOptions : product.options;
           const optionsLineTotal = getOptionTotal(optionsForLineTotal || []);
           const total = new import_decimal.default(mainProductSellingPrice).plus(optionsLineTotal).toNumber();
           const mainProductDiscountAmount = amount;
@@ -1027,9 +1019,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount: lineDiscountAmount,
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : discountType,
             discount: {
-              discount_card_type: (_B = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _B.discount_card_type,
+              discount_card_type: (_A = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _A.discount_card_type,
               fixed_amount: lineDiscountAmount,
-              discount_calculation_mode: (_C = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _C.discount_calculation_mode,
+              discount_calculation_mode: (_B = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _B.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.price,
@@ -1111,7 +1103,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               type: "good_pass",
               discount: {
                 fixed_amount: product.origin_total,
-                discount_calculation_mode: (_D = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _D.discount_calculation_mode,
+                discount_calculation_mode: (_C = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _C.discount_calculation_mode,
                 resource_id: selectedDiscount2.id,
                 title: selectedDiscount2.format_title,
                 original_amount: product.origin_total,
@@ -1185,9 +1177,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount: fixedAmountPerItem * (product.num || 1),
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
             discount: {
-              discount_card_type: (_E = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _E.discount_card_type,
+              discount_card_type: (_D = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _D.discount_card_type,
               fixed_amount: fixedAmountPerItem,
-              discount_calculation_mode: (_F = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _F.discount_calculation_mode,
+              discount_calculation_mode: (_E = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _E.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
@@ -1203,7 +1195,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
             },
             config: selectedDiscount2 == null ? void 0 : selectedDiscount2.config,
-            _num: (product.num || 1) * (((_G = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _G.num) || 1)
+            _num: (product.num || 1) * (((_F = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _F.num) || 1)
           };
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           appliedProducts.push(discountDetail);

package/lib/modules/SalesSummary/index.js

@@ -30,8 +30,7 @@ __reExport(SalesSummary_exports, require("./types"), module.exports);
 var salesSummaryDataKeys = {
   isPriceIncludeTax: "is_price_include_tax",
   taxRate: "tax_rate",
-  taxTitle: "tax_title",
-  taxCountryCode: "tax_country_code"
+  taxTitle: "tax_title"
 };
 var SalesSummaryModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -85,8 +84,7 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     return {
       isPriceIncludeTax: this.getAppData(salesSummaryDataKeys.isPriceIncludeTax),
       taxRate: this.getAppData(salesSummaryDataKeys.taxRate),
-      taxTitle: this.getAppData(salesSummaryDataKeys.taxTitle),
-      taxCountryCode: this.getAppData(salesSummaryDataKeys.taxCountryCode)
+      taxTitle: this.getAppData(salesSummaryDataKeys.taxTitle)
     };
   }
   async getSummary(params) {