@pisell/pisellos 2.2.167 → 2.2.169

package/lib/modules/Order/utils/manualProductDiscount.js

@@ -0,0 +1,207 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/Order/utils/manualProductDiscount.ts
+var manualProductDiscount_exports = {};
+__export(manualProductDiscount_exports, {
+  buildManualProductDiscountItem: () => buildManualProductDiscountItem,
+  ensureManualProductDiscountList: () => ensureManualProductDiscountList,
+  findManualProductDiscountItem: () => findManualProductDiscountItem,
+  hasManualProductDiscountFlag: () => hasManualProductDiscountFlag,
+  mergeManualProductDiscountIntoList: () => mergeManualProductDiscountIntoList,
+  resolveManualDiscountMessage: () => resolveManualDiscountMessage,
+  resolveManualDiscountOriginTotal: () => resolveManualDiscountOriginTotal,
+  resolveManualDiscountReasonFromSources: () => resolveManualDiscountReasonFromSources,
+  resolveSafeProductNum: () => resolveSafeProductNum,
+  shouldBuildManualProductDiscount: () => shouldBuildManualProductDiscount,
+  stripManualProductDiscountItems: () => stripManualProductDiscountItems,
+  syncManualProductDiscountProductNum: () => syncManualProductDiscountProductNum
+});
+module.exports = __toCommonJS(manualProductDiscount_exports);
+var import_decimal = __toESM(require("decimal.js"));
+function resolveSafeProductNum(num) {
+  const parsed = Number(num);
+  if (!Number.isFinite(parsed) || parsed <= 0)
+    return 1;
+  return Math.floor(parsed);
+}
+function syncManualProductDiscountProductNum(discountList, productNum) {
+  const quantity = resolveSafeProductNum(productNum);
+  return (discountList || []).map((item) => {
+    if ((item == null ? void 0 : item.type) !== "product")
+      return item;
+    return {
+      ...item,
+      discount: {
+        ...item.discount || {},
+        product_num: quantity
+      }
+    };
+  });
+}
+function resolveManualDiscountOriginTotal(sources) {
+  const candidates = [
+    sources.originTotal,
+    sources.extendOriginTotal,
+    sources.originExtendOriginTotal,
+    sources.sourceExtendOriginTotal
+  ];
+  for (const candidate of candidates) {
+    if (candidate === void 0 || candidate === null || candidate === "")
+      continue;
+    const parsed = Number(candidate);
+    if (Number.isFinite(parsed))
+      return parsed;
+  }
+  const unit = Number(sources.catalogUnitPrice);
+  const quantity = sources.quantity ?? 1;
+  if (Number.isFinite(unit) && unit > 0) {
+    return new import_decimal.default(unit).mul(quantity).toNumber();
+  }
+  return NaN;
+}
+function resolveManualDiscountReasonFromSources(sources) {
+  for (const candidate of [
+    sources.discountReason,
+    sources.extendDiscountReason,
+    sources.originExtendDiscountReason
+  ]) {
+    if (candidate != null && String(candidate).trim() !== "") {
+      return String(candidate);
+    }
+  }
+  return "";
+}
+function hasManualProductDiscountFlag(metadata) {
+  if (!metadata)
+    return false;
+  const override = metadata.price_override;
+  if (override !== void 0 && override !== null && override !== "") {
+    return true;
+  }
+  return metadata.is_manual_discount === 1 || metadata.is_manual_discount === true;
+}
+function ensureManualProductDiscountList(params) {
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  const list = params.discountList || [];
+  const quantity = resolveSafeProductNum(params.quantity);
+  if (findManualProductDiscountItem(list)) {
+    return syncManualProductDiscountProductNum(list, quantity);
+  }
+  const metadata = params.metadata || {};
+  const originalNum = Number(params.originalPrice);
+  const sellingNum = Number(params.sellingPrice);
+  const shouldBuild = hasManualProductDiscountFlag(metadata) || shouldBuildManualProductDiscount({ originTotal: originalNum, sellingTotal: sellingNum });
+  if (!shouldBuild) {
+    return list;
+  }
+  if (!Number.isFinite(originalNum) || !Number.isFinite(sellingNum) || originalNum === sellingNum) {
+    return list;
+  }
+  const message = resolveManualDiscountMessage(
+    list,
+    resolveManualDiscountReasonFromSources({
+      extendDiscountReason: (_b = (_a = metadata.origin) == null ? void 0 : _a._extend) == null ? void 0 : _b.discount_reason,
+      originExtendDiscountReason: (_d = (_c = metadata.origin) == null ? void 0 : _c._extend) == null ? void 0 : _d.discount_reason
+    })
+  );
+  return mergeManualProductDiscountIntoList(
+    list,
+    buildManualProductDiscountItem({
+      originTotal: originalNum,
+      sellingTotal: sellingNum,
+      quantity,
+      message,
+      discountway: (_f = (_e = metadata.origin) == null ? void 0 : _e._extend) == null ? void 0 : _f.discountway,
+      discount_per: (_h = (_g = metadata.origin) == null ? void 0 : _g._extend) == null ? void 0 : _h.discount_per
+    })
+  );
+}
+function findManualProductDiscountItem(discountList) {
+  return (discountList || []).find((item) => (item == null ? void 0 : item.type) === "product");
+}
+function resolveManualDiscountMessage(discountList, fallback) {
+  var _a, _b;
+  const message = (_b = (_a = findManualProductDiscountItem(discountList)) == null ? void 0 : _a.discount) == null ? void 0 : _b.message;
+  if (message != null && String(message).trim() !== "") {
+    return String(message);
+  }
+  return fallback ?? "";
+}
+function stripManualProductDiscountItems(discountList) {
+  return (discountList || []).filter((item) => (item == null ? void 0 : item.type) !== "product");
+}
+function buildManualProductDiscountItem(params) {
+  const origin = new import_decimal.default(Number(params.originTotal) || 0);
+  const selling = new import_decimal.default(Number(params.sellingTotal) || 0);
+  const diff = origin.minus(selling);
+  const quantity = resolveSafeProductNum(params.quantity);
+  return {
+    amount: diff.abs().toDecimalPlaces(2).toNumber(),
+    type: "product",
+    discount: {
+      message: params.message ?? "",
+      discountway: params.discountway ?? "num",
+      product_num: quantity,
+      discount_per: params.discount_per ?? "",
+      discount_type: diff.isNegative() ? "change_price" : "discount"
+    }
+  };
+}
+function mergeManualProductDiscountIntoList(discountList, manualItem) {
+  const base = stripManualProductDiscountItems(discountList);
+  if (!manualItem)
+    return base;
+  if (manualItem.amount === 0 && !manualItem.discount.message)
+    return base;
+  return [...base, manualItem];
+}
+function shouldBuildManualProductDiscount(params) {
+  if (params.hasPriceOverride)
+    return true;
+  const origin = Number(params.originTotal);
+  const selling = Number(params.sellingTotal);
+  if (!Number.isFinite(origin) || !Number.isFinite(selling))
+    return false;
+  return origin !== selling;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildManualProductDiscountItem,
+  ensureManualProductDiscountList,
+  findManualProductDiscountItem,
+  hasManualProductDiscountFlag,
+  mergeManualProductDiscountIntoList,
+  resolveManualDiscountMessage,
+  resolveManualDiscountOriginTotal,
+  resolveManualDiscountReasonFromSources,
+  resolveSafeProductNum,
+  shouldBuildManualProductDiscount,
+  stripManualProductDiscountItems,
+  syncManualProductDiscountProductNum
+});

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

@@ -77,6 +77,8 @@ export declare function resolveRulesManualDiscountFlag(metadata: Record<string,
 export declare function resolveManualOverrideLineOriginalPrice(params: {
     num?: number;
     metadata?: Record<string, any> | null;
+    /** 已有行级 original_price（origin 被裁剪时兜底划线价） */
+    lineOriginalPrice?: string | number | null;
 }, fallbackCompositeOriginal: string): string;
 export declare function createDefaultOrderRulesHooks(): RulesParamsHooks;
 /**
@@ -154,3 +156,5 @@ export declare function formatV1Product(products: OrderSubmitProduct[]): {
     unique: string;
 }[];
 export { createEmptySummary } from '../../solution/ScanOrder/utils';
+export { buildManualProductDiscountItem, ensureManualProductDiscountList, findManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountMessage, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, resolveSafeProductNum, shouldBuildManualProductDiscount, syncManualProductDiscountProductNum, stripManualProductDiscountItems, } from './utils/manualProductDiscount';
+export type { ManualProductDiscountItem } from './utils/manualProductDiscount';

package/lib/modules/Order/utils.js

@@ -29,12 +29,15 @@ 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,
   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,
@@ -42,21 +45,30 @@ __export(utils_exports, {
   isTempOrder: () => isTempOrder,
   mapPaymentItemToOrderPayment: () => mapPaymentItemToOrderPayment,
   mapPaymentItemsToOrderPayments: () => mapPaymentItemsToOrderPayments,
+  mergeManualProductDiscountIntoList: () => import_manualProductDiscount.mergeManualProductDiscountIntoList,
   mergeRelationForms: () => mergeRelationForms,
   normalizeBookingIsAll: () => normalizeBookingIsAll,
   normalizeBookingSubType: () => normalizeBookingSubType,
   normalizeSubmitBooking: () => normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue: () => normalizeSubmitCollectPaxValue,
+  resolveManualDiscountMessage: () => import_manualProductDiscount.resolveManualDiscountMessage,
+  resolveManualDiscountOriginTotal: () => import_manualProductDiscount.resolveManualDiscountOriginTotal,
+  resolveManualDiscountReasonFromSources: () => import_manualProductDiscount.resolveManualDiscountReasonFromSources,
   resolveManualOverrideLineOriginalPrice: () => resolveManualOverrideLineOriginalPrice,
   resolveRulesManualDiscountFlag: () => resolveRulesManualDiscountFlag,
+  resolveSafeProductNum: () => import_manualProductDiscount.resolveSafeProductNum,
   resolveSubmitCollectPax: () => resolveSubmitCollectPax,
-  sumOptionUnitPrice: () => sumOptionUnitPrice
+  shouldBuildManualProductDiscount: () => import_manualProductDiscount.shouldBuildManualProductDiscount,
+  stripManualProductDiscountItems: () => import_manualProductDiscount.stripManualProductDiscountItems,
+  sumOptionUnitPrice: () => sumOptionUnitPrice,
+  syncManualProductDiscountProductNum: () => import_manualProductDiscount.syncManualProductDiscountProductNum
 });
 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);
@@ -102,14 +114,21 @@ function resolveManualOverrideLineOriginalPrice(params, fallbackCompositeOrigina
     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 === "") {
-    return fallbackCompositeOriginal;
+  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 parsed = Number(refTotal);
-  if (!Number.isFinite(parsed)) {
-    return fallbackCompositeOriginal;
+  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 new import_decimal.default(parsed).toDecimalPlaces(2).toFixed(2);
+  return fallbackCompositeOriginal;
 }
 function createDefaultOrderRulesHooks() {
   const toUnitPriceString = (totalLike, num) => {
@@ -194,7 +213,7 @@ function createDefaultOrderRulesHooks() {
         useOriginalBundle: true
       });
       const finalOriginalPrice = resolveManualOverrideLineOriginalPrice(
-        { num: nextNum, metadata: metadataAny },
+        { num: nextNum, metadata: metadataAny, lineOriginalPrice: product.original_price },
         composedOriginalPrice
       );
       return {
@@ -358,6 +377,11 @@ 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 || {};
@@ -478,6 +502,7 @@ function createDefaultTempOrder(params) {
     country_calling_code: "",
     phone: "",
     email: "",
+    customer: null,
     is_price_include_tax: 1,
     tax_title: "",
     tax_country_code: "",
@@ -572,7 +597,7 @@ 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
     ).map((booking) => normalizeSubmitBooking(booking)),
@@ -660,12 +685,15 @@ function formatV1Product(products) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  buildManualProductDiscountItem,
   buildSubmitPayload,
   composeLinePrice,
   createDefaultOrderRulesHooks,
   createDefaultTempOrder,
   createEmptySummary,
   createUuidV4,
+  ensureManualProductDiscountList,
+  findManualProductDiscountItem,
   formatDateTime,
   formatV1Product,
   generateDuration,
@@ -673,13 +701,21 @@ function formatV1Product(products) {
   isTempOrder,
   mapPaymentItemToOrderPayment,
   mapPaymentItemsToOrderPayments,
+  mergeManualProductDiscountIntoList,
   mergeRelationForms,
   normalizeBookingIsAll,
   normalizeBookingSubType,
   normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue,
+  resolveManualDiscountMessage,
+  resolveManualDiscountOriginTotal,
+  resolveManualDiscountReasonFromSources,
   resolveManualOverrideLineOriginalPrice,
   resolveRulesManualDiscountFlag,
+  resolveSafeProductNum,
   resolveSubmitCollectPax,
-  sumOptionUnitPrice
+  shouldBuildManualProductDiscount,
+  stripManualProductDiscountItems,
+  sumOptionUnitPrice,
+  syncManualProductDiscountProductNum
 });

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

@@ -32,6 +32,10 @@ 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,6 +159,14 @@ 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;
@@ -673,7 +681,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;
+      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;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -896,7 +904,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   price: product.price,
                   options: restoredOptions
                 },
-                discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
+                discount_list: isManualDiscount ? this.resolveDiscountListForManualOverride(product.discount_list) : this.filterDiscountListByType(product.discount_list, "promotion")
               })
             ]);
           } else {
@@ -918,14 +926,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   main_product_selling_price,
                   options: restoredOptions
                 },
-                discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
+                discount_list: isManualDiscount ? this.resolveDiscountListForManualOverride(product.discount_list) : this.filterDiscountListByType(product.discount_list, "promotion")
               })
             ]);
           }
         } else {
           processedFlatItemsMap.set(flatItem._id, [{
             ...flatItem,
-            discount_list: this.filterDiscountListByType(((_v = flatItem.bundleItem) == null ? void 0 : _v.discount_list) || [], "promotion"),
+            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"),
             price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
             processed: true
           }]);
@@ -976,13 +984,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(((_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) {
+          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) {
             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 = !!((_x = selectedDiscount2.config) == null ? void 0 : _x.deductOptionPrice);
+          const isDeductOptionPrice = !!((_y = selectedDiscount2.config) == null ? void 0 : _y.deductOptionPrice);
           let mainProductSellingPrice;
           let amount;
           let productDiscountDifference;
@@ -1000,7 +1008,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             );
             amount = new import_decimal.default(product.price).minus(new import_decimal.default(mainProductSellingPrice)).toNumber();
           }
-          if (isDeductOptionPrice && ((_y = product.options) == null ? void 0 : _y.length)) {
+          if (isDeductOptionPrice && ((_z = product.options) == null ? void 0 : _z.length)) {
             const optionResult = applyDiscountToOptions(
               product.options,
               selectedDiscount2
@@ -1008,7 +1016,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             discountedOptions = optionResult.discountedOptions;
             optionDiscountAmount = optionResult.optionDiscountAmount;
           }
-          const optionsForLineTotal = isDeductOptionPrice && ((_z = product.options) == null ? void 0 : _z.length) ? discountedOptions : product.options;
+          const optionsForLineTotal = isDeductOptionPrice && ((_A = product.options) == null ? void 0 : _A.length) ? discountedOptions : product.options;
           const optionsLineTotal = getOptionTotal(optionsForLineTotal || []);
           const total = new import_decimal.default(mainProductSellingPrice).plus(optionsLineTotal).toNumber();
           const mainProductDiscountAmount = amount;
@@ -1019,9 +1027,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount: lineDiscountAmount,
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : discountType,
             discount: {
-              discount_card_type: (_A = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _A.discount_card_type,
+              discount_card_type: (_B = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _B.discount_card_type,
               fixed_amount: lineDiscountAmount,
-              discount_calculation_mode: (_B = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _B.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.price,
@@ -1103,7 +1111,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               type: "good_pass",
               discount: {
                 fixed_amount: product.origin_total,
-                discount_calculation_mode: (_C = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _C.discount_calculation_mode,
+                discount_calculation_mode: (_D = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _D.discount_calculation_mode,
                 resource_id: selectedDiscount2.id,
                 title: selectedDiscount2.format_title,
                 original_amount: product.origin_total,
@@ -1177,9 +1185,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: (_D = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _D.discount_card_type,
+              discount_card_type: (_E = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _E.discount_card_type,
               fixed_amount: fixedAmountPerItem,
-              discount_calculation_mode: (_E = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _E.discount_calculation_mode,
+              discount_calculation_mode: (_F = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _F.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
@@ -1195,7 +1203,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) * (((_F = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _F.num) || 1)
+            _num: (product.num || 1) * (((_G = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _G.num) || 1)
           };
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           appliedProducts.push(discountDetail);

package/lib/server/modules/order/utils/filterOrders.js

@@ -33,6 +33,13 @@ __export(filterOrders_exports, {
 });
 module.exports = __toCommonJS(filterOrders_exports);
 var import_dayjs = __toESM(require("dayjs"));
+function getOrderPaymentCodes(order) {
+  const payments = order.payments;
+  if (!Array.isArray(payments) || payments.length === 0) {
+    return [];
+  }
+  return payments.map((item) => item == null ? void 0 : item.code).filter((code) => typeof code === "string" && code.length > 0);
+}
 function filterOrders(orders, filters) {
   const safeFilters = filters || {};
   if (!orders || !Array.isArray(orders)) {
@@ -133,26 +140,27 @@ function filterOrders(orders, filters) {
       }
     }
     if (safeFilters.payment_methods && safeFilters.payment_methods.length > 0) {
-      if (!order.payment_methods || !Array.isArray(order.payment_methods) || order.payment_methods.length === 0) {
+      const orderPaymentCodes = getOrderPaymentCodes(order);
+      if (orderPaymentCodes.length === 0) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
             field: "payment_methods",
-            actual: order.payment_methods,
+            actual: order.payments,
             expected: safeFilters.payment_methods
           }
         });
         return false;
       }
-      const hasMatch = order.payment_methods.some((pm) => safeFilters.payment_methods.includes(pm));
+      const hasMatch = orderPaymentCodes.some((code) => safeFilters.payment_methods.includes(code));
       if (!hasMatch) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
             field: "payment_methods",
-            actual: order.payment_methods,
+            actual: orderPaymentCodes,
             expected: safeFilters.payment_methods
           }
         });

package/lib/solution/BaseSales/index.js

@@ -780,6 +780,12 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       tempOrder.discount_list = (nextDiscountList || []).filter((d) => d.isSelected);
       await this.store.order.recalculateSummary({ createIfMissing: true });
       this.store.order.persistTempOrder();
+      this.effectsEmit("onDiscountApplied", {
+        productList: tempOrder.products,
+        discountList: nextDiscountList,
+        selectedDiscountList: tempOrder.discount_list,
+        tempOrder
+      });
     } catch (error) {
       throw error;
     }

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

@@ -22,6 +22,7 @@ __export(transformBaseProductToOrderProduct_exports, {
   transformBaseProductToOrderProduct: () => transformBaseProductToOrderProduct
 });
 module.exports = __toCommonJS(transformBaseProductToOrderProduct_exports);
+var import_manualProductDiscount = require("../../../modules/Order/utils/manualProductDiscount");
 function toNumber(value, fallback = 0) {
   const parsedValue = Number(value);
   if (!Number.isFinite(parsedValue))
@@ -87,7 +88,7 @@ function findVariantById(origin, variantId) {
   return variants.find((variant) => Number(variant == null ? void 0 : variant.id) === variantId) || null;
 }
 function transformBaseProductToOrderProduct(params) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
   const { payload, fallbackProductId = null } = params;
   if (!payload || typeof payload !== "object")
     return null;
@@ -124,6 +125,39 @@ function transformBaseProductToOrderProduct(params) {
     hasPriceOverride
   );
   const uniqueIdentificationNumber = payload.unique_identification_number ?? payload.unique;
+  const resolvedQuantity = toSafePositiveInt(payload.quantity ?? payload.num, 1);
+  const originTotal = (0, import_manualProductDiscount.resolveManualDiscountOriginTotal)({
+    originTotal: payload.origin_total,
+    extendOriginTotal: (_d = payload._extend) == null ? void 0 : _d.origin_total,
+    originExtendOriginTotal: (_e = origin == null ? void 0 : origin._extend) == null ? void 0 : _e.origin_total,
+    sourceExtendOriginTotal: (_f = sourceProduct == null ? void 0 : sourceProduct._extend) == null ? void 0 : _f.origin_total,
+    catalogUnitPrice: (origin == null ? void 0 : origin.base_price) ?? (origin == null ? void 0 : origin.price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price),
+    quantity: resolvedQuantity
+  });
+  const sellingTotal = Number(
+    payload.line_total ?? payload.total ?? ((_g = payload._extend) == null ? void 0 : _g.total) ?? lineCompositeTotal
+  );
+  const discountReason = (0, import_manualProductDiscount.resolveManualDiscountReasonFromSources)({
+    discountReason: payload.discount_reason,
+    extendDiscountReason: (_h = payload._extend) == null ? void 0 : _h.discount_reason,
+    originExtendDiscountReason: (_i = origin == null ? void 0 : origin._extend) == null ? void 0 : _i.discount_reason
+  });
+  const lineOriginalPrice = hasPriceOverride && Number.isFinite(originTotal) ? toPriceString(originTotal) : lineCompositeTotal;
+  const manualDiscountList = (0, import_manualProductDiscount.shouldBuildManualProductDiscount)({
+    hasPriceOverride,
+    originTotal,
+    sellingTotal
+  }) ? (0, import_manualProductDiscount.mergeManualProductDiscountIntoList)(
+    payload.discount_list,
+    (0, import_manualProductDiscount.buildManualProductDiscountItem)({
+      originTotal: Number.isFinite(originTotal) ? originTotal : Number(lineOriginalPrice),
+      sellingTotal: Number.isFinite(sellingTotal) ? sellingTotal : Number(lineCompositeTotal),
+      quantity: resolvedQuantity,
+      message: discountReason,
+      discountway: (_j = payload._extend) == null ? void 0 : _j.discountway,
+      discount_per: (_k = payload._extend) == null ? void 0 : _k.discount_per
+    })
+  ) : payload.discount_list || [];
   const metadata = {
     unique: payload.unique,
     session: payload.session,
@@ -138,7 +172,10 @@ function transformBaseProductToOrderProduct(params) {
     source_product_price: sourceProductPrice,
     main_product_selling_price: sourceProductPrice,
     main_product_original_price: sourceProductPrice,
-    ...hasPriceOverride ? { price_override: String(payload.price_override) } : {},
+    ...hasPriceOverride ? {
+      price_override: String(payload.price_override),
+      is_manual_discount: 1
+    } : {},
     ...payload.bundle_edit !== void 0 ? { bundle_edit: payload.bundle_edit } : {}
   };
   if (uniqueIdentificationNumber) {
@@ -148,12 +185,13 @@ function transformBaseProductToOrderProduct(params) {
     product_id: productId,
     product_variant_id: productVariantId,
     unique_identification_number: uniqueIdentificationNumber ? String(uniqueIdentificationNumber) : void 0,
-    num: toSafePositiveInt(payload.quantity ?? payload.num, 1),
+    num: resolvedQuantity,
     product_option_item: productOptionItem,
     product_bundle: productBundle,
+    discount_list: manualDiscountList,
     // 折后行价由 normalizeOrderProduct 按 main + bundle 合成；手动改价时 bundle 已为分摊后单价
     selling_price: lineCompositeTotal,
-    original_price: lineCompositeTotal,
+    original_price: lineOriginalPrice,
     tax_fee: toPriceString(
       payload.tax_fee ?? (matchedVariant == null ? void 0 : matchedVariant.tax_fee) ?? (origin == null ? void 0 : origin.tax_fee) ?? (sourceProduct == null ? void 0 : sourceProduct.tax_fee),
       "0.00"