@pisell/pisellos 2.2.235 → 2.2.237

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

@@ -0,0 +1,9 @@
+// 导出评估器
+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

@@ -234,6 +234,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private findBookingIndexByUniqueIdentificationNumber;
     private removeLinkedBookingsForProduct;
     private getSalesSummary;
+    private applyOrderProductsDepositSummary;
     recalculateSummary(options?: {
         createIfMissing?: boolean;
     }): Promise<OrderSummary | null>;

package/dist/modules/Order/index.js

@@ -30,7 +30,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 { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, mergeOrderProductDisplayFields } from "./utils";
+import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, mergeOrderProductDisplayFields } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
 import { processCartPromotion, appendPromotionTags as _appendPromotionTags, getOrderProductUid as getPromotionUid } from "../../solution/BaseSales/utils/cartPromotion";
@@ -2308,12 +2308,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (!this.salesSummaryModuleName) return null;
       return this.core.getModule(this.salesSummaryModuleName);
     }
+  }, {
+    key: "applyOrderProductsDepositSummary",
+    value: function applyOrderProductsDepositSummary(tempOrder, summary) {
+      var _tempOrder$_extend5;
+      var depositSummary = calculateOrderProductsDeposit(tempOrder.products || [], {
+        productsByUid: (_tempOrder$_extend5 = tempOrder._extend) === null || _tempOrder$_extend5 === void 0 ? void 0 : _tempOrder$_extend5.productsByUid
+      });
+      var nextSummary = _objectSpread(_objectSpread({}, summary), {}, {
+        deposit_amount: depositSummary.totalText,
+        deposit: depositSummary.hasDeposit ? {
+          total: depositSummary.totalText,
+          deposit_policy_ids: depositSummary.deposit_policy_ids,
+          deposit_policy_data: depositSummary.protocols,
+          hasDeposit: true
+        } : undefined
+      });
+      tempOrder.deposit_amount = depositSummary.totalText;
+      tempOrder.is_deposit = depositSummary.hasDeposit ? 1 : 0;
+      return nextSummary;
+    }
   }, {
     key: "recalculateSummary",
     value: function () {
       var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(options) {
         var _ref45, _salesSummaryResult$e;
-        var tempOrder, snapshotSummary, shouldFullRecalculateFromSnapshot, summaryProducts, salesSummary, existedSummary, totalRefundAmount, paidPaymentSummary, emptyBaseSummary, emptySummary, salesSummaryResult, roundingAmount, payServiceChargeAmount, hasSalesSummaryAmount, expectAmount, amountPaymentPatch, normalizedExpectAmountPatch, summaryForGap, summary;
+        var tempOrder, snapshotSummary, shouldFullRecalculateFromSnapshot, summaryProducts, salesSummary, existedSummary, totalRefundAmount, paidPaymentSummary, emptyBaseSummary, emptySummaryBase, emptySummaryWithDeposit, emptySummary, salesSummaryResult, roundingAmount, payServiceChargeAmount, hasSalesSummaryAmount, expectAmount, amountPaymentPatch, normalizedExpectAmountPatch, summaryForGap, summary;
         return _regeneratorRuntime().wrap(function _callee10$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
@@ -2342,22 +2362,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               totalRefundAmount = existedSummary.total_refund_amount || '0.00';
               paidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
               if (salesSummary) {
-                _context12.next = 21;
+                _context12.next = 23;
                 break;
               }
               emptyBaseSummary = _objectSpread(_objectSpread(_objectSpread({}, createEmptySummary()), existedSummary), {}, {
                 total_refund_amount: totalRefundAmount
               });
-              emptySummary = _objectSpread(_objectSpread({}, emptyBaseSummary), {}, {
+              emptySummaryBase = _objectSpread(_objectSpread({}, emptyBaseSummary), {}, {
                 customer_paid_amount: paidPaymentSummary.customerPaidAmount.toFixed(2),
                 order_paid_amount: paidPaymentSummary.orderPaidAmount.toFixed(2),
+                pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2),
+                rounding_amount: paidPaymentSummary.roundingAmount.toFixed(2)
+              });
+              emptySummaryWithDeposit = this.applyOrderProductsDepositSummary(tempOrder, emptySummaryBase);
+              emptySummary = _objectSpread(_objectSpread({}, emptySummaryWithDeposit), {}, {
                 amount_gap: this.calculateSummaryAmountGap({
                   tempOrder: tempOrder,
-                  summary: emptyBaseSummary,
+                  summary: emptySummaryWithDeposit,
                   orderPaidAmount: paidPaymentSummary.gapPaidAmount
-                }),
-                pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2),
-                rounding_amount: paidPaymentSummary.roundingAmount.toFixed(2)
+                })
               });
               tempOrder.surcharge_fee = emptySummary.surcharge_fee;
               this.store.summary = emptySummary;
@@ -2366,14 +2389,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 summary: emptySummary
               });
               return _context12.abrupt("return", this.store.summary);
-            case 21:
-              _context12.next = 23;
+            case 23:
+              _context12.next = 25;
               return salesSummary.getSummary({
                 products: summaryProducts,
                 isPriceIncludeTax: tempOrder.is_price_include_tax,
                 shopDiscount: tempOrder.shop_discount
               });
-            case 23:
+            case 25:
               salesSummaryResult = _context12.sent;
               if (shouldFullRecalculateFromSnapshot) {
                 tempOrder.products = summaryProducts;
@@ -2391,10 +2414,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               normalizedExpectAmountPatch = expectAmount && salesSummaryResult.expect_amount === undefined ? {
                 expect_amount: expectAmount.toFixed(2)
               } : {};
-              summaryForGap = _objectSpread(_objectSpread(_objectSpread({}, salesSummaryResult), {}, {
+              summaryForGap = this.applyOrderProductsDepositSummary(tempOrder, _objectSpread(_objectSpread(_objectSpread({}, salesSummaryResult), {}, {
                 total_refund_amount: totalRefundAmount
-              }, amountPaymentPatch), normalizedExpectAmountPatch);
-              summary = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, salesSummaryResult), {}, {
+              }, amountPaymentPatch), normalizedExpectAmountPatch));
+              summary = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, summaryForGap), {}, {
                 total_refund_amount: totalRefundAmount,
                 customer_paid_amount: paidPaymentSummary.customerPaidAmount.toFixed(2),
                 order_paid_amount: paidPaymentSummary.orderPaidAmount.toFixed(2)
@@ -2415,8 +2438,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               tempOrder.surcharge_fee = summary.surcharge_fee;
               tempOrder.surcharges = summary.surcharges || [];
-              tempOrder.deposit_amount = summary.deposit_amount || '0.00';
-              tempOrder.is_deposit = summary.deposit_amount !== '0.00' ? 1 : 0;
               this.updateTempOrderPaymentStatus(tempOrder, {
                 previousSummary: existedSummary,
                 summary: summary

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

@@ -1,8 +1,19 @@
 import Decimal from 'decimal.js';
 import type { CartItem } from "../Cart";
-import type { OrderProductDiscountItem, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
+import type { OrderProductDiscountItem, OrderProduct, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
 import type { RulesParamsHooks } from '../Rules/types';
 import type { MapOrderPaymentsOptions, OrderPaymentData, OrderPaymentSource } from './types';
+export interface OrderProductsDepositProtocol {
+    id: number;
+    title: string;
+}
+export interface OrderProductsDepositSummary {
+    total: number;
+    totalText: string;
+    protocols: OrderProductsDepositProtocol[];
+    deposit_policy_ids: number[];
+    hasDeposit: boolean;
+}
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -53,6 +64,15 @@ export declare function sumOptionUnitPrice(options?: Array<{
     price?: any;
     num?: any;
 }> | null): Decimal;
+/**
+ * 仅基于 tempOrder.products 重算整单定金。
+ *
+ * 对齐 Checkout relation_products 分支：商品定金先按商品规则计算，
+ * 再扣减商品券/折扣卡抵扣金额；tempOrder.bookings 不参与这里的计算。
+ */
+export declare function calculateOrderProductsDeposit(products?: OrderProduct[], options?: {
+    productsByUid?: Record<string, Record<string, any>>;
+}): OrderProductsDepositSummary;
 /**
  * 判定套餐子商品是否为 markdown（减价）类型。
  * 与后端口径一致：price_type='markdown' 且 price_type_ext 非 'product_price'（原价子商品）。

package/dist/modules/Order/utils.js

@@ -107,6 +107,214 @@ export function sumOptionUnitPrice(options) {
   }
   return total;
 }
+function getSafeOrderProductNum(num) {
+  var parsedNum = Number(num !== null && num !== void 0 ? num : 1);
+  if (!Number.isFinite(parsedNum) || parsedNum < 1) return 1;
+  return Math.floor(parsedNum);
+}
+function getOrderProductDepositUnitTotal(product) {
+  var _ref2;
+  var metadata = product.metadata || {};
+  var paymentPrice = metadata.main_product_attached_bundle_payment_price;
+  var mainSellingPrice = metadata.main_product_selling_price;
+  var fallbackPrice = product.selling_price;
+  return new Decimal(Number((_ref2 = paymentPrice !== null && paymentPrice !== void 0 ? paymentPrice : mainSellingPrice) !== null && _ref2 !== void 0 ? _ref2 : fallbackPrice) || 0);
+}
+function normalizeDepositProtocols(protocols) {
+  if (!Array.isArray(protocols)) return [];
+  return protocols.reduce(function (result, protocol) {
+    var id = Number(protocol === null || protocol === void 0 ? void 0 : protocol.id);
+    if (!Number.isFinite(id)) return result;
+    result.push({
+      id: Math.floor(id),
+      title: String((protocol === null || protocol === void 0 ? void 0 : protocol.title) || '')
+    });
+    return result;
+  }, []);
+}
+function getDepositPolicyIds(depositData) {
+  var ids = [].concat(_toConsumableArray(Array.isArray(depositData === null || depositData === void 0 ? void 0 : depositData.self_deposit_policy_ids) ? depositData.self_deposit_policy_ids : []), _toConsumableArray(Array.isArray(depositData === null || depositData === void 0 ? void 0 : depositData.deposit_policy_ids) ? depositData.deposit_policy_ids : []));
+  return ids.reduce(function (result, id) {
+    var normalizedId = Number(id);
+    if (!Number.isFinite(normalizedId)) return result;
+    result.push(Math.floor(normalizedId));
+    return result;
+  }, []);
+}
+function handleOrderProductDeposit(params) {
+  var depositData = params.depositData,
+    total = params.total,
+    num = params.num;
+  if (!depositData) return {
+    result: false,
+    depositTotal: new Decimal(0)
+  };
+  var deposit_fixed = depositData.deposit_fixed,
+    deposit_percentage = depositData.deposit_percentage;
+  if (typeof deposit_fixed !== 'string' || typeof deposit_percentage !== 'string') {
+    return {
+      result: false,
+      depositTotal: new Decimal(0)
+    };
+  }
+  var depositFixed = new Decimal(deposit_fixed || 0);
+  var depositPercent = new Decimal(deposit_percentage || 0);
+  var productTotalPrice = new Decimal(total || 0);
+  var deposit = depositFixed.plus(depositPercent.times(productTotalPrice));
+  return {
+    depositTotal: deposit.times(num),
+    result: true
+  };
+}
+function resolveOrderProductDepositSource(product, runtimeOrigin) {
+  var _ref3, _record$custom_deposi, _ref4, _record$variant;
+  var record = product;
+  var origin = record._origin || runtimeOrigin || {};
+  var originProduct = origin.product || {};
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, originProduct), origin), record), {}, {
+    custom_deposit_data: (_ref3 = (_record$custom_deposi = record.custom_deposit_data) !== null && _record$custom_deposi !== void 0 ? _record$custom_deposi : origin.custom_deposit_data) !== null && _ref3 !== void 0 ? _ref3 : originProduct.custom_deposit_data,
+    variant: (_ref4 = (_record$variant = record.variant) !== null && _record$variant !== void 0 ? _record$variant : origin.variant) !== null && _ref4 !== void 0 ? _ref4 : originProduct.variant
+  });
+}
+function getOrderProductDeposit(product, runtimeOrigin) {
+  var depositProduct = resolveOrderProductDepositSource(product, runtimeOrigin);
+  var depositData = depositProduct.custom_deposit_data;
+  if ((depositData === null || depositData === void 0 ? void 0 : depositData.has_deposit) != 1) return null;
+  var num = getSafeOrderProductNum(product.num);
+  var total = getOrderProductDepositUnitTotal(product).times(num);
+  var allProtocols = normalizeDepositProtocols(depositData.deposit_policy_data);
+  var protocolIds = [];
+  var depositTotal = new Decimal(0);
+  var hasDeposit = false;
+  if (typeof depositData.deposit_fixed === 'string' && typeof depositData.deposit_percentage === 'string') {
+    var result = handleOrderProductDeposit({
+      depositData: depositData,
+      total: total,
+      num: num
+    });
+    if (result.result) {
+      depositTotal = result.depositTotal;
+      protocolIds.push.apply(protocolIds, _toConsumableArray(getDepositPolicyIds({
+        self_deposit_policy_ids: depositData.self_deposit_policy_ids
+      })));
+      hasDeposit = true;
+    }
+  } else {
+    var _depositProduct$produ;
+    var productVariantId = (_depositProduct$produ = depositProduct.product_variant_id) !== null && _depositProduct$produ !== void 0 ? _depositProduct$produ : product.product_variant_id;
+    if (productVariantId) {
+      var variantProduct = (depositProduct.variant || []).find(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.id) === productVariantId;
+      });
+      var variantDepositData = variantProduct === null || variantProduct === void 0 ? void 0 : variantProduct.custom_deposit_data;
+      var _result = handleOrderProductDeposit({
+        depositData: variantDepositData,
+        total: total,
+        num: num
+      });
+      if (_result.result) {
+        depositTotal = _result.depositTotal;
+        protocolIds.push.apply(protocolIds, _toConsumableArray(getDepositPolicyIds({
+          self_deposit_policy_ids: variantDepositData === null || variantDepositData === void 0 ? void 0 : variantDepositData.self_deposit_policy_ids
+        })));
+        hasDeposit = true;
+      }
+    }
+    if (Array.isArray(product.product_bundle) && product.product_bundle.length) {
+      depositTotal = product.product_bundle.reduce(function (accumulator, bundleProduct) {
+        var bundleDepositData = bundleProduct === null || bundleProduct === void 0 ? void 0 : bundleProduct.custom_deposit_data;
+        var result = handleOrderProductDeposit({
+          depositData: bundleDepositData,
+          total: bundleProduct === null || bundleProduct === void 0 ? void 0 : bundleProduct.price,
+          num: getSafeOrderProductNum((bundleProduct === null || bundleProduct === void 0 ? void 0 : bundleProduct.num) || 1)
+        });
+        if (!result.result) return accumulator;
+        protocolIds.push.apply(protocolIds, _toConsumableArray(getDepositPolicyIds({
+          self_deposit_policy_ids: bundleDepositData === null || bundleDepositData === void 0 ? void 0 : bundleDepositData.self_deposit_policy_ids
+        })));
+        hasDeposit = true;
+        return accumulator.plus(result.depositTotal);
+      }, new Decimal(0));
+    }
+  }
+  if (!hasDeposit) return null;
+  var protocolIdSet = new Set(protocolIds);
+  var protocols = allProtocols.filter(function (protocol) {
+    return protocolIdSet.has(protocol.id);
+  });
+  return {
+    total: depositTotal.toNumber(),
+    protocols: protocols
+  };
+}
+
+/**
+ * 仅基于 tempOrder.products 重算整单定金。
+ *
+ * 对齐 Checkout relation_products 分支：商品定金先按商品规则计算，
+ * 再扣减商品券/折扣卡抵扣金额；tempOrder.bookings 不参与这里的计算。
+ */
+export function calculateOrderProductsDeposit() {
+  var products = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var options = arguments.length > 1 ? arguments[1] : undefined;
+  var protocolMap = new Map();
+  var total = new Decimal(0);
+  var hasDeposit = false;
+  var _iterator3 = _createForOfIteratorHelper(products || []),
+    _step3;
+  try {
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      var _product$metadata, _options$productsByUi;
+      var product = _step3.value;
+      var productUid = (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.unique_identification_number;
+      var runtimeOrigin = productUid ? options === null || options === void 0 || (_options$productsByUi = options.productsByUid) === null || _options$productsByUi === void 0 || (_options$productsByUi = _options$productsByUi[productUid]) === null || _options$productsByUi === void 0 ? void 0 : _options$productsByUi.origin : undefined;
+      var deposit = getOrderProductDeposit(product, runtimeOrigin);
+      product.deposit = deposit;
+      if (!(deposit !== null && deposit !== void 0 && deposit.total) || Number(deposit.total) <= 0) continue;
+      total = total.plus(deposit.total);
+      var _iterator4 = _createForOfIteratorHelper(product.discount_list || []),
+        _step4;
+      try {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var discount = _step4.value;
+          total = total.minus((discount === null || discount === void 0 ? void 0 : discount.amount) || 0);
+        }
+      } catch (err) {
+        _iterator4.e(err);
+      } finally {
+        _iterator4.f();
+      }
+      var _iterator5 = _createForOfIteratorHelper(deposit.protocols || []),
+        _step5;
+      try {
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var protocol = _step5.value;
+          if (!protocolMap.has(protocol.id)) protocolMap.set(protocol.id, protocol);
+        }
+      } catch (err) {
+        _iterator5.e(err);
+      } finally {
+        _iterator5.f();
+      }
+      hasDeposit = true;
+    }
+  } catch (err) {
+    _iterator3.e(err);
+  } finally {
+    _iterator3.f();
+  }
+  var roundedTotal = total.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
+  var protocols = _toConsumableArray(protocolMap.values());
+  return {
+    total: roundedTotal.toNumber(),
+    totalText: roundedTotal.toFixed(2),
+    protocols: protocols,
+    deposit_policy_ids: protocols.map(function (protocol) {
+      return protocol.id;
+    }),
+    hasDeposit: hasDeposit
+  };
+}
 
 /**
  * 判定套餐子商品是否为 markdown（减价）类型。
@@ -129,12 +337,12 @@ export function isMarkdownBundle(bundle) {
  * - markup（加价）/原价子商品：维持 `+(bundle_selling_price ?? price)`，行为不变。
  */
 export function getBundleSignedUnit(bundle, options) {
-  var _options$useOriginal, _ref8, _bundle$original_pric2, _bundle$bundle_sellin;
+  var _options$useOriginal, _ref11, _bundle$original_pric2, _bundle$bundle_sellin;
   if (!bundle || _typeof(bundle) !== 'object') return new Decimal(0);
   var useOriginal = (_options$useOriginal = options === null || options === void 0 ? void 0 : options.useOriginal) !== null && _options$useOriginal !== void 0 ? _options$useOriginal : false;
   if (isMarkdownBundle(bundle)) {
-    var _ref2, _ref3, _ref4, _bundle$original_pric, _ref5, _ref6, _ref7, _bundle$custom_price;
-    var catalog = useOriginal ? (_ref2 = (_ref3 = (_ref4 = (_bundle$original_pric = bundle.original_price) !== null && _bundle$original_pric !== void 0 ? _bundle$original_pric : bundle.product_price) !== null && _ref4 !== void 0 ? _ref4 : bundle.custom_price) !== null && _ref3 !== void 0 ? _ref3 : bundle.base_price) !== null && _ref2 !== void 0 ? _ref2 : bundle.price : (_ref5 = (_ref6 = (_ref7 = (_bundle$custom_price = bundle.custom_price) !== null && _bundle$custom_price !== void 0 ? _bundle$custom_price : bundle.product_price) !== null && _ref7 !== void 0 ? _ref7 : bundle.original_price) !== null && _ref6 !== void 0 ? _ref6 : bundle.base_price) !== null && _ref5 !== void 0 ? _ref5 : bundle.price;
+    var _ref5, _ref6, _ref7, _bundle$original_pric, _ref8, _ref9, _ref10, _bundle$custom_price;
+    var catalog = useOriginal ? (_ref5 = (_ref6 = (_ref7 = (_bundle$original_pric = bundle.original_price) !== null && _bundle$original_pric !== void 0 ? _bundle$original_pric : bundle.product_price) !== null && _ref7 !== void 0 ? _ref7 : bundle.custom_price) !== null && _ref6 !== void 0 ? _ref6 : bundle.base_price) !== null && _ref5 !== void 0 ? _ref5 : bundle.price : (_ref8 = (_ref9 = (_ref10 = (_bundle$custom_price = bundle.custom_price) !== null && _bundle$custom_price !== void 0 ? _bundle$custom_price : bundle.product_price) !== null && _ref10 !== void 0 ? _ref10 : bundle.original_price) !== null && _ref9 !== void 0 ? _ref9 : bundle.base_price) !== null && _ref8 !== void 0 ? _ref8 : bundle.price;
     if (catalog !== undefined && catalog !== null && catalog !== '') {
       var raw = new Decimal(Number(catalog) || 0);
       // 负值表示价格已是「带符号净额」（如 cart/changePrice 产出的 -3.7），直接取用不再扣 option，
@@ -145,7 +353,7 @@ export function getBundleSignedUnit(bundle, options) {
     // 仅剩净额（无毛价）兜底：直接取负，不再扣 option
     return new Decimal(Number(bundle.bundle_selling_price) || 0).abs().negated();
   }
-  var rawPrice = useOriginal ? (_ref8 = (_bundle$original_pric2 = bundle.original_price) !== null && _bundle$original_pric2 !== void 0 ? _bundle$original_pric2 : bundle.product_price) !== null && _ref8 !== void 0 ? _ref8 : bundle.price : (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.price;
+  var rawPrice = useOriginal ? (_ref11 = (_bundle$original_pric2 = bundle.original_price) !== null && _bundle$original_pric2 !== void 0 ? _bundle$original_pric2 : bundle.product_price) !== null && _ref11 !== void 0 ? _ref11 : bundle.price : (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.price;
   return new Decimal(Number(rawPrice) || 0);
 }
 
@@ -314,8 +522,8 @@ export function createDefaultOrderRulesHooks() {
     return new Decimal(Number(totalLike) || 0).dividedBy(effectiveNum).toDecimalPlaces(2).toString();
   };
   var getBundleIdentity = function getBundleIdentity(bundle) {
-    var _ref9, _bundle$bundle_id, _ref10, _ref11, _bundle$bundle_produc, _ref12, _ref13, _bundle$bundle_varian, _ref14, _bundle$bundle_group_;
-    return [(_ref9 = (_bundle$bundle_id = bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle.id) !== null && _ref9 !== void 0 ? _ref9 : '', (_ref10 = (_ref11 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref11 !== void 0 ? _ref11 : bundle.product_id) !== null && _ref10 !== void 0 ? _ref10 : '', (_ref12 = (_ref13 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref13 !== void 0 ? _ref13 : bundle.product_variant_id) !== null && _ref12 !== void 0 ? _ref12 : 0, (_ref14 = (_bundle$bundle_group_ = bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle.group_id) !== null && _ref14 !== void 0 ? _ref14 : ''].join('|');
+    var _ref12, _bundle$bundle_id, _ref13, _ref14, _bundle$bundle_produc, _ref15, _ref16, _bundle$bundle_varian, _ref17, _bundle$bundle_group_;
+    return [(_ref12 = (_bundle$bundle_id = bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle.id) !== null && _ref12 !== void 0 ? _ref12 : '', (_ref13 = (_ref14 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref14 !== void 0 ? _ref14 : bundle.product_id) !== null && _ref13 !== void 0 ? _ref13 : '', (_ref15 = (_ref16 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref16 !== void 0 ? _ref16 : bundle.product_variant_id) !== null && _ref15 !== void 0 ? _ref15 : 0, (_ref17 = (_bundle$bundle_group_ = bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle.group_id) !== null && _ref17 !== void 0 ? _ref17 : ''].join('|');
   };
   var mergeRulesBundlePrices = function mergeRulesBundlePrices(currentBundle, rulesBundle) {
     if (!Array.isArray(rulesBundle)) return rulesBundle;
@@ -325,14 +533,14 @@ export function createDefaultOrderRulesHooks() {
       currentByIdentity.set(getBundleIdentity(bundle), bundle);
     });
     return rulesBundle.map(function (bundle) {
-      var _bundle$price_type_ex2, _ref15, _ref16, _current$price, _ref17, _ref18, _ref19, _current$original_pri;
+      var _bundle$price_type_ex2, _ref18, _ref19, _current$price, _ref20, _ref21, _ref22, _current$original_pri;
       if (!bundle || _typeof(bundle) !== 'object') return bundle;
       var current = currentByIdentity.get(getBundleIdentity(bundle));
       if (!current) return bundle;
       var isProductPriceBundle = ((_bundle$price_type_ex2 = bundle.price_type_ext) !== null && _bundle$price_type_ex2 !== void 0 ? _bundle$price_type_ex2 : current.price_type_ext) === 'product_price';
       if (!isProductPriceBundle) return bundle;
-      var sourcePrice = (_ref15 = (_ref16 = (_current$price = current.price) !== null && _current$price !== void 0 ? _current$price : current.custom_price) !== null && _ref16 !== void 0 ? _ref16 : current.original_price) !== null && _ref15 !== void 0 ? _ref15 : current.bundle_selling_price;
-      var originalPrice = (_ref17 = (_ref18 = (_ref19 = (_current$original_pri = current.original_price) !== null && _current$original_pri !== void 0 ? _current$original_pri : current.product_price) !== null && _ref19 !== void 0 ? _ref19 : current.price) !== null && _ref18 !== void 0 ? _ref18 : current.custom_price) !== null && _ref17 !== void 0 ? _ref17 : sourcePrice;
+      var sourcePrice = (_ref18 = (_ref19 = (_current$price = current.price) !== null && _current$price !== void 0 ? _current$price : current.custom_price) !== null && _ref19 !== void 0 ? _ref19 : current.original_price) !== null && _ref18 !== void 0 ? _ref18 : current.bundle_selling_price;
+      var originalPrice = (_ref20 = (_ref21 = (_ref22 = (_current$original_pri = current.original_price) !== null && _current$original_pri !== void 0 ? _current$original_pri : current.product_price) !== null && _ref22 !== void 0 ? _ref22 : current.price) !== null && _ref21 !== void 0 ? _ref21 : current.custom_price) !== null && _ref20 !== void 0 ? _ref20 : sourcePrice;
       return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, bundle), sourcePrice !== undefined ? {
         price: sourcePrice
       } : {}), originalPrice !== undefined ? {
@@ -344,7 +552,7 @@ export function createDefaultOrderRulesHooks() {
   };
   return {
     getProduct: function getProduct(product) {
-      var _product$metadata, _product$metadata2, _product$metadata3, _product$metadata4, _product$metadata5, _metadataAny$_promoti;
+      var _product$metadata2, _product$metadata3, _product$metadata4, _product$metadata5, _product$metadata6, _metadataAny$_promoti;
       // source_product_price 是权威源；兜底链：source → mainSelling − options（反推）→ 行 selling_price
       var metadataAny = product.metadata || {};
       var optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
@@ -371,7 +579,7 @@ export function createDefaultOrderRulesHooks() {
         // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
         // 不透明 identity 契约下，normalizeOrderProduct / hydrate 已保证唯一值存在；
         // 留 fingerprint 分支仅作 Rules 单测里直接传裸 product 时的兜底。
-        _id: (_product$metadata = product.metadata) !== null && _product$metadata !== void 0 && _product$metadata.unique_identification_number ? "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(product.metadata.unique_identification_number) : "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(buildProductLineFingerprint(getProductSkuOptions(product), product.product_bundle)),
+        _id: (_product$metadata2 = product.metadata) !== null && _product$metadata2 !== void 0 && _product$metadata2.unique_identification_number ? "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(product.metadata.unique_identification_number) : "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(buildProductLineFingerprint(getProductSkuOptions(product), product.product_bundle)),
         // Rules 内部 getProductTotalPrice / getProductOriginTotalPrice 会各自再叠加 bundle + option，
         // 所以这里必须喂 source-level（不含 option、不含 bundle、不含折扣）单价，避免双加 option。
         price: sourcePrice,
@@ -383,23 +591,23 @@ export function createDefaultOrderRulesHooks() {
         num: product.num || 1,
         discount_list: product.discount_list || [],
         bundle: product.product_bundle || [],
-        booking_id: ((_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.booking_id) || null,
+        booking_id: ((_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.booking_id) || null,
         isClient: false,
         // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
         // 无券时会把 bundle 价还原成 original_price（手动改价套餐会从 20 回到 30）。
         isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
-        holder_id: (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.holder_id,
-        startDate: ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.start_date) || ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.startDate),
+        holder_id: (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.holder_id,
+        startDate: ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.start_date) || ((_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.startDate),
         main_product_selling_price: metadataAny.main_product_selling_price !== undefined ? new Decimal(Number(metadataAny.main_product_selling_price) || 0).minus(optionSum).toDecimalPlaces(2).toString() : undefined,
         inPromotion: ((_metadataAny$_promoti = metadataAny._promotion) === null || _metadataAny$_promoti === void 0 ? void 0 : _metadataAny$_promoti.inPromotion) === true,
         _promotion: metadataAny._promotion
       };
     },
     setProduct: function setProduct(product, values) {
-      var _ref20, _values$quantity, _ref21, _metadataAny$source_p, _values$discount_list, _values$quantity2;
-      var nextNum = Number((_ref20 = (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num) !== null && _ref20 !== void 0 ? _ref20 : 1) || 1;
+      var _ref23, _values$quantity, _ref24, _metadataAny$source_p, _values$discount_list, _values$quantity2;
+      var nextNum = Number((_ref23 = (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num) !== null && _ref23 !== void 0 ? _ref23 : 1) || 1;
       var metadataAny = product.metadata || {};
-      var existedSource = (_ref21 = (_metadataAny$source_p = metadataAny.source_product_price) !== null && _metadataAny$source_p !== void 0 ? _metadataAny$source_p : product.selling_price) !== null && _ref21 !== void 0 ? _ref21 : '0';
+      var existedSource = (_ref24 = (_metadataAny$source_p = metadataAny.source_product_price) !== null && _metadataAny$source_p !== void 0 ? _metadataAny$source_p : product.selling_price) !== null && _ref24 !== void 0 ? _ref24 : '0';
       var nextOptions = getProductSkuOptions(product);
       var optionSum = sumOptionUnitPrice(nextOptions);
 
@@ -572,7 +780,7 @@ function toMoneyString(value) {
 function formatSubmitBundleItems(bundle) {
   if (!Array.isArray(bundle)) return [];
   return bundle.map(function (b) {
-    var _ref22, _rawBundle$price, _rawBundle$surcharge_, _rawBundle$num, _rawBundle$is_charge_, _rawBundle$bundle_var, _rawBundle$quantity, _rawBundle$extension_, _rawBundle$extension_2, _ref23, _rawBundle$price_type, _ref24, _rawBundle$price_type2, _rawBundle$bundle_gro, _rawBundle$bundle_id, _rawBundle$bundle_pro;
+    var _ref25, _rawBundle$price, _rawBundle$surcharge_, _rawBundle$num, _rawBundle$is_charge_, _rawBundle$bundle_var, _rawBundle$quantity, _rawBundle$extension_, _rawBundle$extension_2, _ref26, _rawBundle$price_type, _ref27, _rawBundle$price_type2, _rawBundle$bundle_gro, _rawBundle$bundle_id, _rawBundle$bundle_pro;
     var rawBundle = b && _typeof(b) === 'object' ? b : {};
     var existedMetadata = rawBundle.metadata && _typeof(rawBundle.metadata) === 'object' ? rawBundle.metadata : {};
 
@@ -581,7 +789,7 @@ function formatSubmitBundleItems(bundle) {
     var sellingPrice = getBundleSellingMagnitude(rawBundle).toFixed(2);
     // payment 价由整单折扣均摊层产出；缺省（无折扣）时与 selling 净额同义。
     var paymentPrice = rawBundle.bundle_payment_price !== undefined && rawBundle.bundle_payment_price !== null && rawBundle.bundle_payment_price !== '' ? toMoneyString(rawBundle.bundle_payment_price) : sellingPrice;
-    var priceValue = (_ref22 = (_rawBundle$price = rawBundle.price) !== null && _rawBundle$price !== void 0 ? _rawBundle$price : rawBundle.custom_price) !== null && _ref22 !== void 0 ? _ref22 : rawBundle.bundle_selling_price;
+    var priceValue = (_ref25 = (_rawBundle$price = rawBundle.price) !== null && _rawBundle$price !== void 0 ? _rawBundle$price : rawBundle.custom_price) !== null && _ref25 !== void 0 ? _ref25 : rawBundle.bundle_selling_price;
     var relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
     var surchargeFee = toMoneyString((_rawBundle$surcharge_ = rawBundle.surcharge_fee) !== null && _rawBundle$surcharge_ !== void 0 ? _rawBundle$surcharge_ : existedMetadata.surcharge_fee);
     var productDiscountDifference = toBundleNumber(existedMetadata.product_discount_difference, 0);
@@ -594,8 +802,8 @@ function formatSubmitBundleItems(bundle) {
       extension_id: (_rawBundle$extension_ = rawBundle.extension_id) !== null && _rawBundle$extension_ !== void 0 ? _rawBundle$extension_ : 0,
       extension_type: (_rawBundle$extension_2 = rawBundle.extension_type) !== null && _rawBundle$extension_2 !== void 0 ? _rawBundle$extension_2 : 'normal',
       price: priceValue,
-      price_type: (_ref23 = (_rawBundle$price_type = rawBundle.price_type) !== null && _rawBundle$price_type !== void 0 ? _rawBundle$price_type : rawBundle.custom_price_type) !== null && _ref23 !== void 0 ? _ref23 : '',
-      price_type_ext: (_ref24 = (_rawBundle$price_type2 = rawBundle.price_type_ext) !== null && _rawBundle$price_type2 !== void 0 ? _rawBundle$price_type2 : rawBundle.custom_price_type_ext) !== null && _ref24 !== void 0 ? _ref24 : '',
+      price_type: (_ref26 = (_rawBundle$price_type = rawBundle.price_type) !== null && _rawBundle$price_type !== void 0 ? _rawBundle$price_type : rawBundle.custom_price_type) !== null && _ref26 !== void 0 ? _ref26 : '',
+      price_type_ext: (_ref27 = (_rawBundle$price_type2 = rawBundle.price_type_ext) !== null && _rawBundle$price_type2 !== void 0 ? _rawBundle$price_type2 : rawBundle.custom_price_type_ext) !== null && _ref27 !== void 0 ? _ref27 : '',
       bundle_selling_price: sellingPrice,
       bundle_payment_price: paymentPrice,
       option: formatSubmitOptionItems(rawBundle.option),
@@ -629,9 +837,9 @@ function formatSubmitBundleItems(bundle) {
  */
 function normalizeSubmitProduct(product) {
   var _rawMetadata$product_, _submitProduct$produc, _submitProduct$paymen;
-  var _ref25 = product,
-    _runtimeUid = _ref25.unique_identification_number,
-    submitProduct = _objectWithoutProperties(_ref25, _excluded);
+  var _ref28 = product,
+    _runtimeUid = _ref28.unique_identification_number,
+    submitProduct = _objectWithoutProperties(_ref28, _excluded);
   var num = submitProduct.num,
     _productSurchargeFee = submitProduct.surcharge_fee,
     _deprecatedDiscountAmount = submitProduct.discount_amount,
@@ -691,19 +899,19 @@ export function normalizeBookingSubType(booking) {
 export function normalizeSubmitBooking(booking) {
   var rawMetadata = booking.metadata || {};
   var cleanMetadata = {};
-  var _iterator3 = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
-    _step3;
+  var _iterator6 = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
+    _step6;
   try {
-    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-      var key = _step3.value;
+    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+      var key = _step6.value;
       if (rawMetadata[key] !== undefined) {
         cleanMetadata[key] = rawMetadata[key];
       }
     }
   } catch (err) {
-    _iterator3.e(err);
+    _iterator6.e(err);
   } finally {
-    _iterator3.f();
+    _iterator6.f();
   }
   if (cleanMetadata.holder_id === undefined) cleanMetadata.holder_id = null;
   var bookingRecord = booking;
@@ -795,7 +1003,7 @@ export function createDefaultTempOrder(params) {
   };
 }
 export function buildSubmitPayload(params) {
-  var _tempOrder$customer_i, _tempOrder$order_numb, _tempOrder$shop_order, _tempOrder$shop_full_, _ref27, _tempOrder$is_price_i, _tempOrder$is_deposit, _enhancedPayload$summ;
+  var _tempOrder$customer_i, _tempOrder$order_numb, _tempOrder$shop_order, _tempOrder$shop_full_, _ref30, _tempOrder$is_price_i, _tempOrder$is_deposit, _enhancedPayload$summ;
   var tempOrder = params.tempOrder,
     cacheId = params.cacheId,
     _params$now = params.now,
@@ -808,26 +1016,26 @@ export function buildSubmitPayload(params) {
     enhance = params.enhance;
   var scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   var bookingUuid = createUuidV4();
-  var _ref26 = tempOrder,
-    _extend = _ref26._extend,
-    _relationId = _ref26.relation_id,
-    _tableFormId = _ref26.table_form_id,
-    _resourceId = _ref26.resource_id,
-    _summary = _ref26.summary,
-    _lastOrderInfo = _ref26.lastOrderInfo,
-    _paidAmount = _ref26.paid_amount,
-    _shopId = _ref26.shop_id,
-    _shopNote = _ref26.shop_note,
-    _shopServiceType = _ref26.shop_service_type,
-    _startTime = _ref26.start_time,
-    _customer = _ref26.customer,
-    _discountList = _ref26.discount_list,
-    _rootTaxFee = _ref26.tax_fee,
-    _totalAmount = _ref26.total_amount,
-    _totalRefundAmount = _ref26.total_refund_amount,
-    _createDate = _ref26.create_date,
-    _holderId = _ref26.holder_id,
-    tempOrderRest = _objectWithoutProperties(_ref26, _excluded3);
+  var _ref29 = tempOrder,
+    _extend = _ref29._extend,
+    _relationId = _ref29.relation_id,
+    _tableFormId = _ref29.table_form_id,
+    _resourceId = _ref29.resource_id,
+    _summary = _ref29.summary,
+    _lastOrderInfo = _ref29.lastOrderInfo,
+    _paidAmount = _ref29.paid_amount,
+    _shopId = _ref29.shop_id,
+    _shopNote = _ref29.shop_note,
+    _shopServiceType = _ref29.shop_service_type,
+    _startTime = _ref29.start_time,
+    _customer = _ref29.customer,
+    _discountList = _ref29.discount_list,
+    _rootTaxFee = _ref29.tax_fee,
+    _totalAmount = _ref29.total_amount,
+    _totalRefundAmount = _ref29.total_refund_amount,
+    _createDate = _ref29.create_date,
+    _holderId = _ref29.holder_id,
+    tempOrderRest = _objectWithoutProperties(_ref29, _excluded3);
   var submitType = type !== null && type !== void 0 ? type : tempOrder.type;
   if (!submitType) {
     var _tempOrder$bookings;
@@ -849,7 +1057,7 @@ export function buildSubmitPayload(params) {
     type: submitType,
     business_code: businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code,
     sales_channel: tempOrder.sales_channel || 'my_pisel',
-    order_sales_channel: (_ref27 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref27 !== void 0 ? _ref27 : 'online_store',
+    order_sales_channel: (_ref30 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref30 !== void 0 ? _ref30 : 'online_store',
     status: tempOrder.status || 'normal',
     payment_status: tempOrder.payment_status || 'payment_processing',
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
@@ -875,10 +1083,10 @@ export function buildSubmitPayload(params) {
     // holder: tempOrder.holder || null,
     summary: summary || tempOrder.summary || createEmptySummary(),
     metadata: function () {
-      var _ref28 = tempOrder.metadata || {},
-        _collectPax = _ref28.collect_pax,
-        _tableOccupancyDuration = _ref28.table_occupancy_duration,
-        rest = _objectWithoutProperties(_ref28, _excluded4);
+      var _ref31 = tempOrder.metadata || {},
+        _collectPax = _ref31.collect_pax,
+        _tableOccupancyDuration = _ref31.table_occupancy_duration,
+        rest = _objectWithoutProperties(_ref31, _excluded4);
       return _objectSpread({}, rest);
     }(),
     products: (tempOrder.products || []).map(function (product) {
@@ -1013,25 +1221,25 @@ export function clearTempOrderHolderAssignments(tempOrder) {
     target[key] = null;
     changed = true;
   };
-  var _iterator4 = _createForOfIteratorHelper(tempOrder.products || []),
-    _step4;
+  var _iterator7 = _createForOfIteratorHelper(tempOrder.products || []),
+    _step7;
   try {
-    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-      var product = _step4.value;
+    for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+      var product = _step7.value;
       if (product.metadata && _typeof(product.metadata) === 'object') {
         resetHolderField(product.metadata);
       }
     }
   } catch (err) {
-    _iterator4.e(err);
+    _iterator7.e(err);
   } finally {
-    _iterator4.f();
+    _iterator7.f();
   }
-  var _iterator5 = _createForOfIteratorHelper(tempOrder.bookings || []),
-    _step5;
+  var _iterator8 = _createForOfIteratorHelper(tempOrder.bookings || []),
+    _step8;
   try {
-    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-      var booking = _step5.value;
+    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+      var booking = _step8.value;
       var bookingRecord = booking;
       if (booking.metadata && _typeof(booking.metadata) === 'object') {
         resetHolderField(booking.metadata);
@@ -1042,9 +1250,9 @@ export function clearTempOrderHolderAssignments(tempOrder) {
       }
     }
   } catch (err) {
-    _iterator5.e(err);
+    _iterator8.e(err);
   } finally {
-    _iterator5.f();
+    _iterator8.f();
   }
   var productsByUid = (_tempOrder$_extend = tempOrder._extend) === null || _tempOrder$_extend === void 0 ? void 0 : _tempOrder$_extend.productsByUid;
   if (productsByUid && _typeof(productsByUid) === 'object') {
@@ -1070,9 +1278,9 @@ export function clearTempOrderHolderAssignments(tempOrder) {
  * getOrderProductLineUid({ metadata: { unique_identification_number: 'line-1' } }); // 'line-1'
  */
 export function getOrderProductLineUid(product) {
-  var _product$metadata$uni, _product$metadata6;
+  var _product$metadata$uni, _product$metadata7;
   if (!product || _typeof(product) !== 'object') return null;
-  var uid = (_product$metadata$uni = (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.unique_identification_number) !== null && _product$metadata$uni !== void 0 ? _product$metadata$uni : product.unique_identification_number;
+  var uid = (_product$metadata$uni = (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.unique_identification_number) !== null && _product$metadata$uni !== void 0 ? _product$metadata$uni : product.unique_identification_number;
   if (uid === undefined || uid === null || uid === '') return null;
   return String(uid);
 }

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

@@ -1944,7 +1944,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var secondary = preferred === existing ? incoming : existing;
       var merged = _objectSpread(_objectSpread({}, secondary), preferred);
       var fieldsToPreserve = ['order_id', 'external_sale_number', 'order_number', 'shop_order_number', 'shop_full_order_number'];
-      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'summary', 'payments', 'products', 'bookings'];
+      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'shop_discount', 'summary', 'payments', 'products', 'bookings'];
       var mergedRecord = merged;
       var preferredRecord = preferred;
       var secondaryRecord = secondary;

package/dist/server/modules/resource/index.d.ts

@@ -61,6 +61,8 @@ export declare class ResourceModule extends BaseModule implements Module {
      */
     clear(): Promise<void>;
     private attachBookingsToResource;
+    private normalizeIntegerIdValue;
+    private normalizeResourceIdFields;
     private normalizeResource;
     private safeEmit;
     private syncResourcesMap;

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

@@ -428,15 +428,41 @@ export var ResourceModule = /*#__PURE__*/function (_BaseModule) {
         bookings: this.getBookingsByResourceId(resource.id)
       });
     }
+  }, {
+    key: "normalizeIntegerIdValue",
+    value: function normalizeIntegerIdValue(value) {
+      if (typeof value !== 'string') return value;
+      var matched = value.match(/^(-?\d+)\.0+$/);
+      if (!matched) return value;
+      return matched[1];
+    }
+  }, {
+    key: "normalizeResourceIdFields",
+    value: function normalizeResourceIdFields(resource) {
+      resource.id = this.normalizeIntegerIdValue(resource.id);
+      if (resource.form_record_id !== undefined) {
+        resource.form_record_id = this.normalizeIntegerIdValue(resource.form_record_id);
+      }
+      if (resource.form_id !== undefined) {
+        resource.form_id = this.normalizeIntegerIdValue(resource.form_id);
+      }
+      if (resource.resource_form_id !== undefined) {
+        resource.resource_form_id = this.normalizeIntegerIdValue(resource.resource_form_id);
+      }
+      if (resource.resource_id !== undefined) {
+        resource.resource_id = this.normalizeIntegerIdValue(resource.resource_id);
+      }
+      return resource;
+    }
   }, {
     key: "normalizeResource",
     value: function normalizeResource(resource) {
       var _ref2,
         _resource$id,
         _this7 = this;
-      var normalized = _objectSpread(_objectSpread({}, resource), {}, {
-        id: (_ref2 = (_resource$id = resource === null || resource === void 0 ? void 0 : resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource === null || resource === void 0 ? void 0 : resource.form_record_id) !== null && _ref2 !== void 0 ? _ref2 : ''
-      });
+      var normalized = this.normalizeResourceIdFields(_objectSpread(_objectSpread({}, resource), {}, {
+        id: this.normalizeIntegerIdValue((_ref2 = (_resource$id = resource === null || resource === void 0 ? void 0 : resource.id) !== null && _resource$id !== void 0 ? _resource$id : resource === null || resource === void 0 ? void 0 : resource.form_record_id) !== null && _ref2 !== void 0 ? _ref2 : '')
+      }));
       if (normalized.form_record_id === undefined && normalized.id !== '') {
         normalized.form_record_id = normalized.id;
       }

package/dist/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 6 | 5 | 4;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

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

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

@@ -1,49 +0,0 @@
-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/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

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

@@ -234,6 +234,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private findBookingIndexByUniqueIdentificationNumber;
     private removeLinkedBookingsForProduct;
     private getSalesSummary;
+    private applyOrderProductsDepositSummary;
     recalculateSummary(options?: {
         createIfMissing?: boolean;
     }): Promise<OrderSummary | null>;

package/lib/modules/Order/index.js

@@ -1645,6 +1645,25 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return null;
     return this.core.getModule(this.salesSummaryModuleName);
   }
+  applyOrderProductsDepositSummary(tempOrder, summary) {
+    var _a;
+    const depositSummary = (0, import_utils.calculateOrderProductsDeposit)(tempOrder.products || [], {
+      productsByUid: (_a = tempOrder._extend) == null ? void 0 : _a.productsByUid
+    });
+    const nextSummary = {
+      ...summary,
+      deposit_amount: depositSummary.totalText,
+      deposit: depositSummary.hasDeposit ? {
+        total: depositSummary.totalText,
+        deposit_policy_ids: depositSummary.deposit_policy_ids,
+        deposit_policy_data: depositSummary.protocols,
+        hasDeposit: true
+      } : void 0
+    };
+    tempOrder.deposit_amount = depositSummary.totalText;
+    tempOrder.is_deposit = depositSummary.hasDeposit ? 1 : 0;
+    return nextSummary;
+  }
   async recalculateSummary(options) {
     const tempOrder = (options == null ? void 0 : options.createIfMissing) ? this.ensureTempOrder() : this.store.tempOrder;
     if (!tempOrder)
@@ -1670,17 +1689,24 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         ...existedSummary,
         total_refund_amount: totalRefundAmount
       };
-      const emptySummary = {
+      const emptySummaryBase = {
         ...emptyBaseSummary,
         customer_paid_amount: paidPaymentSummary.customerPaidAmount.toFixed(2),
         order_paid_amount: paidPaymentSummary.orderPaidAmount.toFixed(2),
+        pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2),
+        rounding_amount: paidPaymentSummary.roundingAmount.toFixed(2)
+      };
+      const emptySummaryWithDeposit = this.applyOrderProductsDepositSummary(
+        tempOrder,
+        emptySummaryBase
+      );
+      const emptySummary = {
+        ...emptySummaryWithDeposit,
         amount_gap: this.calculateSummaryAmountGap({
           tempOrder,
-          summary: emptyBaseSummary,
+          summary: emptySummaryWithDeposit,
           orderPaidAmount: paidPaymentSummary.gapPaidAmount
-        }),
-        pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2),
-        rounding_amount: paidPaymentSummary.roundingAmount.toFixed(2)
+        })
       };
       tempOrder.surcharge_fee = emptySummary.surcharge_fee;
       this.store.summary = emptySummary;
@@ -1713,14 +1739,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       } : {}
     } : {};
     const normalizedExpectAmountPatch = expectAmount && salesSummaryResult.expect_amount === void 0 ? { expect_amount: expectAmount.toFixed(2) } : {};
-    const summaryForGap = {
+    const summaryForGap = this.applyOrderProductsDepositSummary(tempOrder, {
       ...salesSummaryResult,
       total_refund_amount: totalRefundAmount,
       ...amountPaymentPatch,
       ...normalizedExpectAmountPatch
-    };
+    });
     const summary = {
-      ...salesSummaryResult,
+      ...summaryForGap,
       total_refund_amount: totalRefundAmount,
       customer_paid_amount: paidPaymentSummary.customerPaidAmount.toFixed(2),
       order_paid_amount: paidPaymentSummary.orderPaidAmount.toFixed(2),
@@ -1742,8 +1768,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     tempOrder.surcharge_fee = summary.surcharge_fee;
     tempOrder.surcharges = summary.surcharges || [];
-    tempOrder.deposit_amount = summary.deposit_amount || "0.00";
-    tempOrder.is_deposit = summary.deposit_amount !== "0.00" ? 1 : 0;
     this.updateTempOrderPaymentStatus(tempOrder, {
       previousSummary: existedSummary,
       summary

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

@@ -1,8 +1,19 @@
 import Decimal from 'decimal.js';
 import type { CartItem } from "../Cart";
-import type { OrderProductDiscountItem, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
+import type { OrderProductDiscountItem, OrderProduct, OrderSubmitPayload, OrderSubmitProduct, OrderSummary, OrderTempOrder } from './types';
 import type { RulesParamsHooks } from '../Rules/types';
 import type { MapOrderPaymentsOptions, OrderPaymentData, OrderPaymentSource } from './types';
+export interface OrderProductsDepositProtocol {
+    id: number;
+    title: string;
+}
+export interface OrderProductsDepositSummary {
+    total: number;
+    totalText: string;
+    protocols: OrderProductsDepositProtocol[];
+    deposit_policy_ids: number[];
+    hasDeposit: boolean;
+}
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -53,6 +64,15 @@ export declare function sumOptionUnitPrice(options?: Array<{
     price?: any;
     num?: any;
 }> | null): Decimal;
+/**
+ * 仅基于 tempOrder.products 重算整单定金。
+ *
+ * 对齐 Checkout relation_products 分支：商品定金先按商品规则计算，
+ * 再扣减商品券/折扣卡抵扣金额；tempOrder.bookings 不参与这里的计算。
+ */
+export declare function calculateOrderProductsDeposit(products?: OrderProduct[], options?: {
+    productsByUid?: Record<string, Record<string, any>>;
+}): OrderProductsDepositSummary;
 /**
  * 判定套餐子商品是否为 markdown（减价）类型。
  * 与后端口径一致：price_type='markdown' 且 price_type_ext 非 'product_price'（原价子商品）。

package/lib/modules/Order/utils.js

@@ -31,6 +31,7 @@ var utils_exports = {};
 __export(utils_exports, {
   buildManualProductDiscountItem: () => import_manualProductDiscount.buildManualProductDiscountItem,
   buildSubmitPayload: () => buildSubmitPayload,
+  calculateOrderProductsDeposit: () => calculateOrderProductsDeposit,
   clearTempOrderHolderAssignments: () => clearTempOrderHolderAssignments,
   composeLinePrice: () => composeLinePrice,
   createDefaultOrderRulesHooks: () => createDefaultOrderRulesHooks,
@@ -131,6 +132,175 @@ function sumOptionUnitPrice(options) {
   }
   return total;
 }
+function getSafeOrderProductNum(num) {
+  const parsedNum = Number(num ?? 1);
+  if (!Number.isFinite(parsedNum) || parsedNum < 1)
+    return 1;
+  return Math.floor(parsedNum);
+}
+function getOrderProductDepositUnitTotal(product) {
+  const metadata = product.metadata || {};
+  const paymentPrice = metadata.main_product_attached_bundle_payment_price;
+  const mainSellingPrice = metadata.main_product_selling_price;
+  const fallbackPrice = product.selling_price;
+  return new import_decimal.default(Number(paymentPrice ?? mainSellingPrice ?? fallbackPrice) || 0);
+}
+function normalizeDepositProtocols(protocols) {
+  if (!Array.isArray(protocols))
+    return [];
+  return protocols.reduce((result, protocol) => {
+    const id = Number(protocol == null ? void 0 : protocol.id);
+    if (!Number.isFinite(id))
+      return result;
+    result.push({
+      id: Math.floor(id),
+      title: String((protocol == null ? void 0 : protocol.title) || "")
+    });
+    return result;
+  }, []);
+}
+function getDepositPolicyIds(depositData) {
+  const ids = [
+    ...Array.isArray(depositData == null ? void 0 : depositData.self_deposit_policy_ids) ? depositData.self_deposit_policy_ids : [],
+    ...Array.isArray(depositData == null ? void 0 : depositData.deposit_policy_ids) ? depositData.deposit_policy_ids : []
+  ];
+  return ids.reduce((result, id) => {
+    const normalizedId = Number(id);
+    if (!Number.isFinite(normalizedId))
+      return result;
+    result.push(Math.floor(normalizedId));
+    return result;
+  }, []);
+}
+function handleOrderProductDeposit(params) {
+  const { depositData, total, num } = params;
+  if (!depositData)
+    return { result: false, depositTotal: new import_decimal.default(0) };
+  const { deposit_fixed, deposit_percentage } = depositData;
+  if (typeof deposit_fixed !== "string" || typeof deposit_percentage !== "string") {
+    return { result: false, depositTotal: new import_decimal.default(0) };
+  }
+  const depositFixed = new import_decimal.default(deposit_fixed || 0);
+  const depositPercent = new import_decimal.default(deposit_percentage || 0);
+  const productTotalPrice = new import_decimal.default(total || 0);
+  const deposit = depositFixed.plus(depositPercent.times(productTotalPrice));
+  return { depositTotal: deposit.times(num), result: true };
+}
+function resolveOrderProductDepositSource(product, runtimeOrigin) {
+  const record = product;
+  const origin = record._origin || runtimeOrigin || {};
+  const originProduct = origin.product || {};
+  return {
+    ...originProduct,
+    ...origin,
+    ...record,
+    custom_deposit_data: record.custom_deposit_data ?? origin.custom_deposit_data ?? originProduct.custom_deposit_data,
+    variant: record.variant ?? origin.variant ?? originProduct.variant
+  };
+}
+function getOrderProductDeposit(product, runtimeOrigin) {
+  const depositProduct = resolveOrderProductDepositSource(product, runtimeOrigin);
+  const depositData = depositProduct.custom_deposit_data;
+  if ((depositData == null ? void 0 : depositData.has_deposit) != 1)
+    return null;
+  const num = getSafeOrderProductNum(product.num);
+  const total = getOrderProductDepositUnitTotal(product).times(num);
+  const allProtocols = normalizeDepositProtocols(depositData.deposit_policy_data);
+  const protocolIds = [];
+  let depositTotal = new import_decimal.default(0);
+  let hasDeposit = false;
+  if (typeof depositData.deposit_fixed === "string" && typeof depositData.deposit_percentage === "string") {
+    const result = handleOrderProductDeposit({
+      depositData,
+      total,
+      num
+    });
+    if (result.result) {
+      depositTotal = result.depositTotal;
+      protocolIds.push(...getDepositPolicyIds({
+        self_deposit_policy_ids: depositData.self_deposit_policy_ids
+      }));
+      hasDeposit = true;
+    }
+  } else {
+    const productVariantId = depositProduct.product_variant_id ?? product.product_variant_id;
+    if (productVariantId) {
+      const variantProduct = (depositProduct.variant || []).find(
+        (item) => (item == null ? void 0 : item.id) === productVariantId
+      );
+      const variantDepositData = variantProduct == null ? void 0 : variantProduct.custom_deposit_data;
+      const result = handleOrderProductDeposit({
+        depositData: variantDepositData,
+        total,
+        num
+      });
+      if (result.result) {
+        depositTotal = result.depositTotal;
+        protocolIds.push(...getDepositPolicyIds({
+          self_deposit_policy_ids: variantDepositData == null ? void 0 : variantDepositData.self_deposit_policy_ids
+        }));
+        hasDeposit = true;
+      }
+    }
+    if (Array.isArray(product.product_bundle) && product.product_bundle.length) {
+      depositTotal = product.product_bundle.reduce((accumulator, bundleProduct) => {
+        const bundleDepositData = bundleProduct == null ? void 0 : bundleProduct.custom_deposit_data;
+        const result = handleOrderProductDeposit({
+          depositData: bundleDepositData,
+          total: bundleProduct == null ? void 0 : bundleProduct.price,
+          num: getSafeOrderProductNum((bundleProduct == null ? void 0 : bundleProduct.num) || 1)
+        });
+        if (!result.result)
+          return accumulator;
+        protocolIds.push(...getDepositPolicyIds({
+          self_deposit_policy_ids: bundleDepositData == null ? void 0 : bundleDepositData.self_deposit_policy_ids
+        }));
+        hasDeposit = true;
+        return accumulator.plus(result.depositTotal);
+      }, new import_decimal.default(0));
+    }
+  }
+  if (!hasDeposit)
+    return null;
+  const protocolIdSet = new Set(protocolIds);
+  const protocols = allProtocols.filter((protocol) => protocolIdSet.has(protocol.id));
+  return {
+    total: depositTotal.toNumber(),
+    protocols
+  };
+}
+function calculateOrderProductsDeposit(products = [], options) {
+  var _a, _b, _c;
+  const protocolMap = /* @__PURE__ */ new Map();
+  let total = new import_decimal.default(0);
+  let hasDeposit = false;
+  for (const product of products || []) {
+    const productUid = (_a = product.metadata) == null ? void 0 : _a.unique_identification_number;
+    const runtimeOrigin = productUid ? (_c = (_b = options == null ? void 0 : options.productsByUid) == null ? void 0 : _b[productUid]) == null ? void 0 : _c.origin : void 0;
+    const deposit = getOrderProductDeposit(product, runtimeOrigin);
+    product.deposit = deposit;
+    if (!(deposit == null ? void 0 : deposit.total) || Number(deposit.total) <= 0)
+      continue;
+    total = total.plus(deposit.total);
+    for (const discount of product.discount_list || []) {
+      total = total.minus((discount == null ? void 0 : discount.amount) || 0);
+    }
+    for (const protocol of deposit.protocols || []) {
+      if (!protocolMap.has(protocol.id))
+        protocolMap.set(protocol.id, protocol);
+    }
+    hasDeposit = true;
+  }
+  const roundedTotal = total.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
+  const protocols = [...protocolMap.values()];
+  return {
+    total: roundedTotal.toNumber(),
+    totalText: roundedTotal.toFixed(2),
+    protocols,
+    deposit_policy_ids: protocols.map((protocol) => protocol.id),
+    hasDeposit
+  };
+}
 function isMarkdownBundle(bundle) {
   if (!bundle || typeof bundle !== "object")
     return false;
@@ -985,6 +1155,7 @@ function indexOrderProductsByUid(products) {
 0 && (module.exports = {
   buildManualProductDiscountItem,
   buildSubmitPayload,
+  calculateOrderProductsDeposit,
   clearTempOrderHolderAssignments,
   composeLinePrice,
   createDefaultOrderRulesHooks,

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

@@ -1188,6 +1188,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       "status",
       "shipping_status",
       "updated_at",
+      "shop_discount",
       "summary",
       "payments",
       "products",

package/lib/server/modules/resource/index.d.ts

@@ -61,6 +61,8 @@ export declare class ResourceModule extends BaseModule implements Module {
      */
     clear(): Promise<void>;
     private attachBookingsToResource;
+    private normalizeIntegerIdValue;
+    private normalizeResourceIdFields;
     private normalizeResource;
     private safeEmit;
     private syncResourcesMap;

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

@@ -268,11 +268,35 @@ var ResourceModule = class extends import_BaseModule.BaseModule {
       bookings: this.getBookingsByResourceId(resource.id)
     };
   }
+  normalizeIntegerIdValue(value) {
+    if (typeof value !== "string")
+      return value;
+    const matched = value.match(/^(-?\d+)\.0+$/);
+    if (!matched)
+      return value;
+    return matched[1];
+  }
+  normalizeResourceIdFields(resource) {
+    resource.id = this.normalizeIntegerIdValue(resource.id);
+    if (resource.form_record_id !== void 0) {
+      resource.form_record_id = this.normalizeIntegerIdValue(resource.form_record_id);
+    }
+    if (resource.form_id !== void 0) {
+      resource.form_id = this.normalizeIntegerIdValue(resource.form_id);
+    }
+    if (resource.resource_form_id !== void 0) {
+      resource.resource_form_id = this.normalizeIntegerIdValue(resource.resource_form_id);
+    }
+    if (resource.resource_id !== void 0) {
+      resource.resource_id = this.normalizeIntegerIdValue(resource.resource_id);
+    }
+    return resource;
+  }
   normalizeResource(resource) {
-    const normalized = {
+    const normalized = this.normalizeResourceIdFields({
       ...resource,
-      id: (resource == null ? void 0 : resource.id) ?? (resource == null ? void 0 : resource.form_record_id) ?? ""
-    };
+      id: this.normalizeIntegerIdValue((resource == null ? void 0 : resource.id) ?? (resource == null ? void 0 : resource.form_record_id) ?? "")
+    });
     if (normalized.form_record_id === void 0 && normalized.id !== "") {
       normalized.form_record_id = normalized.id;
     }

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 6 | 5 | 4;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

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

package/package.json

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