@pisell/pisellos 2.2.249 → 2.2.251

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

@@ -429,7 +429,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     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

@@ -1224,9 +1224,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaymentEffectiveAmount",
     value: function calculatePaymentEffectiveAmount(payment) {
-      var amount = new Decimal(payment.amount || 0).minus(new Decimal(payment.service_fee || 0));
+      var _ref17, _payment$origin_amoun;
+      var amount = new Decimal(payment.amount || 0);
+      var originAmount = new Decimal((_ref17 = (_payment$origin_amoun = payment.origin_amount) !== null && _payment$origin_amoun !== void 0 ? _payment$origin_amoun : payment.amount) !== null && _ref17 !== void 0 ? _ref17 : 0);
+      var serviceFee = new Decimal(payment.service_fee || 0);
+      // TODO: 后端允许 amount 表示顾客实际支付总额后，移除这个兼容分支。
+      var effectiveAmount = serviceFee.gt(0) && amount.eq(originAmount) ? amount.plus(serviceFee) : amount;
       var rounding = new Decimal(payment.rounding_amount || 0);
-      return amount.minus(rounding);
+      return effectiveAmount.minus(rounding);
     }
   }, {
     key: "calculatePaymentTotal",
@@ -1312,7 +1317,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizePaymentSource",
     value: function normalizePaymentSource(payment, options) {
-      var _ref17, _paymentRecord$origin;
+      var _ref18, _paymentRecord$origin;
       var paymentRecord = payment;
       var metadata = paymentRecord.metadata && _typeof(paymentRecord.metadata) === 'object' ? _objectSpread({}, paymentRecord.metadata) : {};
       if (!metadata.unique_payment_number) {
@@ -1320,7 +1325,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var normalized = _objectSpread(_objectSpread({}, paymentRecord), {}, {
         metadata: metadata,
-        origin_amount: (_ref17 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref17 !== void 0 ? _ref17 : '0.00'
+        origin_amount: (_ref18 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref18 !== void 0 ? _ref18 : '0.00'
       });
       if (paymentRecord.status !== undefined) {
         normalized.status = paymentRecord.status;
@@ -1364,15 +1369,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (normalizedStatus !== 'refunded' && normalizedStatus !== 'partially_refunded') {
         return false;
       }
-      if (params.refundAmount.lte(0)) return false;
       if (params.previousSummary) {
         var previousTargetAmount = this.calculatePaymentTargetAmount(params.tempOrder, params.previousSummary, params.netPaymentTotal);
         if (!previousTargetAmount.eq(params.targetAmount)) return false;
       }
-      if (normalizedStatus === 'refunded') {
-        return params.refundAmount.gte(params.paymentTotal);
-      }
-      return params.netPaymentTotal.gte(params.targetAmount);
+      return true;
     }
   }, {
     key: "resolveWalletPassUseValue",
@@ -1654,7 +1655,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _product$payment_pric,
         _sku$code,
         _sku$barcode,
-        _ref18,
+        _ref19,
         _sku$variant_id,
         _this8 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
@@ -1681,24 +1682,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         product_sku: this.normalizeFingerprintValue({
           code: (_sku$code = sku.code) !== null && _sku$code !== void 0 ? _sku$code : '',
           barcode: (_sku$barcode = sku.barcode) !== null && _sku$barcode !== void 0 ? _sku$barcode : '',
-          variant_id: (_ref18 = (_sku$variant_id = sku.variant_id) !== null && _sku$variant_id !== void 0 ? _sku$variant_id : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref18 !== void 0 ? _ref18 : 0,
+          variant_id: (_ref19 = (_sku$variant_id = sku.variant_id) !== null && _sku$variant_id !== void 0 ? _sku$variant_id : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref19 !== void 0 ? _ref19 : 0,
           variant: sku.variant || [],
           option: getProductSkuOptions(product || {}).map(function (option) {
-            var _ref19, _option$id, _option$option_group_, _ref20, _option$option_group_2, _option$num, _option$add_price;
+            var _ref20, _option$id, _option$option_group_, _ref21, _option$option_group_2, _option$num, _option$add_price;
             return {
-              id: (_ref19 = (_option$id = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id !== void 0 ? _option$id : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref19 !== void 0 ? _ref19 : null,
+              id: (_ref20 = (_option$id = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id !== void 0 ? _option$id : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref20 !== void 0 ? _ref20 : null,
               option_group_id: (_option$option_group_ = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : null,
-              option_group_item_id: (_ref20 = (_option$option_group_2 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_2 !== void 0 ? _option$option_group_2 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref20 !== void 0 ? _ref20 : null,
+              option_group_item_id: (_ref21 = (_option$option_group_2 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_2 !== void 0 ? _option$option_group_2 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref21 !== void 0 ? _ref21 : null,
               num: Number((_option$num = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num !== void 0 ? _option$num : 1) || 1,
               add_price: _this8.normalizeFingerprintMoney((_option$add_price = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price !== void 0 ? _option$add_price : option === null || option === void 0 ? void 0 : option.price)
             };
           })
         }),
         product_bundle: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.product_bundle) || []).map(function (bundle) {
-          var _ref21, _ref22, _bundle$bundle_produc, _ref23, _bundle$bundle_varian, _bundle$num, _bundle$price_type, _bundle$price_type_ex;
+          var _ref22, _ref23, _bundle$bundle_produc, _ref24, _bundle$bundle_varian, _bundle$num, _bundle$price_type, _bundle$price_type_ex;
           return {
-            bundle_product_id: (_ref21 = (_ref22 = (_bundle$bundle_produc = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref22 !== void 0 ? _ref22 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref21 !== void 0 ? _ref21 : null,
-            bundle_variant_id: (_ref23 = (_bundle$bundle_varian = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref23 !== void 0 ? _ref23 : 0,
+            bundle_product_id: (_ref22 = (_ref23 = (_bundle$bundle_produc = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref23 !== void 0 ? _ref23 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref22 !== void 0 ? _ref22 : null,
+            bundle_variant_id: (_ref24 = (_bundle$bundle_varian = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref24 !== void 0 ? _ref24 : 0,
             num: getSafeProductNum((_bundle$num = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle === null || bundle === void 0 ? void 0 : bundle.quantity),
             price: _this8.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.price),
             bundle_selling_price: _this8.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price),
@@ -1707,10 +1708,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           };
         })),
         discount_list: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
-          var _ref24, _discount$type2, _ref25, _ref26, _discount$discount_id, _discount$discount;
+          var _ref25, _discount$type2, _ref26, _ref27, _discount$discount_id, _discount$discount;
           return {
-            type: (_ref24 = (_discount$type2 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type2 !== void 0 ? _discount$type2 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref24 !== void 0 ? _ref24 : '',
-            discount_id: (_ref25 = (_ref26 = (_discount$discount_id = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id !== void 0 ? _discount$discount_id : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref26 !== void 0 ? _ref26 : discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _ref25 !== void 0 ? _ref25 : null,
+            type: (_ref25 = (_discount$type2 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type2 !== void 0 ? _discount$type2 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref25 !== void 0 ? _ref25 : '',
+            discount_id: (_ref26 = (_ref27 = (_discount$discount_id = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id !== void 0 ? _discount$discount_id : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref27 !== void 0 ? _ref27 : discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _ref26 !== void 0 ? _ref26 : null,
             amount: _this8.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
@@ -1734,14 +1735,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _product$product_id3,
         _product$product_vari2,
         _product$num2,
-        _ref27,
+        _ref28,
         _metadata$unique_iden,
         _metadata$price_overr,
         _metadata$is_manual_d,
         _metadata$product_dis,
         _sku$code2,
         _sku$barcode2,
-        _ref28,
+        _ref29,
         _sku$variant_id2,
         _this10 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
@@ -1757,7 +1758,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         extension_type: extensionType,
         num: getSafeProductNum((_product$num2 = product === null || product === void 0 ? void 0 : product.num) !== null && _product$num2 !== void 0 ? _product$num2 : product === null || product === void 0 ? void 0 : product.product_quantity),
         metadata: {
-          unique_identification_number: (_ref27 = (_metadata$unique_iden = metadata.unique_identification_number) !== null && _metadata$unique_iden !== void 0 ? _metadata$unique_iden : product === null || product === void 0 ? void 0 : product.unique_identification_number) !== null && _ref27 !== void 0 ? _ref27 : '',
+          unique_identification_number: (_ref28 = (_metadata$unique_iden = metadata.unique_identification_number) !== null && _metadata$unique_iden !== void 0 ? _metadata$unique_iden : product === null || product === void 0 ? void 0 : product.unique_identification_number) !== null && _ref28 !== void 0 ? _ref28 : '',
           price_override: (_metadata$price_overr = metadata.price_override) !== null && _metadata$price_overr !== void 0 ? _metadata$price_overr : '',
           is_manual_discount: (_metadata$is_manual_d = metadata.is_manual_discount) !== null && _metadata$is_manual_d !== void 0 ? _metadata$is_manual_d : '',
           product_discount_reason: (_metadata$product_dis = metadata.product_discount_reason) !== null && _metadata$product_dis !== void 0 ? _metadata$product_dis : ''
@@ -1765,35 +1766,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         product_sku: this.normalizeFingerprintValue({
           code: (_sku$code2 = sku.code) !== null && _sku$code2 !== void 0 ? _sku$code2 : '',
           barcode: (_sku$barcode2 = sku.barcode) !== null && _sku$barcode2 !== void 0 ? _sku$barcode2 : '',
-          variant_id: (_ref28 = (_sku$variant_id2 = sku.variant_id) !== null && _sku$variant_id2 !== void 0 ? _sku$variant_id2 : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref28 !== void 0 ? _ref28 : 0,
+          variant_id: (_ref29 = (_sku$variant_id2 = sku.variant_id) !== null && _sku$variant_id2 !== void 0 ? _sku$variant_id2 : product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _ref29 !== void 0 ? _ref29 : 0,
           variant: sku.variant || [],
           option: getProductSkuOptions(product || {}).map(function (option) {
-            var _ref29, _option$id2, _option$option_group_3, _ref30, _option$option_group_4, _option$num2, _option$add_price2;
+            var _ref30, _option$id2, _option$option_group_3, _ref31, _option$option_group_4, _option$num2, _option$add_price2;
             return {
-              id: (_ref29 = (_option$id2 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id2 !== void 0 ? _option$id2 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref29 !== void 0 ? _ref29 : null,
+              id: (_ref30 = (_option$id2 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id2 !== void 0 ? _option$id2 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref30 !== void 0 ? _ref30 : null,
               option_group_id: (_option$option_group_3 = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_3 !== void 0 ? _option$option_group_3 : null,
-              option_group_item_id: (_ref30 = (_option$option_group_4 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_4 !== void 0 ? _option$option_group_4 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref30 !== void 0 ? _ref30 : null,
+              option_group_item_id: (_ref31 = (_option$option_group_4 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_4 !== void 0 ? _option$option_group_4 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref31 !== void 0 ? _ref31 : null,
               num: Number((_option$num2 = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num2 !== void 0 ? _option$num2 : 1) || 1,
               add_price: _this10.normalizeFingerprintMoney((_option$add_price2 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price2 !== void 0 ? _option$add_price2 : option === null || option === void 0 ? void 0 : option.price)
             };
           })
         }),
         product_bundle: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.product_bundle) || []).map(function (bundle) {
-          var _ref31, _bundle$bundle_id, _ref32, _bundle$bundle_group_, _ref33, _ref34, _bundle$bundle_produc2, _ref35, _bundle$bundle_varian2, _bundle$num2, _bundle$price_type2, _bundle$price_type_ex2;
+          var _ref32, _bundle$bundle_id, _ref33, _bundle$bundle_group_, _ref34, _ref35, _bundle$bundle_produc2, _ref36, _bundle$bundle_varian2, _bundle$num2, _bundle$price_type2, _bundle$price_type_ex2;
           return {
-            bundle_id: (_ref31 = (_bundle$bundle_id = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle === null || bundle === void 0 ? void 0 : bundle.id) !== null && _ref31 !== void 0 ? _ref31 : null,
-            bundle_group_id: (_ref32 = (_bundle$bundle_group_ = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle === null || bundle === void 0 ? void 0 : bundle.group_id) !== null && _ref32 !== void 0 ? _ref32 : null,
-            bundle_product_id: (_ref33 = (_ref34 = (_bundle$bundle_produc2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref34 !== void 0 ? _ref34 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref33 !== void 0 ? _ref33 : null,
-            bundle_variant_id: (_ref35 = (_bundle$bundle_varian2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian2 !== void 0 ? _bundle$bundle_varian2 : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref35 !== void 0 ? _ref35 : 0,
+            bundle_id: (_ref32 = (_bundle$bundle_id = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_id) !== null && _bundle$bundle_id !== void 0 ? _bundle$bundle_id : bundle === null || bundle === void 0 ? void 0 : bundle.id) !== null && _ref32 !== void 0 ? _ref32 : null,
+            bundle_group_id: (_ref33 = (_bundle$bundle_group_ = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle === null || bundle === void 0 ? void 0 : bundle.group_id) !== null && _ref33 !== void 0 ? _ref33 : null,
+            bundle_product_id: (_ref34 = (_ref35 = (_bundle$bundle_produc2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle === null || bundle === void 0 ? void 0 : bundle._bundle_product_id) !== null && _ref35 !== void 0 ? _ref35 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref34 !== void 0 ? _ref34 : null,
+            bundle_variant_id: (_ref36 = (_bundle$bundle_varian2 = bundle === null || bundle === void 0 ? void 0 : bundle.bundle_variant_id) !== null && _bundle$bundle_varian2 !== void 0 ? _bundle$bundle_varian2 : bundle === null || bundle === void 0 ? void 0 : bundle.product_variant_id) !== null && _ref36 !== void 0 ? _ref36 : 0,
             num: getSafeProductNum((_bundle$num2 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num2 !== void 0 ? _bundle$num2 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity),
             price_type: (_bundle$price_type2 = bundle === null || bundle === void 0 ? void 0 : bundle.price_type) !== null && _bundle$price_type2 !== void 0 ? _bundle$price_type2 : '',
             price_type_ext: (_bundle$price_type_ex2 = bundle === null || bundle === void 0 ? void 0 : bundle.price_type_ext) !== null && _bundle$price_type_ex2 !== void 0 ? _bundle$price_type_ex2 : '',
             option: _this10.normalizeFingerprintValue(((bundle === null || bundle === void 0 ? void 0 : bundle.option) || []).map(function (option) {
-              var _ref36, _option$id3, _option$option_group_5, _ref37, _option$option_group_6, _option$num3, _option$add_price3;
+              var _ref37, _option$id3, _option$option_group_5, _ref38, _option$option_group_6, _option$num3, _option$add_price3;
               return {
-                id: (_ref36 = (_option$id3 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id3 !== void 0 ? _option$id3 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref36 !== void 0 ? _ref36 : null,
+                id: (_ref37 = (_option$id3 = option === null || option === void 0 ? void 0 : option.id) !== null && _option$id3 !== void 0 ? _option$id3 : option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _ref37 !== void 0 ? _ref37 : null,
                 option_group_id: (_option$option_group_5 = option === null || option === void 0 ? void 0 : option.option_group_id) !== null && _option$option_group_5 !== void 0 ? _option$option_group_5 : null,
-                option_group_item_id: (_ref37 = (_option$option_group_6 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_6 !== void 0 ? _option$option_group_6 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref37 !== void 0 ? _ref37 : null,
+                option_group_item_id: (_ref38 = (_option$option_group_6 = option === null || option === void 0 ? void 0 : option.option_group_item_id) !== null && _option$option_group_6 !== void 0 ? _option$option_group_6 : option === null || option === void 0 ? void 0 : option.id) !== null && _ref38 !== void 0 ? _ref38 : null,
                 num: Number((_option$num3 = option === null || option === void 0 ? void 0 : option.num) !== null && _option$num3 !== void 0 ? _option$num3 : 1) || 1,
                 add_price: _this10.normalizeFingerprintMoney((_option$add_price3 = option === null || option === void 0 ? void 0 : option.add_price) !== null && _option$add_price3 !== void 0 ? _option$add_price3 : option === null || option === void 0 ? void 0 : option.price)
               };
@@ -1801,10 +1802,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           };
         })),
         discount_list: this.normalizeFingerprintValue(((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
-          var _ref38, _discount$type4, _ref39, _ref40, _discount$discount_id2, _discount$discount2;
+          var _ref39, _discount$type4, _ref40, _ref41, _discount$discount_id2, _discount$discount2;
           return {
-            type: (_ref38 = (_discount$type4 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type4 !== void 0 ? _discount$type4 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref38 !== void 0 ? _ref38 : '',
-            discount_id: (_ref39 = (_ref40 = (_discount$discount_id2 = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id2 !== void 0 ? _discount$discount_id2 : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref40 !== void 0 ? _ref40 : discount === null || discount === void 0 || (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) !== null && _ref39 !== void 0 ? _ref39 : null,
+            type: (_ref39 = (_discount$type4 = discount === null || discount === void 0 ? void 0 : discount.type) !== null && _discount$type4 !== void 0 ? _discount$type4 : discount === null || discount === void 0 ? void 0 : discount.tag) !== null && _ref39 !== void 0 ? _ref39 : '',
+            discount_id: (_ref40 = (_ref41 = (_discount$discount_id2 = discount === null || discount === void 0 ? void 0 : discount.discount_id) !== null && _discount$discount_id2 !== void 0 ? _discount$discount_id2 : discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null && _ref41 !== void 0 ? _ref41 : discount === null || discount === void 0 || (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) !== null && _ref40 !== void 0 ? _ref40 : null,
             amount: _this10.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
@@ -2084,11 +2085,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderIdentity",
     value: function getOrderIdentity() {
-      var _ref41, _ref42, _tempOrder$order_id, _tempOrder$_extend6;
+      var _ref42, _ref43, _tempOrder$order_id, _tempOrder$_extend6;
       var tempOrder = this.store.tempOrder;
       if (!tempOrder) return null;
       var lastOrderInfo = this.store.lastOrderInfo || {};
-      var orderId = (_ref41 = (_ref42 = (_tempOrder$order_id = tempOrder.order_id) !== null && _tempOrder$order_id !== void 0 ? _tempOrder$order_id : lastOrderInfo.order_id) !== null && _ref42 !== void 0 ? _ref42 : lastOrderInfo.id) !== null && _ref41 !== void 0 ? _ref41 : null;
+      var orderId = (_ref42 = (_ref43 = (_tempOrder$order_id = tempOrder.order_id) !== null && _tempOrder$order_id !== void 0 ? _tempOrder$order_id : lastOrderInfo.order_id) !== null && _ref43 !== void 0 ? _ref43 : lastOrderInfo.id) !== null && _ref42 !== void 0 ? _ref42 : null;
       return {
         localId: this.cacheId || ((_tempOrder$_extend6 = tempOrder._extend) === null || _tempOrder$_extend6 === void 0 ? void 0 : _tempOrder$_extend6.localId),
         orderId: orderId,
@@ -2241,11 +2242,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "captureProductRuntime",
     value: function captureProductRuntime(tempOrder, rawProduct, normalizedProduct, existedUid) {
-      var _extend$productsByUid, _ref43, _rawProduct$_origin;
+      var _extend$productsByUid, _ref44, _rawProduct$_origin;
       var uid = existedUid || this.getProductUid(normalizedProduct);
       var extend = this.ensureExtend(tempOrder);
       var existed = ((_extend$productsByUid = extend.productsByUid) === null || _extend$productsByUid === void 0 ? void 0 : _extend$productsByUid[uid]) || {};
-      var origin = (_ref43 = (_rawProduct$_origin = rawProduct._origin) !== null && _rawProduct$_origin !== void 0 ? _rawProduct$_origin : normalizedProduct._origin) !== null && _ref43 !== void 0 ? _ref43 : existed.origin;
+      var origin = (_ref44 = (_rawProduct$_origin = rawProduct._origin) !== null && _rawProduct$_origin !== void 0 ? _rawProduct$_origin : normalizedProduct._origin) !== null && _ref44 !== void 0 ? _ref44 : existed.origin;
       extend.productsByUid[uid] = _objectSpread(_objectSpread({}, existed), origin !== undefined ? {
         origin: origin
       } : {});
@@ -2346,7 +2347,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildTempOrderHolderFromBookings",
     value: function buildTempOrderHolderFromBookings(tempOrder) {
-      var _baseHolder$customer_, _baseHolder, _ref44, _baseHolder$form_id, _baseHolder2, _tempOrder$holder5, _baseHolder3, _this$otherParams;
+      var _baseHolder$customer_, _baseHolder, _ref45, _baseHolder$form_id, _baseHolder2, _tempOrder$holder5, _baseHolder3, _this$otherParams;
       var holderRecords = [];
       var holderNames = [];
       var baseHolder = null;
@@ -2393,7 +2394,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var nextHolder = {
         customer_id: (_baseHolder$customer_ = (_baseHolder = baseHolder) === null || _baseHolder === void 0 ? void 0 : _baseHolder.customer_id) !== null && _baseHolder$customer_ !== void 0 ? _baseHolder$customer_ : tempOrder.customer_id,
-        form_id: (_ref44 = (_baseHolder$form_id = (_baseHolder2 = baseHolder) === null || _baseHolder2 === void 0 ? void 0 : _baseHolder2.form_id) !== null && _baseHolder$form_id !== void 0 ? _baseHolder$form_id : (_tempOrder$holder5 = tempOrder.holder) === null || _tempOrder$holder5 === void 0 ? void 0 : _tempOrder$holder5.form_id) !== null && _ref44 !== void 0 ? _ref44 : 0,
+        form_id: (_ref45 = (_baseHolder$form_id = (_baseHolder2 = baseHolder) === null || _baseHolder2 === void 0 ? void 0 : _baseHolder2.form_id) !== null && _baseHolder$form_id !== void 0 ? _baseHolder$form_id : (_tempOrder$holder5 = tempOrder.holder) === null || _tempOrder$holder5 === void 0 ? void 0 : _tempOrder$holder5.form_id) !== null && _ref45 !== void 0 ? _ref45 : 0,
         form_record: holderRecords
       };
       if (holderNames.length) {
@@ -2496,7 +2497,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "recalculateSummary",
     value: function () {
       var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(options) {
-        var _ref45, _salesSummaryResult$e;
+        var _ref46, _salesSummaryResult$e;
         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 _callee11$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
@@ -2569,7 +2570,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               roundingAmount = paidPaymentSummary.roundingAmount;
               payServiceChargeAmount = paidPaymentSummary.payServiceChargeAmount;
               hasSalesSummaryAmount = salesSummaryResult.expect_amount !== undefined || salesSummaryResult.total_amount !== undefined;
-              expectAmount = hasSalesSummaryAmount ? new Decimal((_ref45 = (_salesSummaryResult$e = salesSummaryResult.expect_amount) !== null && _salesSummaryResult$e !== void 0 ? _salesSummaryResult$e : salesSummaryResult.total_amount) !== null && _ref45 !== void 0 ? _ref45 : 0) : null;
+              expectAmount = hasSalesSummaryAmount ? new Decimal((_ref46 = (_salesSummaryResult$e = salesSummaryResult.expect_amount) !== null && _salesSummaryResult$e !== void 0 ? _salesSummaryResult$e : salesSummaryResult.total_amount) !== null && _ref46 !== void 0 ? _ref46 : 0) : null;
               amountPaymentPatch = hasSalesSummaryAmount || !roundingAmount.eq(0) || !payServiceChargeAmount.eq(0) ? _objectSpread({
                 rounding_amount: roundingAmount.toFixed(2)
               }, expectAmount ? {
@@ -2747,17 +2748,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildTempOrderCustomer",
     value: function buildTempOrderCustomer(params) {
-      var _ref46, _ref47, _ref48, _source$name, _ref49, _ref50, _ref51, _source$customer_name, _source$id, _source$customer_id, _ref52, _source$country_calli, _source$phone, _source$email;
+      var _ref47, _ref48, _ref49, _source$name, _ref50, _ref51, _ref52, _source$customer_name, _source$id, _source$customer_id, _ref53, _source$country_calli, _source$phone, _source$email;
       if (!params.customerId) return null;
       var source = params.source ? cloneDeep(params.source) : {};
-      var name = (_ref46 = (_ref47 = (_ref48 = (_source$name = source.name) !== null && _source$name !== void 0 ? _source$name : source.display_name) !== null && _ref48 !== void 0 ? _ref48 : source.customerName) !== null && _ref47 !== void 0 ? _ref47 : source.customer_name) !== null && _ref46 !== void 0 ? _ref46 : params.customerName;
-      var customerName = (_ref49 = (_ref50 = (_ref51 = (_source$customer_name = source.customer_name) !== null && _source$customer_name !== void 0 ? _source$customer_name : source.customerName) !== null && _ref51 !== void 0 ? _ref51 : source.display_name) !== null && _ref50 !== void 0 ? _ref50 : source.name) !== null && _ref49 !== void 0 ? _ref49 : params.customerName;
+      var name = (_ref47 = (_ref48 = (_ref49 = (_source$name = source.name) !== null && _source$name !== void 0 ? _source$name : source.display_name) !== null && _ref49 !== void 0 ? _ref49 : source.customerName) !== null && _ref48 !== void 0 ? _ref48 : source.customer_name) !== null && _ref47 !== void 0 ? _ref47 : params.customerName;
+      var customerName = (_ref50 = (_ref51 = (_ref52 = (_source$customer_name = source.customer_name) !== null && _source$customer_name !== void 0 ? _source$customer_name : source.customerName) !== null && _ref52 !== void 0 ? _ref52 : source.display_name) !== null && _ref51 !== void 0 ? _ref51 : source.name) !== null && _ref50 !== void 0 ? _ref50 : params.customerName;
       return _objectSpread(_objectSpread({}, source), {}, {
         id: (_source$id = source.id) !== null && _source$id !== void 0 ? _source$id : params.customerId,
         customer_id: (_source$customer_id = source.customer_id) !== null && _source$customer_id !== void 0 ? _source$customer_id : params.customerId,
         name: String(name || ''),
         customer_name: String(customerName || ''),
-        country_calling_code: String((_ref52 = (_source$country_calli = source.country_calling_code) !== null && _source$country_calli !== void 0 ? _source$country_calli : source.countryCallingCode) !== null && _ref52 !== void 0 ? _ref52 : params.countryCallingCode),
+        country_calling_code: String((_ref53 = (_source$country_calli = source.country_calling_code) !== null && _source$country_calli !== void 0 ? _source$country_calli : source.countryCallingCode) !== null && _ref53 !== void 0 ? _ref53 : params.countryCallingCode),
         phone: String((_source$phone = source.phone) !== null && _source$phone !== void 0 ? _source$phone : params.phone),
         email: String((_source$email = source.email) !== null && _source$email !== void 0 ? _source$email : params.email)
       });
@@ -2856,14 +2857,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateTempOrderCustomer",
     value: function updateTempOrderCustomer(customer) {
-      var _tempOrder$customer_i2, _ref53, _ref54, _customer$customer_id, _ref55, _ref56, _ref57, _customer$customer_na, _ref58, _customer$country_cal, _tempOrder$customer_i3;
+      var _tempOrder$customer_i2, _ref54, _ref55, _customer$customer_id, _ref56, _ref57, _ref58, _customer$customer_na, _ref59, _customer$country_cal, _tempOrder$customer_i3;
       var tempOrder = this.ensureTempOrder();
       var previousCustomerId = (_tempOrder$customer_i2 = tempOrder.customer_id) !== null && _tempOrder$customer_i2 !== void 0 ? _tempOrder$customer_i2 : null;
-      var customerId = (_ref53 = (_ref54 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref54 !== void 0 ? _ref54 : customer.id) !== null && _ref53 !== void 0 ? _ref53 : null;
-      var customerName = (_ref55 = (_ref56 = (_ref57 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref57 !== void 0 ? _ref57 : customer.display_name) !== null && _ref56 !== void 0 ? _ref56 : customer.name) !== null && _ref55 !== void 0 ? _ref55 : '';
+      var customerId = (_ref54 = (_ref55 = (_customer$customer_id = customer.customer_id) !== null && _customer$customer_id !== void 0 ? _customer$customer_id : customer.customerId) !== null && _ref55 !== void 0 ? _ref55 : customer.id) !== null && _ref54 !== void 0 ? _ref54 : null;
+      var customerName = (_ref56 = (_ref57 = (_ref58 = (_customer$customer_na = customer.customer_name) !== null && _customer$customer_na !== void 0 ? _customer$customer_na : customer.customerName) !== null && _ref58 !== void 0 ? _ref58 : customer.display_name) !== null && _ref57 !== void 0 ? _ref57 : customer.name) !== null && _ref56 !== void 0 ? _ref56 : '';
       tempOrder.customer_id = customerId === null || customerId === undefined || customerId === '' ? null : Number(customerId);
       tempOrder.customer_name = String(customerName || '');
-      tempOrder.country_calling_code = String((_ref58 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref58 !== void 0 ? _ref58 : '');
+      tempOrder.country_calling_code = String((_ref59 = (_customer$country_cal = customer.country_calling_code) !== null && _customer$country_cal !== void 0 ? _customer$country_cal : customer.countryCallingCode) !== null && _ref59 !== void 0 ? _ref59 : '');
       tempOrder.phone = String(customer.phone || '');
       tempOrder.email = String(customer.email || '');
       tempOrder.customer = this.buildTempOrderCustomer({
@@ -3408,50 +3409,51 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "addProductToOrder",
     value: (function () {
       var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(product, booking) {
-        var tempOrder, _ref59, _productRecord$num, productRecord, splitCount, i, singleLine;
+        var tempOrder, _ref60, _productRecord$num, productRecord, splitCount, i, singleLine;
         return _regeneratorRuntime().wrap(function _callee17$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
+              debugger;
               if (!booking) {
-                _context19.next = 18;
+                _context19.next = 19;
                 break;
               }
               productRecord = product;
-              splitCount = getSafeProductNum((_ref59 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref59 !== void 0 ? _ref59 : 1);
+              splitCount = getSafeProductNum((_ref60 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref60 !== void 0 ? _ref60 : 1);
               if (!(splitCount > 1)) {
-                _context19.next = 18;
+                _context19.next = 19;
                 break;
               }
               i = 0;
-            case 6:
+            case 7:
               if (!(i < splitCount)) {
-                _context19.next = 15;
+                _context19.next = 16;
                 break;
               }
               singleLine = cloneDeep(productRecord);
               singleLine.num = 1;
               delete singleLine.product_quantity;
-              _context19.next = 12;
+              _context19.next = 13;
               return this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking));
-            case 12:
+            case 13:
               i += 1;
-              _context19.next = 6;
+              _context19.next = 7;
               break;
-            case 15:
-              _context19.next = 17;
+            case 16:
+              _context19.next = 18;
               return this.finalizeProductOrderMutation(tempOrder);
-            case 17:
-              return _context19.abrupt("return", tempOrder.products);
             case 18:
-              _context19.next = 20;
+              return _context19.abrupt("return", tempOrder.products);
+            case 19:
+              _context19.next = 21;
               return this.appendProductLineToTempOrder(tempOrder, product, booking);
-            case 20:
-              _context19.next = 22;
+            case 21:
+              _context19.next = 23;
               return this.finalizeProductOrderMutation(tempOrder);
-            case 22:
-              return _context19.abrupt("return", tempOrder.products);
             case 23:
+              return _context19.abrupt("return", tempOrder.products);
+            case 24:
             case "end":
               return _context19.stop();
           }
@@ -3476,7 +3478,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "addProductsToOrder",
     value: (function () {
       var _addProductsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(items, options) {
-        var tempOrder, _iterator20, _step20, item, product, booking, _ref60, _productRecord$num2, productRecord, splitCount, i, singleLine;
+        var tempOrder, _iterator20, _step20, item, product, booking, _ref61, _productRecord$num2, productRecord, splitCount, i, singleLine;
         return _regeneratorRuntime().wrap(function _callee18$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
@@ -3508,7 +3510,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               productRecord = product;
-              splitCount = getSafeProductNum((_ref60 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref60 !== void 0 ? _ref60 : 1);
+              splitCount = getSafeProductNum((_ref61 = (_productRecord$num2 = productRecord.num) !== null && _productRecord$num2 !== void 0 ? _productRecord$num2 : productRecord.product_quantity) !== null && _ref61 !== void 0 ? _ref61 : 1);
               if (!(splitCount > 1)) {
                 _context20.next = 26;
                 break;
@@ -3585,9 +3587,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getBundleRuntimeIdentity",
     value: function getBundleRuntimeIdentity(bundle) {
-      var _ref61, _bundle$bundle_id2, _ref62, _bundle$bundle_group_2, _ref63, _ref64, _bundle$bundle_produc3, _ref65, _bundle$bundle_varian3;
+      var _ref62, _bundle$bundle_id2, _ref63, _bundle$bundle_group_2, _ref64, _ref65, _bundle$bundle_produc3, _ref66, _bundle$bundle_varian3;
       if (!bundle || _typeof(bundle) !== 'object') return '';
-      return [(_ref61 = (_bundle$bundle_id2 = bundle.bundle_id) !== null && _bundle$bundle_id2 !== void 0 ? _bundle$bundle_id2 : bundle.id) !== null && _ref61 !== void 0 ? _ref61 : '', (_ref62 = (_bundle$bundle_group_2 = bundle.bundle_group_id) !== null && _bundle$bundle_group_2 !== void 0 ? _bundle$bundle_group_2 : bundle.group_id) !== null && _ref62 !== void 0 ? _ref62 : '', (_ref63 = (_ref64 = (_bundle$bundle_produc3 = bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle._bundle_product_id) !== null && _ref64 !== void 0 ? _ref64 : bundle.product_id) !== null && _ref63 !== void 0 ? _ref63 : '', (_ref65 = (_bundle$bundle_varian3 = bundle.bundle_variant_id) !== null && _bundle$bundle_varian3 !== void 0 ? _bundle$bundle_varian3 : bundle.product_variant_id) !== null && _ref65 !== void 0 ? _ref65 : 0].join('|');
+      return [(_ref62 = (_bundle$bundle_id2 = bundle.bundle_id) !== null && _bundle$bundle_id2 !== void 0 ? _bundle$bundle_id2 : bundle.id) !== null && _ref62 !== void 0 ? _ref62 : '', (_ref63 = (_bundle$bundle_group_2 = bundle.bundle_group_id) !== null && _bundle$bundle_group_2 !== void 0 ? _bundle$bundle_group_2 : bundle.group_id) !== null && _ref63 !== void 0 ? _ref63 : '', (_ref64 = (_ref65 = (_bundle$bundle_produc3 = bundle.bundle_product_id) !== null && _bundle$bundle_produc3 !== void 0 ? _bundle$bundle_produc3 : bundle._bundle_product_id) !== null && _ref65 !== void 0 ? _ref65 : bundle.product_id) !== null && _ref64 !== void 0 ? _ref64 : '', (_ref66 = (_bundle$bundle_varian3 = bundle.bundle_variant_id) !== null && _bundle$bundle_varian3 !== void 0 ? _bundle$bundle_varian3 : bundle.product_variant_id) !== null && _ref66 !== void 0 ? _ref66 : 0].join('|');
     }
   }, {
     key: "preservePersistedBundlePriceFields",
@@ -4104,23 +4106,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildCurrentSubmitPayloadForLocalPrint",
     value: function buildCurrentSubmitPayloadForLocalPrint(params) {
-      var _params$cacheId, _this$otherParams2, _ref66, _params$businessCode, _this$otherParams3, _this$otherParams4;
+      var _params$cacheId, _this$otherParams2, _ref67, _params$businessCode, _this$otherParams3, _this$otherParams4;
       var tempOrder = this.ensureTempOrder();
       this.persistTempOrder();
       var payload = buildSubmitPayload({
         tempOrder: tempOrder,
         cacheId: (_params$cacheId = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId !== void 0 ? _params$cacheId : this.cacheId,
         platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.platform),
-        businessCode: (_ref66 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.businessCode) !== null && _ref66 !== void 0 ? _ref66 : (_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.business_code,
+        businessCode: (_ref67 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.businessCode) !== null && _ref67 !== void 0 ? _ref67 : (_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.business_code,
         channel: params === null || params === void 0 ? void 0 : params.channel,
         type: params === null || params === void 0 ? void 0 : params.type,
         summary: this.store.summary || createEmptySummary(),
         enhance: function enhance(nextPayload) {
-          var _ref67, _tempOrder$order_numb, _ref68, _tempOrder$shop_order, _ref69, _tempOrder$shop_full_;
+          var _ref68, _tempOrder$order_numb, _ref69, _tempOrder$shop_order, _ref70, _tempOrder$shop_full_;
           return _objectSpread(_objectSpread({}, nextPayload), {}, {
-            order_number: (_ref67 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref67 !== void 0 ? _ref67 : null,
-            shop_order_number: (_ref68 = (_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : nextPayload.shop_order_number) !== null && _ref68 !== void 0 ? _ref68 : null,
-            shop_full_order_number: (_ref69 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref69 !== void 0 ? _ref69 : null,
+            order_number: (_ref68 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref68 !== void 0 ? _ref68 : null,
+            shop_order_number: (_ref69 = (_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : nextPayload.shop_order_number) !== null && _ref69 !== void 0 ? _ref69 : null,
+            shop_full_order_number: (_ref70 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref70 !== void 0 ? _ref70 : null,
             small_ticket_data_flag: 1
           });
         }
@@ -4217,7 +4219,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "runSubmitTempOrder",
     value: function () {
       var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(params) {
-        var _params$cacheId2, _this$otherParams5, _ref70, _params$businessCode2, _this$otherParams6, _this$otherParams7;
+        var _params$cacheId2, _this$otherParams5, _ref71, _params$businessCode2, _this$otherParams6, _this$otherParams7;
         var tempOrder, latestSummary, effectiveCacheId, hasPaymentOverride, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
         return _regeneratorRuntime().wrap(function _callee28$(_context31) {
           while (1) switch (_context31.prev = _context31.next) {
@@ -4263,7 +4265,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
                 platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.platform),
-                businessCode: (_ref70 = (_params$businessCode2 = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode2 !== void 0 ? _params$businessCode2 : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) !== null && _ref70 !== void 0 ? _ref70 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.business_code,
+                businessCode: (_ref71 = (_params$businessCode2 = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode2 !== void 0 ? _params$businessCode2 : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) !== null && _ref71 !== void 0 ? _ref71 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
                 type: params === null || params === void 0 ? void 0 : params.type,
                 summary: latestSummary,
@@ -5063,6 +5065,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function normalizeTempOrderForRuntime(raw, options) {
       var _this24 = this;
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), raw || {});
+      // ES 列表详情使用 id 表示订单主键；OS 详情态统一依赖 order_id 驱动操作按钮。
+      if ((nextTempOrder.order_id === undefined || nextTempOrder.order_id === null) && (raw === null || raw === void 0 ? void 0 : raw.id) !== undefined && (raw === null || raw === void 0 ? void 0 : raw.id) !== null) {
+        nextTempOrder.order_id = raw.id;
+      }
       delete nextTempOrder.summary;
       delete nextTempOrder.lastOrderInfo;
       delete nextTempOrder.discount_list;
@@ -5112,7 +5118,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step22;
       try {
         for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-          var _product$metadata8, _ref71, _ref72, _existed$origin, _rawProduct$metadata;
+          var _product$metadata8, _ref72, _ref73, _existed$origin, _rawProduct$metadata;
           var _step22$value = _slicedToArray(_step22.value, 2),
             index = _step22$value[0],
             product = _step22$value[1];
@@ -5120,7 +5126,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           if (!uid) continue;
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
           var rawProduct = rawProducts[index] && _typeof(rawProducts[index]) === 'object' ? rawProducts[index] : product;
-          var origin = (_ref71 = (_ref72 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref72 !== void 0 ? _ref72 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref71 !== void 0 ? _ref71 : rawProduct;
+          var origin = (_ref72 = (_ref73 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref73 !== void 0 ? _ref73 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref72 !== void 0 ? _ref72 : rawProduct;
           var originSnapshot = cloneDeep(origin);
           var productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
           if (productOptionString && originSnapshot && _typeof(originSnapshot) === 'object') {
@@ -5230,10 +5236,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
-      var _ref73, _optionItem$num, _ref74, _optionItem$add_price;
-      var rawNum = (_ref73 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref73 !== void 0 ? _ref73 : 1;
+      var _ref74, _optionItem$num, _ref75, _optionItem$add_price;
+      var rawNum = (_ref74 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref74 !== void 0 ? _ref74 : 1;
       var parsedNum = Number(rawNum);
-      var rawPrice = (_ref74 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref74 !== void 0 ? _ref74 : 0;
+      var rawPrice = (_ref75 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref75 !== void 0 ? _ref75 : 0;
       var parsedPrice = Number(rawPrice);
       var normalized = _objectSpread(_objectSpread({}, optionItem), {}, {
         option_group_item_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id,
@@ -5360,10 +5366,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             _step27;
           try {
             for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
-              var _ref75, _bundle$num3;
+              var _ref76, _bundle$num3;
               var bundle = _step27.value;
               var isPersistedBundleProduct = isPersistedProduct || Boolean((bundle === null || bundle === void 0 ? void 0 : bundle.order_detail_id) || (bundle === null || bundle === void 0 ? void 0 : bundle.orderDetailId) || (bundle === null || bundle === void 0 ? void 0 : bundle.booking_id));
-              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref75 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref75 !== void 0 ? _ref75 : 1) || 1).toNumber();
+              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref76 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref76 !== void 0 ? _ref76 : 1) || 1).toNumber();
               var _iterator28 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
                 _step28;
               try {

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

@@ -518,6 +518,11 @@ export interface LoadSalesDetailParams {
     orderNumber?: string;
     externalSaleNumber?: string;
     external_sale_number?: string;
+    /**
+     * 已由调用方查询到的销售详情记录。
+     * 存在时 loadSalesDetail 会跳过远端 lookup，直接复用 hydrate 后半段逻辑。
+     */
+    preloadedSalesDetail?: Record<string, any>;
     forceRemote?: boolean;
     merge?: boolean;
 }

package/dist/server/index.d.ts

@@ -9,6 +9,20 @@ import { PisellCore, ServerModuleConfig, InitializeServerOptions } from '../type
 import type { RouteHandler, HttpMethod, RouteDefinition, Router, ModuleRegistryConfig, RequestSetting } from './types';
 import { OrderModule } from './modules/order';
 export type { RouteHandler, HttpMethod, RouteDefinition, Router, ModuleRegistryConfig, };
+/** Server 运行时诊断快照，用于排查订阅者是否持续增长。 */
+export interface ServerDiagnosticsSnapshot {
+    subscribers: {
+        productQuerySubscribers: number;
+        orderQuerySubscribers: number;
+        bookingQuerySubscribers: number;
+        bookingRemoteQuerySubscribers: number;
+        salesSearchSubscribers: number;
+        floorPlanQuerySubscribers: number;
+    };
+    caches: {
+        bookingRemoteCache: number;
+    };
+}
 /**
  * Server 类
  * 用于注册和管理服务端模块
@@ -44,6 +58,13 @@ declare class Server {
     private floorPlanQuerySubscribers;
     private moduleRegistry;
     constructor(core: PisellCore);
+    /**
+     * 获取 Server 内部订阅者和缓存数量快照。
+     *
+     * @example
+     * const snapshot = pisellos.server?.getDiagnosticsSnapshot?.();
+     */
+    getDiagnosticsSnapshot(): ServerDiagnosticsSnapshot;
     /**
      * 注册路由
      * @param routes 路由定义数组