@pisell/pisellos 2.2.170 → 2.2.172

package/dist/model/strategy/adapter/promotion/index.js

@@ -1,9 +0,0 @@
-// 导出评估器
-export { PromotionEvaluator } from "./evaluator";
-
-// 导出适配器
-export { PromotionAdapter } from "./adapter";
-export { default } from "./adapter";
-
-// 导出策略配置示例常量
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

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

@@ -19,6 +19,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private rulesHooksOverride?;
     private orderHooks?;
     private otherParams?;
+    /** 是否将 tempOrder 写入 localStorage；默认 true，SalesSdk 等内存态场景可关闭。 */
+    private enableTempOrderPersist;
     /**
      * Populate `savedAmount` on each discount based on product-level discount details.
      * Only selected discounts get a non-zero value.
@@ -55,6 +57,23 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     }): void;
     private getTempOrderStorageKey;
     private restoreTempOrderFromStorage;
+    /**
+     * 运行时切换 tempOrder localStorage 持久化。
+     *
+     * @example
+     * orderModule.setEnableTempOrderPersist(false);
+     * orderModule.addProductToOrder(product); // 不会写入 localStorage
+     */
+    setEnableTempOrderPersist(enabled: boolean): void;
+    /**
+     * 读取当前是否启用 tempOrder localStorage 持久化。
+     *
+     * @example
+     * if (orderModule.isTempOrderPersistEnabled()) {
+     *   orderModule.persistTempOrder();
+     * }
+     */
+    isTempOrderPersistEnabled(): boolean;
     persistTempOrder(): void;
     private createDefaultTempOrderInstance;
     private createExternalSaleNumber;
@@ -157,7 +176,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateOrderBooking(params: UpdateOrderBookingParams): any[];
     removeProductFromOrder(identity: OrderProductIdentity): Promise<OrderProduct[]>;
     /**
-     * 仅清空购物车行（products / bookings / discount_list），不重置整单。
+     * 仅清空购物车行（products / bookings），不重置整单。
      * 用于「仅清空商品」；客户、备注、支付等协议字段保持不变。
      */
     clearOrderCartLines(): Promise<OrderTempOrder>;
@@ -185,7 +204,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Order/index.js

@@ -26,7 +26,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 { BaseModule } from "../BaseModule";
 import { OrderHooks } from "./types";
-import { generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments } from "./utils";
+import { generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
 import { buildProductLineFingerprint, getProductIdentityIndex, getSafeProductNum, isIdentityMatch, normalizeOrderProduct } from "../../solution/ScanOrder/utils";
@@ -57,6 +57,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "rulesHooksOverride", void 0);
     _defineProperty(_assertThisInitialized(_this), "orderHooks", void 0);
     _defineProperty(_assertThisInitialized(_this), "otherParams", void 0);
+    /** 是否将 tempOrder 写入 localStorage；默认 true，SalesSdk 等内存态场景可关闭。 */
+    _defineProperty(_assertThisInitialized(_this), "enableTempOrderPersist", true);
     return _this;
   }
   _createClass(OrderModule, [{
@@ -94,10 +96,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.rulesHooksOverride = (_otherParams$rules = otherParams.rules) === null || _otherParams$rules === void 0 ? void 0 : _otherParams$rules.hooks;
               this.orderHooks = options.hooks || ((_otherParams$order = otherParams.order) === null || _otherParams$order === void 0 ? void 0 : _otherParams$order.hooks) || ((_otherParams$hooks = otherParams.hooks) === null || _otherParams$hooks === void 0 ? void 0 : _otherParams$hooks.order);
               this.otherParams = otherParams;
+              this.enableTempOrderPersist = otherParams.enableTempOrderPersist !== false;
               this.registerDiscountModules(options);
-              this.restoreTempOrderFromStorage();
+              if (this.enableTempOrderPersist) {
+                this.restoreTempOrderFromStorage();
+              }
               this.logInfo('OrderModule initialized successfully');
-            case 21:
+            case 22:
             case "end":
               return _context.stop();
           }
@@ -360,8 +365,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var tempOrder = this.store.tempOrder;
       // 任意 products CRUD 后都应当重算 discount 状态；即使 products 为空，
       // 也需要让 Rules.calcDiscount 把 DiscountModule 的 isSelected / isAvailable /
-      // appliedProductDetails / savedAmount 以及 tempOrder.discount_list 复位。
+      // appliedProductDetails / savedAmount 复位。
       if (!tempOrder) return;
+      delete tempOrder.discount_list;
       var rulesModule = this.store.rules;
       if (!rulesModule) return;
       var discountList = ((_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.getDiscountList()) || [];
@@ -378,7 +384,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (result !== null && result !== void 0 && result.productList) {
         tempOrder.products = (result.productList || []).map(function (product) {
           return _objectSpread(_objectSpread({}, product), {}, {
-            discount_list: syncManualProductDiscountProductNum(product.discount_list, product.num)
+            discount_list: normalizeOrderProductDiscountList(syncManualProductDiscountProductNum(product.discount_list, product.num))
           });
         });
       }
@@ -386,9 +392,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var _this$store$discount8;
         OrderModule.populateSavedAmounts(result.productList || tempOrder.products, result.discountList);
         (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 || _this$store$discount8.setDiscountList(result.discountList);
-        tempOrder.discount_list = result.discountList.filter(function (d) {
-          return d.isSelected;
-        });
       }
     }
 
@@ -438,9 +441,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             // 否则（v1 或无 metadata）→ 走 legacyDiscount 反推分支，基于新的 source + options
             // 重算出含 option 的 main_product_*，并打上 price_schema_version: 2。
             // 幂等：多次 restore 不会重复叠加 option/bundle。
-            parsedData.products[i] = normalizeOrderProduct(row);
+            var normalized = normalizeOrderProduct(row);
+            normalized.discount_list = normalizeOrderProductDiscountList(normalized.discount_list);
+            parsedData.products[i] = normalized;
           }
         }
+        delete parsedData.discount_list;
         var parsedRecord = parsedData;
         this.store.summary = parsedRecord.summary || createEmptySummary();
         delete parsedData.summary;
@@ -461,9 +467,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         (_this$window = this.window) === null || _this$window === void 0 || (_this$window = _this$window.localStorage) === null || _this$window === void 0 || _this$window.removeItem(key);
       }
     }
+
+    /**
+     * 运行时切换 tempOrder localStorage 持久化。
+     *
+     * @example
+     * orderModule.setEnableTempOrderPersist(false);
+     * orderModule.addProductToOrder(product); // 不会写入 localStorage
+     */
+  }, {
+    key: "setEnableTempOrderPersist",
+    value: function setEnableTempOrderPersist(enabled) {
+      this.enableTempOrderPersist = enabled;
+    }
+
+    /**
+     * 读取当前是否启用 tempOrder localStorage 持久化。
+     *
+     * @example
+     * if (orderModule.isTempOrderPersistEnabled()) {
+     *   orderModule.persistTempOrder();
+     * }
+     */
+  }, {
+    key: "isTempOrderPersistEnabled",
+    value: function isTempOrderPersistEnabled() {
+      return this.enableTempOrderPersist;
+    }
   }, {
     key: "persistTempOrder",
     value: function persistTempOrder() {
+      if (!this.enableTempOrderPersist) return;
       var key = this.getTempOrderStorageKey();
       if (!key || !this.store.tempOrder) return;
       if (!this.window) return;
@@ -1598,6 +1632,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               productToAdd = (linked === null || linked === void 0 ? void 0 : linked.product) || product;
               incomingFingerprint = buildProductLineFingerprint(productToAdd.product_option_item, productToAdd.product_bundle);
               normalizedIncoming = normalizeOrderProduct(productToAdd);
+              normalizedIncoming.discount_list = normalizeOrderProductDiscountList(normalizedIncoming.discount_list);
               hasIncomingGoodPass = this.hasGoodPassDiscount(normalizedIncoming);
               shouldForceNewLine = !!booking;
               matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
@@ -1610,10 +1645,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
               existedFingerprint = matchedProduct ? buildProductLineFingerprint(matchedProduct.product_option_item, matchedProduct.product_bundle) : '';
               if (!matchedProduct) {
-                _context15.next = 16;
+                _context15.next = 17;
                 break;
               }
-              _context15.next = 13;
+              _context15.next = 14;
               return this.shouldMergeProductToOrder({
                 incomingProduct: productToAdd,
                 normalizedIncoming: normalizedIncoming,
@@ -1624,13 +1659,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 booking: booking
               });
-            case 13:
+            case 14:
               _context15.t0 = _context15.sent;
-              _context15.next = 17;
+              _context15.next = 18;
               break;
-            case 16:
-              _context15.t0 = false;
             case 17:
+              _context15.t0 = false;
+            case 18:
               shouldMerge = _context15.t0;
               if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
                 this.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
@@ -1649,6 +1684,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     unique_identification_number: targetUid
                   })
                 }));
+                normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
                 tempOrder.products[matchedIndex] = _objectSpread(_objectSpread(_objectSpread({}, targetProduct), normalizedProduct), {}, {
                   metadata: _objectSpread(_objectSpread(_objectSpread({}, targetProduct.metadata || {}), normalizedProduct.metadata || {}), {}, {
                     unique_identification_number: targetUid
@@ -1663,14 +1699,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
               }
               this.applyDiscount();
-              _context15.next = 23;
+              _context15.next = 24;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 23:
+            case 24:
               this.persistTempOrder();
               return _context15.abrupt("return", tempOrder.products);
-            case 25:
+            case 26:
             case "end":
               return _context15.stop();
           }
@@ -1771,6 +1807,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               // normalizeOrderProduct 幂等：v2 metadata 存在 → 保留 main_product_* 折扣重算 composite；
               // 否则 → 把顶层 selling_price 视作 source，派生 main_product_* 并写 price_schema_version: 2。
               normalizedProduct = normalizeOrderProduct(nextProduct);
+              normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
               if (booking) {
                 productUid = String(((_normalizedProduct$me = normalizedProduct.metadata) === null || _normalizedProduct$me === void 0 ? void 0 : _normalizedProduct$me.unique_identification_number) || ((_targetProduct$metada3 = targetProduct.metadata) === null || _targetProduct$metada3 === void 0 ? void 0 : _targetProduct$metada3.unique_identification_number) || unique_identification_number || createUuidV4());
                 normalizedProduct.metadata = _objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), {}, {
@@ -1795,14 +1832,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               tempOrder.products[productIndex] = normalizedProduct;
               this.captureProductRuntime(tempOrder, updates, tempOrder.products[productIndex], (_tempOrder$products$p = tempOrder.products[productIndex].metadata) === null || _tempOrder$products$p === void 0 ? void 0 : _tempOrder$products$p.unique_identification_number);
               this.applyDiscount();
-              _context16.next = 25;
+              _context16.next = 26;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 25:
+            case 26:
               this.persistTempOrder();
               return _context16.abrupt("return", tempOrder.products);
-            case 27:
+            case 28:
             case "end":
               return _context16.stop();
           }
@@ -1861,16 +1898,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   unique_identification_number: ((_targetProduct$metada4 = targetProduct.metadata) === null || _targetProduct$metada4 === void 0 ? void 0 : _targetProduct$metada4.unique_identification_number) || unique_identification_number
                 })
               }));
+              normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
               tempOrder.products[productIndex] = normalizedProduct;
               this.applyDiscount();
-              _context17.next = 18;
+              _context17.next = 19;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 18:
+            case 19:
               this.persistTempOrder();
               return _context17.abrupt("return", tempOrder.products);
-            case 20:
+            case 21:
             case "end":
               return _context17.stop();
           }
@@ -1943,7 +1981,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return removeProductFromOrder;
     }()
     /**
-     * 仅清空购物车行（products / bookings / discount_list），不重置整单。
+     * 仅清空购物车行（products / bookings），不重置整单。
      * 用于「仅清空商品」；客户、备注、支付等协议字段保持不变。
      */
   }, {
@@ -1957,21 +1995,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               tempOrder = this.ensureTempOrder();
               tempOrder.products = [];
               tempOrder.bookings = [];
-              tempOrder.discount_list = [];
               if (tempOrder._extend && _typeof(tempOrder._extend) === 'object') {
                 tempOrder._extend = _objectSpread(_objectSpread({}, tempOrder._extend), {}, {
                   productsByUid: {}
                 });
               }
               this.applyDiscount();
-              _context19.next = 8;
+              _context19.next = 7;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 8:
+            case 7:
               this.persistTempOrder();
               return _context19.abrupt("return", tempOrder);
-            case 10:
+            case 9:
             case "end":
               return _context19.stop();
           }
@@ -2717,6 +2754,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), raw || {});
       delete nextTempOrder.summary;
       delete nextTempOrder.lastOrderInfo;
+      delete nextTempOrder.discount_list;
       nextTempOrder.metadata = raw.metadata && _typeof(raw.metadata) === 'object' ? _objectSpread({}, raw.metadata) : {};
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
       nextTempOrder.products = Array.isArray(raw.products) ? raw.products.map(function (p) {
@@ -2734,9 +2772,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.surcharges = Array.isArray(raw.surcharges) ? raw.surcharges.map(function (s) {
         return _objectSpread({}, s || {});
       }) : [];
-      nextTempOrder.discount_list = Array.isArray(raw.discount_list) ? raw.discount_list.map(function (d) {
-        return _objectSpread({}, d || {});
-      }) : [];
       nextTempOrder.relation_forms = Array.isArray(raw.relation_forms) ? raw.relation_forms.map(function (f) {
         return _objectSpread({}, f || {});
       }) : [];
@@ -2769,6 +2804,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         row.metadata.unique_identification_number = createUuidV4();
       }
       var normalized = normalizeOrderProduct(row);
+      normalized.discount_list = normalizeOrderProductDiscountList(normalized.discount_list);
       var result = _objectSpread(_objectSpread(_objectSpread({}, row), normalized), {}, {
         metadata: _objectSpread(_objectSpread({}, row.metadata), normalized.metadata)
       });

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

@@ -6,6 +6,8 @@ import type { UnavailableReason } from '../Rules/types';
 import type { SubmitPayloadEnhancer } from './utils';
 import type { PaymentItem } from '../Payment/types';
 import type { ICustomer } from '../AccountList/types';
+import type { OrderProductDiscountItem } from '../../server/modules/order/types';
+export type { OrderProductDiscountItem } from '../../server/modules/order/types';
 export declare enum OrderHooks {
     OnOrderCreate = "order:onOrderCreate",
     OnOrderUpdate = "order:onOrderUpdate",
@@ -74,7 +76,7 @@ export interface OrderProduct extends OrderProductIdentity {
     original_price: string;
     tax_fee: string;
     is_charge_tax: number;
-    discount_list: any[];
+    discount_list: OrderProductDiscountItem[];
     product_bundle: any[];
     booking_uid?: string;
     metadata: Record<string, any>;
@@ -149,7 +151,7 @@ export interface OrderTempOrder {
     bookings: any[];
     payments: any[];
     surcharges: any[];
-    discount_list: any[];
+    discount_list?: any[];
     relation_forms: any[];
     contacts: any[];
     contacts_info: Record<string, any> | null;
@@ -165,7 +167,7 @@ export interface OrderSubmitProduct extends Omit<OrderProduct, 'unique_identific
     payment_price: string;
     product_sku: Record<string, any>;
 }
-export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'products' | '_extend' | 'customer'> {
+export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'products' | '_extend' | 'customer' | 'discount_list'> {
     platform: string;
     request_unique_idempotency_token?: string;
     form_record_ids?: Array<{
@@ -296,7 +298,6 @@ export interface SubmitSalesOrderParams {
         bookings: OrderSubmitBooking[];
         payments: any[];
         surcharges?: any[];
-        discount_list: any[];
         relation_forms: any[];
         form_record_ids?: OrderSubmitFormRecord[];
         contacts: any[];
@@ -500,6 +501,10 @@ export interface OrderModuleAPI {
     updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
     removeProductFromOrder: (identity: OrderProductIdentity) => Promise<OrderProduct[]>;
     persistTempOrder: () => void;
+    /** 运行时切换 tempOrder localStorage 持久化开关。 */
+    setEnableTempOrderPersist: (enabled: boolean) => void;
+    /** 当前是否启用 tempOrder localStorage 持久化。 */
+    isTempOrderPersistEnabled: () => boolean;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
         platform?: string;

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

@@ -1,6 +1,6 @@
 import Decimal from 'decimal.js';
 import { CartItem } from "../Cart";
-import type { OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
+import type { OrderProductDiscountItem, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
 import type { RulesParamsHooks } from '../Rules/types';
 import type { MapOrderPaymentsOptions, OrderPaymentData, OrderPaymentSource } from './types';
 /**
@@ -67,6 +67,11 @@ export declare function sumOptionUnitPrice(options?: Array<{
  */
 /** Rules calcDiscount 用手动价标记；undefined 表示交给 Rules 用 total/origin_total 推断 */
 export declare function resolveRulesManualDiscountFlag(metadata: Record<string, any> | null | undefined): boolean | undefined;
+/**
+ * 商品行折扣只保留后端 OrderProductDiscountItem 协议字段。
+ * Rules/券计算过程中的 `_num`、`config` 等运行态字段不应进入 tempOrder 或提交 payload。
+ */
+export declare function normalizeOrderProductDiscountList(discountList?: unknown[] | null): OrderProductDiscountItem[];
 /**
  * 手动改价（price_override）时行级 original_price（composite 单价）：
  * 购物车划线价应对齐 metadata.origin._extend.origin_total（改价前单价 composite，如 40），

package/dist/modules/Order/utils.js

@@ -1,10 +1,9 @@
 var _excluded = ["unique_identification_number"],
   _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"],
+  _excluded3 = ["_extend", "relation_id", "table_form_id", "resource_id", "summary", "lastOrderInfo", "paid_amount", "shop_id", "shop_note", "shop_service_type", "start_time", "customer", "discount_list", "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; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -14,6 +13,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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); }
+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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 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 _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; }
@@ -126,6 +126,45 @@ export function resolveRulesManualDiscountFlag(metadata) {
   }
   return undefined;
 }
+function normalizeOrderProductDiscountAmount(amount) {
+  if (amount === undefined || amount === null) return undefined;
+  return String(amount);
+}
+
+/**
+ * 商品行折扣只保留后端 OrderProductDiscountItem 协议字段。
+ * Rules/券计算过程中的 `_num`、`config` 等运行态字段不应进入 tempOrder 或提交 payload。
+ */
+export function normalizeOrderProductDiscountList(discountList) {
+  if (!Array.isArray(discountList)) return [];
+  return discountList.filter(function (item) {
+    return !!item && _typeof(item) === 'object';
+  }).map(function (item) {
+    var 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 !== undefined) {
+      var orderDiscountId = Number(item.order_discount_id);
+      if (Number.isFinite(orderDiscountId)) {
+        normalized.order_discount_id = orderDiscountId;
+      }
+    }
+    if (item.type !== undefined) normalized.type = item.type;
+    var amount = normalizeOrderProductDiscountAmount(item.amount);
+    if (amount !== undefined) normalized.amount = amount;
+    if (item.discount && _typeof(item.discount) === 'object') {
+      normalized.discount = _objectSpread({}, item.discount);
+    }
+    if (item.metadata === null) {
+      normalized.metadata = null;
+    } else if (item.metadata && _typeof(item.metadata) === 'object') {
+      normalized.metadata = _objectSpread({}, item.metadata);
+    }
+    return normalized;
+  });
+}
 
 /**
  * 手动改价（price_override）时行级 original_price（composite 单价）：
@@ -480,7 +519,7 @@ function normalizeSubmitProduct(product) {
   } : {}), {}, {
     product_quantity: toBundleNumber(num !== null && num !== void 0 ? num : submitProduct.product_quantity, 1),
     product_sku: productSku,
-    discount_list: submitProduct.discount_list || [],
+    discount_list: normalizeOrderProductDiscountList(submitProduct.discount_list),
     product_bundle: formatSubmitBundleItems(submitProduct.product_bundle),
     metadata: cleanMetadata,
     // 出站兼容：后端消费 payment_price 字段，这里从 selling_price 直接派生。
@@ -594,7 +633,6 @@ export function createDefaultTempOrder(params) {
     bookings: [],
     payments: [],
     surcharges: [],
-    discount_list: [],
     relation_forms: [],
     contacts: [],
     contacts_info: null,
@@ -631,6 +669,7 @@ export function buildSubmitPayload(params) {
     _shopServiceType = _ref9.shop_service_type,
     _startTime = _ref9.start_time,
     _customer = _ref9.customer,
+    _discountList = _ref9.discount_list,
     _rootTaxFee = _ref9.tax_fee,
     _totalAmount = _ref9.total_amount,
     _totalRefundAmount = _ref9.total_refund_amount,
@@ -677,7 +716,6 @@ export function buildSubmitPayload(params) {
       return 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,

package/dist/modules/Quotation/index.js

@@ -130,8 +130,10 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var quotation = _step.value;
-          if (!this.isQuotationVisibleForCustomer(quotation, customer_id)) continue;
-          if (!this.isQuotationActiveAt(quotation, datetime)) continue;
+          var visible = this.isQuotationVisibleForCustomer(quotation, customer_id);
+          if (!visible) continue;
+          var active = this.isQuotationActiveAt(quotation, datetime);
+          if (!active) continue;
           var match = this.findProductData(quotation.product_data, productId, variantId);
           if (!match) continue;
           if (match.value === 0) continue;
@@ -248,16 +250,25 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
       var _quotation$schedule,
         _this3 = this;
       if (!((_quotation$schedule = quotation.schedule) !== null && _quotation$schedule !== void 0 && _quotation$schedule.length)) return false;
-      var scheduleItems = quotation.schedule.map(function (s) {
+      var scheduleItems = [];
+      quotation.schedule.forEach(function (s) {
         var _this3$scheduleResolv;
         var full = (_this3$scheduleResolv = _this3.scheduleResolver) === null || _this3$scheduleResolv === void 0 ? void 0 : _this3$scheduleResolv.call(_this3, s.id);
-        if (full) return full;
-        return _objectSpread(_objectSpread({}, s), {}, {
+        if (full) {
+          scheduleItems.push(full);
+          return;
+        }
+        if (_this3.scheduleResolver) {
+          return;
+        }
+        var fallbackSchedule = _objectSpread(_objectSpread({}, 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 getDateIsInSchedule(datetime, scheduleItems);
     }
   }, {

package/dist/modules/Schedule/index.js

@@ -205,9 +205,13 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getScheduleListByIds",
     value: function getScheduleListByIds(ids) {
-      return this.store.scheduleList.filter(function (n) {
-        return ids.includes(n.id);
+      var idSet = new Set(ids.map(function (id) {
+        return String(id);
+      }));
+      var list = this.store.scheduleList.filter(function (n) {
+        return idSet.has(String(n.id));
       });
+      return list;
     }
   }, {
     key: "setAvailabilityScheduleDateList",

package/dist/server/index.js

@@ -1608,26 +1608,30 @@ var Server = /*#__PURE__*/function () {
             case 6:
               _context18.prev = 6;
               _context18.next = 9;
+              return this.schedule.loadAllSchedule();
+            case 9:
+              this.products.clearPriceCache();
+              _context18.next = 12;
               return this.products.setupQuotationPriceBridge({
                 scheduleModule: this.schedule,
                 channel: (_this$core$context = this.core.context) === null || _this$core$context === void 0 ? void 0 : _this$core$context.channel
               });
-            case 9:
+            case 12:
               this.logInfo('Products 报价单价格桥接初始化完成');
-              _context18.next = 16;
+              _context18.next = 19;
               break;
-            case 12:
-              _context18.prev = 12;
+            case 15:
+              _context18.prev = 15;
               _context18.t0 = _context18["catch"](6);
               errorMessage = _context18.t0 instanceof Error ? _context18.t0.message : String(_context18.t0);
               this.logError('Products 报价单价格桥接初始化失败', {
                 error: errorMessage
               });
-            case 16:
+            case 19:
             case "end":
               return _context18.stop();
           }
-        }, _callee18, this, [[6, 12]]);
+        }, _callee18, this, [[6, 15]]);
       }));
       function setupProductsQuotationPriceBridge() {
         return _setupProductsQuotationPriceBridge.apply(this, arguments);

package/dist/server/modules/products/index.js

@@ -277,7 +277,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _setupQuotationPriceBridge = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
         var _this$otherParams;
-        var channel, quotation, _params$scheduleModul, _params$scheduleModul2, scheduleList, scheduleMap;
+        var channel, quotation;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -301,14 +301,15 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
               this.quotationPriceBridge = quotation;
             case 10:
               if (params.scheduleModule) {
-                scheduleList = ((_params$scheduleModul = (_params$scheduleModul2 = params.scheduleModule).getScheduleList) === null || _params$scheduleModul === void 0 ? void 0 : _params$scheduleModul.call(_params$scheduleModul2)) || [];
-                scheduleMap = new Map(scheduleList.map(function (schedule) {
-                  return [schedule.id, schedule];
-                }));
                 this.quotationPriceBridge.setScheduleResolver(function (id) {
-                  var _params$scheduleModul3, _params$scheduleModul4;
-                  if (scheduleMap.has(id)) return scheduleMap.get(id);
-                  var schedules = ((_params$scheduleModul3 = (_params$scheduleModul4 = params.scheduleModule).getScheduleByIds) === null || _params$scheduleModul3 === void 0 ? void 0 : _params$scheduleModul3.call(_params$scheduleModul4, [id])) || [];
+                  var _params$scheduleModul, _params$scheduleModul2, _params$scheduleModul3, _params$scheduleModul4, _params$scheduleModul5, _params$scheduleModul6;
+                  var scheduleId = String(id);
+                  var scheduleList = ((_params$scheduleModul = (_params$scheduleModul2 = params.scheduleModule).getScheduleList) === null || _params$scheduleModul === void 0 ? void 0 : _params$scheduleModul.call(_params$scheduleModul2)) || [];
+                  var schedule = scheduleList.find(function (item) {
+                    return String(item.id) === scheduleId;
+                  });
+                  if (schedule) return schedule;
+                  var schedules = ((_params$scheduleModul3 = (_params$scheduleModul4 = params.scheduleModule).getScheduleListByIds) === null || _params$scheduleModul3 === void 0 ? void 0 : _params$scheduleModul3.call(_params$scheduleModul4, [id])) || ((_params$scheduleModul5 = (_params$scheduleModul6 = params.scheduleModule).getScheduleByIds) === null || _params$scheduleModul5 === void 0 ? void 0 : _params$scheduleModul5.call(_params$scheduleModul6, [id])) || [];
                   return schedules[0];
                 });
               }