@pisell/pisellos 2.2.168 → 2.2.169

package/dist/modules/Order/index.js

@@ -30,6 +30,7 @@ import { generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPa
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
 import { buildProductLineFingerprint, getProductIdentityIndex, getSafeProductNum, isIdentityMatch, normalizeOrderProduct } from "../../solution/ScanOrder/utils";
+import { syncManualProductDiscountProductNum } from "./utils/manualProductDiscount";
 import { DiscountModule } from "../Discount";
 import { RulesModule } from "../Rules";
 import { UnavailableReason } from "../Rules/types";
@@ -375,7 +376,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         orderTotalAmount: Number(((_this$store$summary2 = this.store.summary) === null || _this$store$summary2 === void 0 ? void 0 : _this$store$summary2.total_amount) || 0)
       });
       if (result !== null && result !== void 0 && result.productList) {
-        tempOrder.products = result.productList;
+        tempOrder.products = (result.productList || []).map(function (product) {
+          return _objectSpread(_objectSpread({}, product), {}, {
+            discount_list: syncManualProductDiscountProductNum(product.discount_list, product.num)
+          });
+        });
       }
       if (result !== null && result !== void 0 && result.discountList) {
         var _this$store$discount8;
@@ -1284,25 +1289,51 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       this.persistTempOrder();
       return tempOrder.contacts_info;
     }
+  }, {
+    key: "buildTempOrderCustomer",
+    value: function buildTempOrderCustomer(params) {
+      var _ref8, _ref9, _ref10, _source$name, _ref11, _ref12, _ref13, _source$customer_name, _source$id, _source$customer_id, _ref14, _source$country_calli, _source$phone, _source$email;
+      if (!params.customerId) return null;
+      var source = params.source ? cloneDeep(params.source) : {};
+      var name = (_ref8 = (_ref9 = (_ref10 = (_source$name = source.name) !== null && _source$name !== void 0 ? _source$name : source.display_name) !== null && _ref10 !== void 0 ? _ref10 : source.customerName) !== null && _ref9 !== void 0 ? _ref9 : source.customer_name) !== null && _ref8 !== void 0 ? _ref8 : params.customerName;
+      var customerName = (_ref11 = (_ref12 = (_ref13 = (_source$customer_name = source.customer_name) !== null && _source$customer_name !== void 0 ? _source$customer_name : source.customerName) !== null && _ref13 !== void 0 ? _ref13 : source.display_name) !== null && _ref12 !== void 0 ? _ref12 : source.name) !== null && _ref11 !== void 0 ? _ref11 : params.customerName;
+      return _objectSpread(_objectSpread({}, source), {}, {
+        id: (_source$id = source.id) !== null && _source$id !== void 0 ? _source$id : params.customerId,
+        customer_id: (_source$customer_id = source.customer_id) !== null && _source$customer_id !== void 0 ? _source$customer_id : params.customerId,
+        name: String(name || ''),
+        customer_name: String(customerName || ''),
+        country_calling_code: String((_ref14 = (_source$country_calli = source.country_calling_code) !== null && _source$country_calli !== void 0 ? _source$country_calli : source.countryCallingCode) !== null && _ref14 !== void 0 ? _ref14 : params.countryCallingCode),
+        phone: String((_source$phone = source.phone) !== null && _source$phone !== void 0 ? _source$phone : params.phone),
+        email: String((_source$email = source.email) !== null && _source$email !== void 0 ? _source$email : params.email)
+      });
+    }
 
     /**
      * 更新当前 tempOrder 的客户协议字段。
      *
-     * PaymentModal 只需要修改订单里的客户字段；如果外部还有客户模块需要同步，
+     * PaymentModal 只需要修改订单里的客户事实；如果外部还有客户模块需要同步，
      * 应由调用方通过回调处理，不能把外部 UI 状态写进 tempOrder。
      */
   }, {
     key: "updateTempOrderCustomer",
     value: function updateTempOrderCustomer(customer) {
-      var _ref8, _ref9, _customer$customer_id, _ref10, _ref11, _ref12, _customer$customer_na, _ref13, _customer$country_cal;
+      var _ref15, _ref16, _customer$customer_id, _ref17, _ref18, _ref19, _customer$customer_na, _ref20, _customer$country_cal;
       var tempOrder = this.ensureTempOrder();
-      var customerId = (_ref8 = (_ref9 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref9 !== void 0 ? _ref9 : customer.id) !== null && _ref8 !== void 0 ? _ref8 : null;
-      var customerName = (_ref10 = (_ref11 = (_ref12 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref12 !== void 0 ? _ref12 : customer.display_name) !== null && _ref11 !== void 0 ? _ref11 : customer.name) !== null && _ref10 !== void 0 ? _ref10 : '';
+      var customerId = (_ref15 = (_ref16 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref16 !== void 0 ? _ref16 : customer.id) !== null && _ref15 !== void 0 ? _ref15 : null;
+      var customerName = (_ref17 = (_ref18 = (_ref19 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref19 !== void 0 ? _ref19 : customer.display_name) !== null && _ref18 !== void 0 ? _ref18 : customer.name) !== null && _ref17 !== void 0 ? _ref17 : '';
       tempOrder.customer_id = customerId === null || customerId === undefined || customerId === '' ? null : Number(customerId);
       tempOrder.customer_name = String(customerName || '');
-      tempOrder.country_calling_code = String((_ref13 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref13 !== void 0 ? _ref13 : '');
+      tempOrder.country_calling_code = String((_ref20 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref20 !== void 0 ? _ref20 : '');
       tempOrder.phone = String(customer.phone || '');
       tempOrder.email = String(customer.email || '');
+      tempOrder.customer = this.buildTempOrderCustomer({
+        source: customer,
+        customerId: tempOrder.customer_id,
+        customerName: tempOrder.customer_name,
+        countryCallingCode: tempOrder.country_calling_code,
+        phone: tempOrder.phone,
+        email: tempOrder.email
+      });
       this.persistTempOrder();
       return {
         customerId: tempOrder.customer_id,
@@ -1324,6 +1355,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       tempOrder.country_calling_code = String(patch.country_calling_code || '');
       tempOrder.phone = String(patch.phone || '');
       tempOrder.email = String(patch.email || '');
+      tempOrder.customer = this.buildTempOrderCustomer({
+        source: snapshot || null,
+        customerId: tempOrder.customer_id,
+        customerName: tempOrder.customer_name,
+        countryCallingCode: tempOrder.country_calling_code,
+        phone: tempOrder.phone,
+        email: tempOrder.email
+      });
       if (snapshot !== undefined) {
         var extend = this.ensureExtend(tempOrder);
         if (snapshot === null) delete extend.customerSnapshot;else extend.customerSnapshot = cloneDeep(snapshot);
@@ -1358,11 +1397,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "clearOrderCustomer",
     value: function clearOrderCustomer() {
       var tempOrder = this.ensureTempOrder();
-      tempOrder.customer_id = 0;
+      tempOrder.customer_id = null;
       tempOrder.customer_name = '';
       tempOrder.country_calling_code = '';
       tempOrder.phone = '';
       tempOrder.email = '';
+      tempOrder.customer = null;
       if (tempOrder._extend) delete tempOrder._extend.customerSnapshot;
       this.persistTempOrder();
       this.saveDraftInBackground();

package/dist/modules/Order/utils/manualProductDiscount.d.ts

@@ -0,0 +1,106 @@
+/** 解析商品行数量（checkout 协议 product_num 语义 = 当前行 num） */
+export declare function resolveSafeProductNum(num?: number | null): number;
+/**
+ * 将 discount_list 中 type=product 项的 product_num 同步为当前商品数量。
+ *
+ * @example
+ * syncManualProductDiscountProductNum(line.discount_list, line.num);
+ */
+export declare function syncManualProductDiscountProductNum(discountList: any[] | undefined | null, productNum?: number | null): any[];
+/** 从多源解析改价前行总价（与 cacheItem._extend.origin_total 语义一致） */
+export declare function resolveManualDiscountOriginTotal(sources: {
+    originTotal?: unknown;
+    extendOriginTotal?: unknown;
+    originExtendOriginTotal?: unknown;
+    sourceExtendOriginTotal?: unknown;
+    catalogUnitPrice?: unknown;
+    quantity?: number;
+}): number;
+/** 从 payload / extend / origin 解析手动折扣原因 */
+export declare function resolveManualDiscountReasonFromSources(sources: {
+    discountReason?: unknown;
+    extendDiscountReason?: unknown;
+    originExtendDiscountReason?: unknown;
+}): string;
+/** 是否带手动改价标记（price_override / is_manual_discount） */
+export declare function hasManualProductDiscountFlag(metadata?: Record<string, any> | null): boolean;
+/**
+ * normalize 兜底：手动改价但 discount_list 缺 type=product 时，按行级原价/折后价补写。
+ *
+ * @example
+ * ensureManualProductDiscountList({
+ *   discountList: [],
+ *   metadata: { price_override: '5', is_manual_discount: 1 },
+ *   originalPrice: '11.00',
+ *   sellingPrice: '5.00',
+ *   quantity: 1,
+ * });
+ */
+export declare function ensureManualProductDiscountList(params: {
+    discountList?: any[] | null;
+    metadata?: Record<string, any> | null;
+    originalPrice: string | number;
+    sellingPrice: string | number;
+    quantity?: number;
+}): any[];
+/** 商品手动折扣 discount_list 项（checkout 协议，type = product） */
+export interface ManualProductDiscountItem {
+    amount: number;
+    type: 'product';
+    discount: {
+        message: string;
+        discountway: string;
+        product_num: number;
+        discount_per: string;
+        discount_type: 'discount' | 'change_price';
+    };
+}
+/**
+ * 从 discount_list 中取手动改价项（type = product）。
+ *
+ * @example
+ * const manual = findManualProductDiscountItem(product.discount_list);
+ * manual?.discount.message; // 折扣原因
+ */
+export declare function findManualProductDiscountItem(discountList?: any[] | null): ManualProductDiscountItem | undefined;
+/**
+ * 解析折扣原因：优先 discount_list[type=product].discount.message。
+ *
+ * @example
+ * resolveManualDiscountMessage(line.discount_list, line.metadata?.legacy_reason);
+ */
+export declare function resolveManualDiscountMessage(discountList?: any[] | null, fallback?: string): string;
+/** 去掉 discount_list 中已有的手动改价项，避免重复叠加 */
+export declare function stripManualProductDiscountItems(discountList?: any[] | null): any[];
+/**
+ * 由改价前后行总价构建手动折扣项；amount = |originTotal - sellingTotal|（行级差额）。
+ *
+ * @example
+ * buildManualProductDiscountItem({
+ *   originTotal: 11,
+ *   sellingTotal: 4,
+ *   quantity: 1,
+ *   message: 'VIP',
+ * });
+ */
+export declare function buildManualProductDiscountItem(params: {
+    originTotal: number;
+    sellingTotal: number;
+    quantity?: number;
+    message?: string;
+    discountway?: string;
+    discount_per?: string;
+}): ManualProductDiscountItem;
+/**
+ * 将手动改价项合并进 discount_list（替换已有 type=product 项）。
+ *
+ * @example
+ * mergeManualProductDiscountIntoList(coupons, manualItem);
+ */
+export declare function mergeManualProductDiscountIntoList(discountList: any[] | undefined | null, manualItem: ManualProductDiscountItem | null | undefined): any[];
+/** 是否应写入手动改价 discount_list 项 */
+export declare function shouldBuildManualProductDiscount(params: {
+    hasPriceOverride?: boolean;
+    originTotal?: number;
+    sellingTotal?: number;
+}): boolean;

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

@@ -0,0 +1,212 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import Decimal from 'decimal.js';
+
+/** 解析商品行数量（checkout 协议 product_num 语义 = 当前行 num） */
+export function resolveSafeProductNum(num) {
+  var parsed = Number(num);
+  if (!Number.isFinite(parsed) || parsed <= 0) return 1;
+  return Math.floor(parsed);
+}
+
+/**
+ * 将 discount_list 中 type=product 项的 product_num 同步为当前商品数量。
+ *
+ * @example
+ * syncManualProductDiscountProductNum(line.discount_list, line.num);
+ */
+export function syncManualProductDiscountProductNum(discountList, productNum) {
+  var quantity = resolveSafeProductNum(productNum);
+  return (discountList || []).map(function (item) {
+    if ((item === null || item === void 0 ? void 0 : item.type) !== 'product') return item;
+    return _objectSpread(_objectSpread({}, item), {}, {
+      discount: _objectSpread(_objectSpread({}, item.discount || {}), {}, {
+        product_num: quantity
+      })
+    });
+  });
+}
+
+/** 从多源解析改价前行总价（与 cacheItem._extend.origin_total 语义一致） */
+export function resolveManualDiscountOriginTotal(sources) {
+  var _sources$quantity;
+  var candidates = [sources.originTotal, sources.extendOriginTotal, sources.originExtendOriginTotal, sources.sourceExtendOriginTotal];
+  for (var _i = 0, _candidates = candidates; _i < _candidates.length; _i++) {
+    var candidate = _candidates[_i];
+    if (candidate === undefined || candidate === null || candidate === '') continue;
+    var parsed = Number(candidate);
+    if (Number.isFinite(parsed)) return parsed;
+  }
+  var unit = Number(sources.catalogUnitPrice);
+  var quantity = (_sources$quantity = sources.quantity) !== null && _sources$quantity !== void 0 ? _sources$quantity : 1;
+  if (Number.isFinite(unit) && unit > 0) {
+    return new Decimal(unit).mul(quantity).toNumber();
+  }
+  return NaN;
+}
+
+/** 从 payload / extend / origin 解析手动折扣原因 */
+export function resolveManualDiscountReasonFromSources(sources) {
+  for (var _i2 = 0, _arr = [sources.discountReason, sources.extendDiscountReason, sources.originExtendDiscountReason]; _i2 < _arr.length; _i2++) {
+    var candidate = _arr[_i2];
+    if (candidate != null && String(candidate).trim() !== '') {
+      return String(candidate);
+    }
+  }
+  return '';
+}
+
+/** 是否带手动改价标记（price_override / is_manual_discount） */
+export function hasManualProductDiscountFlag(metadata) {
+  if (!metadata) return false;
+  var override = metadata.price_override;
+  if (override !== undefined && override !== null && override !== '') {
+    return true;
+  }
+  return metadata.is_manual_discount === 1 || metadata.is_manual_discount === true;
+}
+
+/**
+ * normalize 兜底：手动改价但 discount_list 缺 type=product 时，按行级原价/折后价补写。
+ *
+ * @example
+ * ensureManualProductDiscountList({
+ *   discountList: [],
+ *   metadata: { price_override: '5', is_manual_discount: 1 },
+ *   originalPrice: '11.00',
+ *   sellingPrice: '5.00',
+ *   quantity: 1,
+ * });
+ */
+export function ensureManualProductDiscountList(params) {
+  var _metadata$origin, _metadata$origin2, _metadata$origin3, _metadata$origin4;
+  var list = params.discountList || [];
+  var quantity = resolveSafeProductNum(params.quantity);
+  if (findManualProductDiscountItem(list)) {
+    return syncManualProductDiscountProductNum(list, quantity);
+  }
+  var metadata = params.metadata || {};
+  var originalNum = Number(params.originalPrice);
+  var sellingNum = Number(params.sellingPrice);
+  var shouldBuild = hasManualProductDiscountFlag(metadata) || shouldBuildManualProductDiscount({
+    originTotal: originalNum,
+    sellingTotal: sellingNum
+  });
+  if (!shouldBuild) {
+    return list;
+  }
+  if (!Number.isFinite(originalNum) || !Number.isFinite(sellingNum) || originalNum === sellingNum) {
+    return list;
+  }
+  var message = resolveManualDiscountMessage(list, resolveManualDiscountReasonFromSources({
+    extendDiscountReason: (_metadata$origin = metadata.origin) === null || _metadata$origin === void 0 || (_metadata$origin = _metadata$origin._extend) === null || _metadata$origin === void 0 ? void 0 : _metadata$origin.discount_reason,
+    originExtendDiscountReason: (_metadata$origin2 = metadata.origin) === null || _metadata$origin2 === void 0 || (_metadata$origin2 = _metadata$origin2._extend) === null || _metadata$origin2 === void 0 ? void 0 : _metadata$origin2.discount_reason
+  }));
+  return mergeManualProductDiscountIntoList(list, buildManualProductDiscountItem({
+    originTotal: originalNum,
+    sellingTotal: sellingNum,
+    quantity: quantity,
+    message: message,
+    discountway: (_metadata$origin3 = metadata.origin) === null || _metadata$origin3 === void 0 || (_metadata$origin3 = _metadata$origin3._extend) === null || _metadata$origin3 === void 0 ? void 0 : _metadata$origin3.discountway,
+    discount_per: (_metadata$origin4 = metadata.origin) === null || _metadata$origin4 === void 0 || (_metadata$origin4 = _metadata$origin4._extend) === null || _metadata$origin4 === void 0 ? void 0 : _metadata$origin4.discount_per
+  }));
+}
+
+/** 商品手动折扣 discount_list 项（checkout 协议，type = product） */
+
+/**
+ * 从 discount_list 中取手动改价项（type = product）。
+ *
+ * @example
+ * const manual = findManualProductDiscountItem(product.discount_list);
+ * manual?.discount.message; // 折扣原因
+ */
+export function findManualProductDiscountItem(discountList) {
+  return (discountList || []).find(function (item) {
+    return (item === null || item === void 0 ? void 0 : item.type) === 'product';
+  });
+}
+
+/**
+ * 解析折扣原因：优先 discount_list[type=product].discount.message。
+ *
+ * @example
+ * resolveManualDiscountMessage(line.discount_list, line.metadata?.legacy_reason);
+ */
+export function resolveManualDiscountMessage(discountList, fallback) {
+  var _findManualProductDis;
+  var message = (_findManualProductDis = findManualProductDiscountItem(discountList)) === null || _findManualProductDis === void 0 || (_findManualProductDis = _findManualProductDis.discount) === null || _findManualProductDis === void 0 ? void 0 : _findManualProductDis.message;
+  if (message != null && String(message).trim() !== '') {
+    return String(message);
+  }
+  return fallback !== null && fallback !== void 0 ? fallback : '';
+}
+
+/** 去掉 discount_list 中已有的手动改价项，避免重复叠加 */
+export function stripManualProductDiscountItems(discountList) {
+  return (discountList || []).filter(function (item) {
+    return (item === null || item === void 0 ? void 0 : item.type) !== 'product';
+  });
+}
+
+/**
+ * 由改价前后行总价构建手动折扣项；amount = |originTotal - sellingTotal|（行级差额）。
+ *
+ * @example
+ * buildManualProductDiscountItem({
+ *   originTotal: 11,
+ *   sellingTotal: 4,
+ *   quantity: 1,
+ *   message: 'VIP',
+ * });
+ */
+export function buildManualProductDiscountItem(params) {
+  var _params$message, _params$discountway, _params$discount_per;
+  var origin = new Decimal(Number(params.originTotal) || 0);
+  var selling = new Decimal(Number(params.sellingTotal) || 0);
+  var diff = origin.minus(selling);
+  var quantity = resolveSafeProductNum(params.quantity);
+  return {
+    amount: diff.abs().toDecimalPlaces(2).toNumber(),
+    type: 'product',
+    discount: {
+      message: (_params$message = params.message) !== null && _params$message !== void 0 ? _params$message : '',
+      discountway: (_params$discountway = params.discountway) !== null && _params$discountway !== void 0 ? _params$discountway : 'num',
+      product_num: quantity,
+      discount_per: (_params$discount_per = params.discount_per) !== null && _params$discount_per !== void 0 ? _params$discount_per : '',
+      discount_type: diff.isNegative() ? 'change_price' : 'discount'
+    }
+  };
+}
+
+/**
+ * 将手动改价项合并进 discount_list（替换已有 type=product 项）。
+ *
+ * @example
+ * mergeManualProductDiscountIntoList(coupons, manualItem);
+ */
+export function mergeManualProductDiscountIntoList(discountList, manualItem) {
+  var base = stripManualProductDiscountItems(discountList);
+  if (!manualItem) return base;
+  if (manualItem.amount === 0 && !manualItem.discount.message) return base;
+  return [].concat(_toConsumableArray(base), [manualItem]);
+}
+
+/** 是否应写入手动改价 discount_list 项 */
+export function shouldBuildManualProductDiscount(params) {
+  if (params.hasPriceOverride) return true;
+  var origin = Number(params.originTotal);
+  var selling = Number(params.sellingTotal);
+  if (!Number.isFinite(origin) || !Number.isFinite(selling)) return false;
+  return origin !== selling;
+}

package/dist/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/dist/modules/Order/utils.js

@@ -1,5 +1,5 @@
 var _excluded = ["unique_identification_number"],
-  _excluded2 = ["num", "product_option_item", "surcharge_fee"],
+  _excluded2 = ["num", "product_option_item", "surcharge_fee", "discount_amount", "discount_type", "discountway", "product_discount_reason", "discount_per"],
   _excluded3 = ["_extend", "relation_id", "table_form_id", "resource_id", "summary", "lastOrderInfo", "paid_amount", "shop_id", "shop_note", "shop_service_type", "start_time", "customer", "tax_fee", "total_amount", "total_refund_amount", "create_date", "holder_id"],
   _excluded4 = ["collect_pax", "table_occupancy_duration"];
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
@@ -142,14 +142,21 @@ export function resolveManualOverrideLineOriginalPrice(params, fallbackComposite
     return fallbackCompositeOriginal;
   }
   var refTotal = (_metadata$origin = metadata.origin) === null || _metadata$origin === void 0 || (_metadata$origin = _metadata$origin._extend) === null || _metadata$origin === void 0 ? void 0 : _metadata$origin.origin_total;
-  if (refTotal === undefined || refTotal === null || refTotal === '') {
-    return fallbackCompositeOriginal;
+  if (refTotal !== undefined && refTotal !== null && refTotal !== '') {
+    var parsed = Number(refTotal);
+    if (Number.isFinite(parsed)) {
+      return new Decimal(parsed).toDecimalPlaces(2).toFixed(2);
+    }
   }
-  var parsed = Number(refTotal);
-  if (!Number.isFinite(parsed)) {
-    return fallbackCompositeOriginal;
+  var lineOriginal = params.lineOriginalPrice;
+  if (lineOriginal !== undefined && lineOriginal !== null && lineOriginal !== '') {
+    var parsedLine = Number(lineOriginal);
+    var parsedFallback = Number(fallbackCompositeOriginal);
+    if (Number.isFinite(parsedLine) && Number.isFinite(parsedFallback) && parsedLine > parsedFallback) {
+      return new Decimal(parsedLine).toDecimalPlaces(2).toFixed(2);
+    }
   }
-  return new Decimal(parsed).toDecimalPlaces(2).toFixed(2);
+  return fallbackCompositeOriginal;
 }
 export function createDefaultOrderRulesHooks() {
   var toUnitPriceString = function toUnitPriceString(totalLike, num) {
@@ -238,7 +245,8 @@ export function createDefaultOrderRulesHooks() {
       });
       var finalOriginalPrice = resolveManualOverrideLineOriginalPrice({
         num: nextNum,
-        metadata: metadataAny
+        metadata: metadataAny,
+        lineOriginalPrice: product.original_price
       }, composedOriginalPrice);
       return _objectSpread(_objectSpread({}, product), {}, {
         selling_price: composedSellingPrice,
@@ -438,6 +446,11 @@ function normalizeSubmitProduct(product) {
   var num = submitProduct.num,
     productOptionItem = submitProduct.product_option_item,
     _productSurchargeFee = submitProduct.surcharge_fee,
+    _deprecatedDiscountAmount = submitProduct.discount_amount,
+    _deprecatedDiscountType = submitProduct.discount_type,
+    _deprecatedDiscountway = submitProduct.discountway,
+    _deprecatedProductDiscountReason = submitProduct.product_discount_reason,
+    _deprecatedDiscountPer = submitProduct.discount_per,
     productRest = _objectWithoutProperties(submitProduct, _excluded2);
   var rawMetadata = submitProduct.metadata || {};
   var bookingUid = rawMetadata.booking_uid;
@@ -562,6 +575,7 @@ export function createDefaultTempOrder(params) {
     country_calling_code: '',
     phone: '',
     email: '',
+    customer: null,
     is_price_include_tax: 1,
     tax_title: '',
     tax_country_code: '',
@@ -767,4 +781,5 @@ export function formatV1Product(products) {
     };
   });
 }
-export { createEmptySummary } from "../../solution/ScanOrder/utils";
+export { createEmptySummary } from "../../solution/ScanOrder/utils";
+export { buildManualProductDiscountItem, ensureManualProductDiscountList, findManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountMessage, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, resolveSafeProductNum, shouldBuildManualProductDiscount, syncManualProductDiscountProductNum, stripManualProductDiscountItems } from "./utils/manualProductDiscount";

package/dist/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/dist/modules/Rules/index.js

@@ -222,6 +222,22 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         return item.type === type || item.tag === type;
       });
     }
+
+    /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
+  }, {
+    key: "excludeDiscountListByType",
+    value: function excludeDiscountListByType(discountList, type) {
+      return (discountList || []).filter(function (item) {
+        return item.type !== type && item.tag !== type;
+      });
+    }
+
+    /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
+  }, {
+    key: "resolveDiscountListForManualOverride",
+    value: function resolveDiscountListForManualOverride(discountList) {
+      return this.excludeDiscountListByType(discountList, 'promotion');
+    }
     // 获取券不可用的原因
   }, {
     key: "getUnavailableReason",
@@ -1208,7 +1224,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 price: product.price,
                 options: restoredOptions
               }), {}, {
-                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
+                discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(product.discount_list) : _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
               var _ref13, _product$_promotion$f, _product13, _product$origin_total;
@@ -1231,14 +1247,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 main_product_selling_price: main_product_selling_price,
                 options: restoredOptions
               }), {}, {
-                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
+                discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(product.discount_list) : _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             }
           } else {
-            var _flatItem$bundleItem8;
+            var _flatItem$bundleItem8, _flatItem$bundleItem9;
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
-              discount_list: _this3.filterDiscountListByType(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || [], 'promotion'),
+              discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || []) : _this3.filterDiscountListByType(((_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.discount_list) || [], 'promotion'),
               price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
               processed: true
             })]);
@@ -2069,10 +2085,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return true; // 单独购买时可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem9, _flatItem$bundleItem10, _flatItem$originProdu, _flatItem$parentProdu10;
+          var _flatItem$bundleItem10, _flatItem$bundleItem11, _flatItem$originProdu, _flatItem$parentProdu10;
           // 套餐中购买时，判断是否为原价
-          var priceType = (_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.price_type;
-          var priceTypeExt = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type_ext;
+          var priceType = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type;
+          var priceTypeExt = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type_ext;
           // 主商品id
           var mainProductId = (flatItem === null || flatItem === void 0 || (_flatItem$originProdu = flatItem.originProduct) === null || _flatItem$originProdu === void 0 || (_flatItem$originProdu = _flatItem$originProdu._productOrigin) === null || _flatItem$originProdu === void 0 ? void 0 : _flatItem$originProdu.id) || (flatItem === null || flatItem === void 0 || (_flatItem$parentProdu10 = flatItem.parentProduct) === null || _flatItem$parentProdu10 === void 0 ? void 0 : _flatItem$parentProdu10.id) || 0;
           // original_price 对应：
@@ -2139,10 +2155,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false; // 单独购买时不可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem11, _flatItem$bundleItem12;
+          var _flatItem$bundleItem12, _flatItem$bundleItem13;
           // 套餐中购买时，判断是否为原价
-          var _priceType = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type;
-          var _priceTypeExt = (_flatItem$bundleItem12 = flatItem.bundleItem) === null || _flatItem$bundleItem12 === void 0 ? void 0 : _flatItem$bundleItem12.price_type_ext;
+          var _priceType = (_flatItem$bundleItem12 = flatItem.bundleItem) === null || _flatItem$bundleItem12 === void 0 ? void 0 : _flatItem$bundleItem12.price_type;
+          var _priceTypeExt = (_flatItem$bundleItem13 = flatItem.bundleItem) === null || _flatItem$bundleItem13 === void 0 ? void 0 : _flatItem$bundleItem13.price_type_ext;
 
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"