@pisell/pisellos 2.3.25 → 2.3.27

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

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

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

@@ -155,6 +155,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private extractOrderIdFromSubmitResult;
     private calculatePaymentEffectiveAmount;
     private calculatePaymentTotal;
+    private calculateOrderPaidPaymentTotal;
     private getDepositAmount;
     private normalizeDepositAmount;
     private getLastOrderDepositSnapshot;
@@ -183,6 +184,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculatePaidPaymentSummary;
     private calculatePaymentServiceFee;
     private calculatePaymentGapAmount;
+    private calculatePaymentOrderAmount;
     private calculatePaymentRoundingAmount;
     private formatSummaryMetadataMoney;
     private syncSummaryProductMetadata;
@@ -465,7 +467,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: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Order/index.js

@@ -1346,6 +1346,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         return sum.plus(_this4.calculatePaymentEffectiveAmount(payment));
       }, new Decimal(0));
     }
+  }, {
+    key: "calculateOrderPaidPaymentTotal",
+    value: function calculateOrderPaidPaymentTotal(payments) {
+      var _this5 = this;
+      return mapPaymentItemsToOrderPayments(payments, {
+        includeVoided: false
+      }).reduce(function (sum, payment) {
+        if (!isPaidPaymentRecord(payment)) return sum;
+        return sum.plus(_this5.calculatePaymentGapAmount(payment));
+      }, new Decimal(0));
+    }
   }, {
     key: "getDepositAmount",
     value: function getDepositAmount(tempOrder, summary) {
@@ -1446,7 +1457,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var summary = this.store.summary || createEmptySummary();
       var paymentList = payments || tempOrder.payments || [];
       var refundAmount = this.getSummaryRefundAmount(summary);
-      var netPaidAmount = Decimal.max(this.calculatePaymentTotal(paymentList).minus(refundAmount), 0);
+      var netPaidAmount = Decimal.max(this.calculateOrderPaidPaymentTotal(paymentList).minus(refundAmount), 0);
       var depositAmount = this.getDepositAmount(tempOrder, summary);
       var orderExpectedAmount = this.getOrderExpectedAmount(summary);
       var isDepositFullyPaid = this.isDepositCovered({
@@ -1468,17 +1479,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculateDepositPaidAmount",
     value: function calculateDepositPaidAmount(payments) {
-      var _this5 = this;
+      var _this6 = this;
       return (payments || []).reduce(function (sum, payment) {
         var paymentRecord = payment;
         if (!isPaidPaymentRecord(paymentRecord)) return sum;
         var isDepositPayment = paymentRecord.type === 'deposit' || paymentRecord.order_payment_type === 'deposit';
         if (!isDepositPayment) return sum;
-        if (paymentRecord.origin_amount !== undefined && paymentRecord.origin_amount !== null && paymentRecord.origin_amount !== '') {
-          return sum.plus(_this5.calculatePaymentGapAmount(paymentRecord));
-        }
-        var rounding = new Decimal(paymentRecord.rounding_amount || 0);
-        return sum.plus(new Decimal(paymentRecord.amount || 0).minus(rounding));
+        return sum.plus(_this6.calculatePaymentGapAmount(paymentRecord));
       }, new Decimal(0));
     }
   }, {
@@ -1515,8 +1522,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function updateTempOrderPaymentStatus(tempOrder, options) {
       var summary = (options === null || options === void 0 ? void 0 : options.summary) || this.store.summary || createEmptySummary();
       var paymentTotal = this.calculatePaymentTotal(tempOrder.payments || []);
+      var orderPaymentTotal = this.calculateOrderPaidPaymentTotal(tempOrder.payments || []);
       var refundAmount = this.getSummaryRefundAmount(summary);
-      var netPaymentTotal = Decimal.max(paymentTotal.minus(refundAmount), 0);
+      var netPaymentTotal = Decimal.max(orderPaymentTotal.minus(refundAmount), 0);
       var targetAmount = this.calculatePaymentTargetAmount(tempOrder, summary, netPaymentTotal);
       if (this.shouldKeepPaymentStatusAfterAmountRecalc(tempOrder.payment_status, {
         netPaymentTotal: netPaymentTotal,
@@ -1582,7 +1590,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "capVoucherPaymentsByRemainingAmount",
     value: function capVoucherPaymentsByRemainingAmount(params) {
       var targetAmount = this.getPaymentTargetAmount();
-      var nonVoucherTotal = this.calculatePaymentTotal(params.nonVoucherPayments);
+      var nonVoucherTotal = this.calculateOrderPaidPaymentTotal(params.nonVoucherPayments);
       if (targetAmount.lte(0)) return [];
       var remainingAmount = Decimal.max(targetAmount.minus(nonVoucherTotal), 0);
       var cappedVouchers = [];
@@ -1619,16 +1627,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaidPaymentSummary",
     value: function calculatePaidPaymentSummary(payments) {
-      var _this6 = this;
+      var _this7 = this;
       return (payments || []).reduce(function (summary, payment) {
         var paymentRecord = payment;
         if (!isPaidPaymentRecord(paymentRecord)) return summary;
         return {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
-          orderPaidAmount: summary.orderPaidAmount.plus(paymentRecord.origin_amount || 0),
-          gapPaidAmount: summary.gapPaidAmount.plus(_this6.calculatePaymentGapAmount(paymentRecord)),
-          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this6.calculatePaymentServiceFee(paymentRecord)),
-          roundingAmount: summary.roundingAmount.plus(_this6.calculatePaymentRoundingAmount(paymentRecord))
+          orderPaidAmount: summary.orderPaidAmount.plus(_this7.calculatePaymentOrderAmount(paymentRecord)),
+          gapPaidAmount: summary.gapPaidAmount.plus(_this7.calculatePaymentGapAmount(paymentRecord)),
+          payServiceChargeAmount: summary.payServiceChargeAmount.plus(_this7.calculatePaymentServiceFee(paymentRecord)),
+          roundingAmount: summary.roundingAmount.plus(_this7.calculatePaymentRoundingAmount(paymentRecord))
         };
       }, {
         customerPaidAmount: new Decimal(0),
@@ -1652,11 +1660,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaymentGapAmount",
     value: function calculatePaymentGapAmount(payment) {
-      if (payment.origin_amount === undefined || payment.origin_amount === null || payment.origin_amount === '') {
-        return new Decimal(0);
+      if (payment.origin_amount !== undefined && payment.origin_amount !== null && payment.origin_amount !== '') {
+        var _rounding = new Decimal(payment.rounding_amount || 0);
+        return new Decimal(payment.origin_amount || 0).minus(_rounding);
       }
       var rounding = new Decimal(payment.rounding_amount || 0);
-      return new Decimal(payment.origin_amount || 0).minus(rounding);
+      var amount = new Decimal(payment.amount || 0);
+      var serviceFee = this.calculatePaymentServiceFee(payment);
+      if (serviceFee.lte(0)) return amount.minus(rounding);
+      if (!hasSyncedOrderPaymentRecord(payment)) return new Decimal(0);
+      return Decimal.max(amount.minus(serviceFee), 0).minus(rounding);
+    }
+  }, {
+    key: "calculatePaymentOrderAmount",
+    value: function calculatePaymentOrderAmount(payment) {
+      if (payment.origin_amount !== undefined && payment.origin_amount !== null && payment.origin_amount !== '') {
+        return new Decimal(payment.origin_amount || 0);
+      }
+      var amount = new Decimal(payment.amount || 0);
+      var serviceFee = this.calculatePaymentServiceFee(payment);
+      if (serviceFee.lte(0)) return amount;
+      if (!hasSyncedOrderPaymentRecord(payment)) return new Decimal(0);
+      return Decimal.max(amount.minus(serviceFee), 0);
     }
   }, {
     key: "calculatePaymentRoundingAmount",
@@ -1813,15 +1838,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeFingerprintValue",
     value: function normalizeFingerprintValue(value) {
-      var _this7 = this;
+      var _this8 = this;
       if (Array.isArray(value)) {
         return value.map(function (item) {
-          return _this7.normalizeFingerprintValue(item);
+          return _this8.normalizeFingerprintValue(item);
         });
       }
       if (!value || _typeof(value) !== 'object') return value !== null && value !== void 0 ? value : '';
       return Object.keys(value).sort().reduce(function (result, key) {
-        result[key] = _this7.normalizeFingerprintValue(value[key]);
+        result[key] = _this8.normalizeFingerprintValue(value[key]);
         return result;
       }, {});
     }
@@ -1836,7 +1861,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _sku$barcode,
         _ref20,
         _sku$variant_id,
-        _this8 = this;
+        _this9 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
       var discountTypes = ((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
@@ -1870,7 +1895,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               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: (_ref22 = (_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 && _ref22 !== void 0 ? _ref22 : 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)
+              add_price: _this9.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)
             };
           })
         }),
@@ -1880,8 +1905,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             bundle_product_id: (_ref23 = (_ref24 = (_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 && _ref24 !== void 0 ? _ref24 : bundle === null || bundle === void 0 ? void 0 : bundle.product_id) !== null && _ref23 !== void 0 ? _ref23 : null,
             bundle_variant_id: (_ref25 = (_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 && _ref25 !== void 0 ? _ref25 : 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),
+            price: _this9.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.price),
+            bundle_selling_price: _this9.normalizeFingerprintMoney(bundle === null || bundle === void 0 ? void 0 : bundle.bundle_selling_price),
             price_type: (_bundle$price_type = bundle === null || bundle === void 0 ? void 0 : bundle.price_type) !== null && _bundle$price_type !== void 0 ? _bundle$price_type : '',
             price_type_ext: (_bundle$price_type_ex = bundle === null || bundle === void 0 ? void 0 : bundle.price_type_ext) !== null && _bundle$price_type_ex !== void 0 ? _bundle$price_type_ex : ''
           };
@@ -1891,7 +1916,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           return {
             type: (_ref26 = (_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 && _ref26 !== void 0 ? _ref26 : '',
             discount_id: (_ref27 = (_ref28 = (_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 && _ref28 !== void 0 ? _ref28 : discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) !== null && _ref27 !== void 0 ? _ref27 : null,
-            amount: _this8.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
+            amount: _this9.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
       };
@@ -1899,9 +1924,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildOrderProductsFingerprint",
     value: function buildOrderProductsFingerprint(products) {
-      var _this9 = this;
+      var _this10 = this;
       var items = (products || []).map(function (product) {
-        return _this9.buildProductFingerprintItem(product);
+        return _this10.buildProductFingerprintItem(product);
       });
       items.sort(function (left, right) {
         return JSON.stringify(left).localeCompare(JSON.stringify(right));
@@ -1923,7 +1948,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _sku$barcode2,
         _ref30,
         _sku$variant_id2,
-        _this10 = this;
+        _this11 = this;
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
       var discountTypes = ((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
@@ -1954,7 +1979,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               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: (_ref32 = (_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 && _ref32 !== void 0 ? _ref32 : 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)
+              add_price: _this11.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)
             };
           })
         }),
@@ -1968,14 +1993,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             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) {
+            option: _this11.normalizeFingerprintValue(((bundle === null || bundle === void 0 ? void 0 : bundle.option) || []).map(function (option) {
               var _ref38, _option$id3, _option$option_group_5, _ref39, _option$option_group_6, _option$num3, _option$add_price3;
               return {
                 id: (_ref38 = (_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 && _ref38 !== void 0 ? _ref38 : 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: (_ref39 = (_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 && _ref39 !== void 0 ? _ref39 : 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)
+                add_price: _this11.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)
               };
             }))
           };
@@ -1985,7 +2010,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           return {
             type: (_ref40 = (_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 && _ref40 !== void 0 ? _ref40 : '',
             discount_id: (_ref41 = (_ref42 = (_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 && _ref42 !== void 0 ? _ref42 : discount === null || discount === void 0 || (_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) !== null && _ref41 !== void 0 ? _ref41 : null,
-            amount: _this10.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
+            amount: _this11.normalizeFingerprintMoney(discount === null || discount === void 0 ? void 0 : discount.amount)
           };
         }))
       };
@@ -1993,9 +2018,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildOrderProductsStructuralFingerprint",
     value: function buildOrderProductsStructuralFingerprint(products) {
-      var _this11 = this;
+      var _this12 = this;
       var items = (products || []).map(function (product) {
-        return _this11.buildProductStructuralFingerprintItem(product);
+        return _this12.buildProductStructuralFingerprintItem(product);
       });
       items.sort(function (left, right) {
         return JSON.stringify(left).localeCompare(JSON.stringify(right));
@@ -2095,7 +2120,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       tempOrder.surcharge_fee = summary.surcharge_fee || tempOrder.surcharge_fee;
       tempOrder.deposit_amount = summary.deposit_amount || '0.00';
       tempOrder.is_deposit = summary.deposit_amount !== '0.00' ? 1 : 0;
+      var previousSummary = this.store.summary;
       this.store.summary = summary;
+      this.updateTempOrderPaymentStatus(tempOrder, {
+        previousSummary: previousSummary,
+        summary: summary
+      });
       return summary;
     }
   }, {
@@ -2418,9 +2448,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sanitizeTempOrderProducts",
     value: function sanitizeTempOrderProducts(tempOrder) {
-      var _this12 = this;
+      var _this13 = this;
       tempOrder.products = (tempOrder.products || []).map(function (product) {
-        return _this12.sanitizeOrderProductForTempOrder(product);
+        return _this13.sanitizeOrderProductForTempOrder(product);
       });
     }
   }, {
@@ -2523,7 +2553,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncLinkedBookingHoldersToProducts",
     value: function syncLinkedBookingHoldersToProducts(tempOrder) {
-      var _this13 = this;
+      var _this14 = this;
       var bookings = tempOrder.bookings || [];
       var products = tempOrder.products || [];
       if (!bookings.length || !products.length) return;
@@ -2548,7 +2578,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         var bookingUid = product.booking_uid || ((_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.booking_uid);
         var linkedBooking = (productUid !== undefined && productUid !== null && String(productUid) !== '' ? bookingByProductUid.get(String(productUid)) : undefined) || (bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '' ? bookingByBookingUid.get(String(bookingUid)) : undefined);
         if (linkedBooking) {
-          _this13.setProductHolderFromBooking(product, linkedBooking);
+          _this14.setProductHolderFromBooking(product, linkedBooking);
         }
       });
     }
@@ -2676,9 +2706,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "findBookingIndexByUniqueIdentificationNumber",
     value: function findBookingIndexByUniqueIdentificationNumber(tempOrder, uniqueIdentificationNumber) {
-      var _this14 = this;
+      var _this15 = this;
       return (tempOrder.bookings || []).findIndex(function (booking) {
-        return _this14.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
+        return _this15.getBookingUniqueIdentificationNumber(booking) === uniqueIdentificationNumber;
       });
     }
   }, {
@@ -2686,12 +2716,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function removeLinkedBookingsForProduct(tempOrder, product) {
       var _product$metadata7,
         _product$metadata8,
-        _this15 = this;
+        _this16 = this;
       var productUid = (product === null || product === void 0 || (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
       var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.booking_uid);
       if (!productUid && !bookingUid) return;
       tempOrder.bookings = (tempOrder.bookings || []).filter(function (booking) {
-        var currentBookingUid = _this15.getBookingUniqueIdentificationNumber(booking);
+        var currentBookingUid = _this16.getBookingUniqueIdentificationNumber(booking);
         if (bookingUid && currentBookingUid === String(bookingUid)) return false;
         if (productUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) return false;
         return true;
@@ -3024,15 +3054,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "productHasCustomerBoundDiscount",
     value: function productHasCustomerBoundDiscount(product) {
-      var _this16 = this;
+      var _this17 = this;
       if (((product === null || product === void 0 ? void 0 : product.discount_list) || []).some(function (discount) {
-        return _this16.isCustomerBoundDiscount(discount);
+        return _this17.isCustomerBoundDiscount(discount);
       })) {
         return true;
       }
       return ((product === null || product === void 0 ? void 0 : product.product_bundle) || []).some(function (bundle) {
         return ((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []).some(function (discount) {
-          return _this16.isCustomerBoundDiscount(discount);
+          return _this17.isCustomerBoundDiscount(discount);
         });
       });
     }
@@ -3041,18 +3071,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function shouldSkipDiscountCalculation(tempOrder) {
       var _this$store$discount17,
         _this$store$discount18,
-        _this17 = this;
+        _this18 = this;
       if (this.hasActiveCustomerBoundDiscount) return false;
       var discountList = ((_this$store$discount17 = this.store.discount) === null || _this$store$discount17 === void 0 || (_this$store$discount18 = _this$store$discount17.getDiscountList) === null || _this$store$discount18 === void 0 ? void 0 : _this$store$discount18.call(_this$store$discount17)) || [];
       if (discountList.length > 0) return false;
       return !(tempOrder.products || []).some(function (product) {
-        return _this17.productHasCustomerBoundDiscount(product);
+        return _this18.productHasCustomerBoundDiscount(product);
       });
     }
   }, {
     key: "clearCustomerBoundDiscounts",
     value: function clearCustomerBoundDiscounts(tempOrder) {
-      var _this18 = this,
+      var _this19 = this,
         _discountModule$getDi,
         _discountModule$getOr,
         _discountModule$setDi,
@@ -3061,7 +3091,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var filterDiscountList = function filterDiscountList(discountList) {
         if (!Array.isArray(discountList)) return [];
         return discountList.filter(function (discount) {
-          var shouldRemove = _this18.isCustomerBoundDiscount(discount);
+          var shouldRemove = _this19.isCustomerBoundDiscount(discount);
           if (shouldRemove) didRemoveCustomerBoundDiscount = true;
           return !shouldRemove;
         });
@@ -3088,12 +3118,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var currentDiscounts = ((_discountModule$getDi = discountModule.getDiscountList) === null || _discountModule$getDi === void 0 ? void 0 : _discountModule$getDi.call(discountModule)) || [];
       var currentOriginalDiscounts = ((_discountModule$getOr = discountModule.getOriginalDiscountList) === null || _discountModule$getOr === void 0 ? void 0 : _discountModule$getOr.call(discountModule)) || [];
       var nextDiscounts = currentDiscounts.filter(function (discount) {
-        if (_this18.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
-        return !_this18.isCustomerBoundDiscount(discount);
+        if (_this19.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
+        return !_this19.isCustomerBoundDiscount(discount);
       });
       var nextOriginalDiscounts = currentOriginalDiscounts.filter(function (discount) {
-        if (_this18.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
-        return !_this18.isCustomerBoundDiscount(discount);
+        if (_this19.shouldKeepCustomerBoundDiscountAfterCustomerChange(discount)) return true;
+        return !_this19.isCustomerBoundDiscount(discount);
       });
       void ((_discountModule$setDi = discountModule.setDiscountList) === null || _discountModule$setDi === void 0 ? void 0 : _discountModule$setDi.call(discountModule, nextDiscounts));
       void ((_discountModule$setOr = discountModule.setOriginalDiscountList) === null || _discountModule$setOr === void 0 ? void 0 : _discountModule$setOr.call(discountModule, nextOriginalDiscounts));
@@ -3261,7 +3291,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPayment",
     value: function addOrderPayment(payment) {
-      var _this19 = this;
+      var _this20 = this;
       this.logInfo('addOrderPayment', {
         payment: payment
       });
@@ -3278,7 +3308,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this19.logError('recalculate summary after addOrderPayment failed', {
+        _this20.logError('recalculate summary after addOrderPayment failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -3360,7 +3390,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyPaymentLifecycleChange",
     value: function applyPaymentLifecycleChange(tempOrder, options) {
-      var _this20 = this;
+      var _this21 = this;
       this.updateTempOrderPaymentStatus(tempOrder);
       if ((options === null || options === void 0 ? void 0 : options.persist) !== false) {
         this.persistTempOrder();
@@ -3370,7 +3400,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this20.logError("recalculate summary after ".concat(logContext, " failed"), {
+        _this21.logError("recalculate summary after ".concat(logContext, " failed"), {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -3414,7 +3444,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateVoucherOrderPayments",
     value: function updateVoucherOrderPayments(payments, options) {
-      var _this21 = this;
+      var _this22 = this;
       var tempOrder = this.ensureTempOrder();
       var isOrderPaymentType = function isOrderPaymentType(value) {
         return value === 'normal' || value === 'deposit';
@@ -3449,7 +3479,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         });
       };
       var mappedVouchers = mapPaymentItemsToOrderPayments(payments.map(function (payment) {
-        return _this21.normalizePaymentSource(normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)), {
+        return _this22.normalizePaymentSource(normalizeVoucherPaymentStatus(withVoucherPaymentType(payment)), {
           defaultPaid: false
         });
       })).filter(function (payment) {
@@ -3498,7 +3528,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       void this.recalculateSummary({
         createIfMissing: true
       }).catch(function (error) {
-        _this21.logError('recalculate summary after updateVoucherOrderPayments failed', {
+        _this22.logError('recalculate summary after updateVoucherOrderPayments failed', {
           error: error instanceof Error ? error.message : String(error)
         });
       });
@@ -3634,7 +3664,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _appendProductLineToTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(tempOrder, product, booking) {
         var _booking_uid,
           _metadata,
-          _this22 = this;
+          _this23 = this;
         var linked, productToAdd, incomingFingerprint, normalizedIncoming, incomingBookingUid, hasIncomingGoodPass, hasIncomingProductNote, hasIncomingBookingUid, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, _targetProduct$metada, targetProduct, targetUid, normalizedProduct, nextNum, targetIsManualProductDiscount, nextDiscountList;
         return _regeneratorRuntime().wrap(function _callee17$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
@@ -3659,8 +3689,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
               shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid;
               matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
-                if (_this22.hasGoodPassDiscount(item)) return false;
-                if (_this22.hasOrderProductLineNote(item)) return false;
+                if (_this23.hasGoodPassDiscount(item)) return false;
+                if (_this23.hasOrderProductLineNote(item)) return false;
                 if (item.order_detail_id !== undefined && item.order_detail_id !== null) return false;
                 if (item.product_id !== productToAdd.product_id) return false;
                 if (item.product_variant_id !== productToAdd.product_variant_id) return false;
@@ -3957,17 +3987,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "preservePersistedBundlePriceFields",
     value: function preservePersistedBundlePriceFields(previousBundles, nextBundles) {
-      var _this23 = this;
+      var _this24 = this;
       if (!Array.isArray(nextBundles)) return nextBundles;
       if (!Array.isArray(previousBundles) || previousBundles.length === 0) return nextBundles;
       var previousByIdentity = new Map();
       previousBundles.forEach(function (bundle) {
-        var identity = _this23.getBundleRuntimeIdentity(bundle);
+        var identity = _this24.getBundleRuntimeIdentity(bundle);
         if (identity) previousByIdentity.set(identity, bundle);
       });
       return nextBundles.map(function (bundle, index) {
         if (!bundle || _typeof(bundle) !== 'object') return bundle;
-        var previous = previousByIdentity.get(_this23.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
+        var previous = previousByIdentity.get(_this24.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
         if (!previous || _typeof(previous) !== 'object') return bundle;
         return _objectSpread(_objectSpread(_objectSpread({}, bundle), (bundle.cover === undefined || bundle.cover === null || bundle.cover === '') && previous.cover !== undefined && previous.cover !== null && previous.cover !== '' ? {
           cover: previous.cover
@@ -4159,7 +4189,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderProducts",
     value: function () {
       var _updateOrderProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(paramsList) {
-        var _this24 = this;
+        var _this25 = this;
         var tempOrder, reapplyBookingDiscountProductUids;
         return _regeneratorRuntime().wrap(function _callee21$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
@@ -4172,7 +4202,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context23.abrupt("return", tempOrder.products);
             case 3:
               reapplyBookingDiscountProductUids = paramsList.reduce(function (acc, params) {
-                var updatedProductUid = _this24.applyOrderProductUpdateToTempOrder(tempOrder, params);
+                var updatedProductUid = _this25.applyOrderProductUpdateToTempOrder(tempOrder, params);
                 // 批量改预约时间时，延迟到最后一次折扣计算里统一恢复已选预约折扣卡。
                 if (params.allow_booking_discount_reapply && updatedProductUid) {
                   acc.push(String(updatedProductUid));
@@ -4351,7 +4381,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "removeProductsFromOrder",
     value: (function () {
       var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(identities) {
-        var _this25 = this;
+        var _this26 = this;
         var tempOrder, productsBeforeRemove, bookingsBeforeRemove, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3;
         return _regeneratorRuntime().wrap(function _callee24$(_context27) {
           while (1) switch (_context27.prev = _context27.next) {
@@ -4406,7 +4436,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                       }
                       if (productUid !== undefined && productUid !== null && productUid !== '') {
                         bookingsBeforeRemove.forEach(function (booking) {
-                          var bookingUid = _this25.getBookingUniqueIdentificationNumber(booking);
+                          var bookingUid = _this26.getBookingUniqueIdentificationNumber(booking);
                           if (bookingUid && String((booking === null || booking === void 0 ? void 0 : booking.product_uid) || '') === String(productUid)) {
                             linkedBookingUidsToRemove.add(bookingUid);
                           }
@@ -4885,10 +4915,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function extractSubmitErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this26 = this;
+        _this27 = this;
       var candidates = [error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data, error === null || error === void 0 ? void 0 : error.data, error === null || error === void 0 || (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.body, error === null || error === void 0 ? void 0 : error.body];
       return candidates.find(function (candidate) {
-        return _this26.isSubmitErrorResponse(candidate);
+        return _this27.isSubmitErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -4917,7 +4947,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
         var _params$confirmPendin;
-        var tempOrder, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, paidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, submitResult;
+        var tempOrder, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, submitResult;
         return _regeneratorRuntime().wrap(function _callee32$(_context35) {
           while (1) switch (_context35.prev = _context35.next) {
             case 0:
@@ -4926,8 +4956,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               shouldConfirmPendingVoucherPayments = (_params$confirmPendin = params.confirmPendingVoucherPayments) !== null && _params$confirmPendin !== void 0 ? _params$confirmPendin : params.submitWhenPaid === true;
               effectivePayments = shouldConfirmPendingVoucherPayments ? this.confirmPendingVoucherPaymentsInList(mappedPayments) : params.confirmPendingVoucherPayments === false ? this.discardPendingVoucherPaymentsFromList(mappedPayments) : mappedPayments;
               completion = this.getPaymentCompletion(effectivePayments);
-              paidPaymentTotal = this.calculatePaymentTotal(effectivePayments);
-              paymentStatus = completion.isOrderFullyPaid ? params.paymentStatus || 'paid' : paidPaymentTotal.gt(0) ? 'partially_paid' : 'payment_processing';
+              orderPaidPaymentTotal = this.calculateOrderPaidPaymentTotal(effectivePayments);
+              paymentStatus = completion.isOrderFullyPaid ? params.paymentStatus || 'paid' : orderPaidPaymentTotal.gt(0) ? 'partially_paid' : 'payment_processing';
               tempOrder.payments = effectivePayments;
               tempOrder.payment_status = paymentStatus;
               this.persistTempOrder();
@@ -5562,7 +5592,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this27 = this;
+      var _this28 = 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) {
@@ -5585,12 +5615,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
       var rawProducts = Array.isArray(raw.products) ? raw.products : [];
       nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map(function (p) {
-        return _this27.normalizeHydratedOrderProduct(p, {
+        return _this28.normalizeHydratedOrderProduct(p, {
           makeEditMark: options === null || options === void 0 ? void 0 : options.makeEditMark
         });
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
-        var booking = _this27.normalizeHydratedBookingHolder(b || {});
+        var booking = _this28.normalizeHydratedBookingHolder(b || {});
         return _objectSpread(_objectSpread({}, booking), {}, {
           is_all: normalizeBookingIsAll(booking),
           sub_type: normalizeBookingSubType(booking)
@@ -5759,7 +5789,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product, options) {
-      var _this28 = this;
+      var _this29 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
@@ -5767,7 +5797,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var productSku = ensureProductSku(row);
       row.product_sku = _objectSpread(_objectSpread({}, productSku), {}, {
         option: normalizeProductSkuOptions(productSku.option.map(function (optionItem) {
-          return _this28.normalizeHydratedProductOptionItem(optionItem || {});
+          return _this29.normalizeHydratedProductOptionItem(optionItem || {});
         }))
       });
       delete row["product_".concat('option', "_item")];

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

@@ -2120,7 +2120,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', 'shop_discount', 'summary', 'products', 'bookings', 'note', 'customer_id', 'customer_name', 'customer', 'holder', 'contacts_info', 'phone', 'email', 'relation_forms'];
+      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'shop_discount', 'summary', 'products', 'bookings', 'note', 'customer_id', 'customer_name', 'customer', 'holder', 'contacts_info', 'phone', 'email', 'relation_forms', 'vouchers'];
       var mergedRecord = merged;
       var preferredRecord = preferred;
       var secondaryRecord = secondary;

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 | 5 | 3 | 2 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -441,19 +441,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

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

@@ -155,6 +155,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private extractOrderIdFromSubmitResult;
     private calculatePaymentEffectiveAmount;
     private calculatePaymentTotal;
+    private calculateOrderPaidPaymentTotal;
     private getDepositAmount;
     private normalizeDepositAmount;
     private getLastOrderDepositSnapshot;
@@ -183,6 +184,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculatePaidPaymentSummary;
     private calculatePaymentServiceFee;
     private calculatePaymentGapAmount;
+    private calculatePaymentOrderAmount;
     private calculatePaymentRoundingAmount;
     private formatSummaryMetadataMoney;
     private syncSummaryProductMetadata;
@@ -465,7 +467,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: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -902,6 +902,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return sum.plus(this.calculatePaymentEffectiveAmount(payment));
     }, new import_decimal.default(0));
   }
+  calculateOrderPaidPaymentTotal(payments) {
+    return (0, import_utils.mapPaymentItemsToOrderPayments)(payments, {
+      includeVoided: false
+    }).reduce((sum, payment) => {
+      if (!isPaidPaymentRecord(payment))
+        return sum;
+      return sum.plus(this.calculatePaymentGapAmount(payment));
+    }, new import_decimal.default(0));
+  }
   getDepositAmount(tempOrder, summary) {
     return new import_decimal.default(summary.deposit_amount || tempOrder.deposit_amount || "0.00");
   }
@@ -992,7 +1001,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const paymentList = payments || tempOrder.payments || [];
     const refundAmount = this.getSummaryRefundAmount(summary);
     const netPaidAmount = import_decimal.default.max(
-      this.calculatePaymentTotal(paymentList).minus(refundAmount),
+      this.calculateOrderPaidPaymentTotal(paymentList).minus(refundAmount),
       0
     );
     const depositAmount = this.getDepositAmount(tempOrder, summary);
@@ -1021,11 +1030,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const isDepositPayment = paymentRecord.type === "deposit" || paymentRecord.order_payment_type === "deposit";
       if (!isDepositPayment)
         return sum;
-      if (paymentRecord.origin_amount !== void 0 && paymentRecord.origin_amount !== null && paymentRecord.origin_amount !== "") {
-        return sum.plus(this.calculatePaymentGapAmount(paymentRecord));
-      }
-      const rounding = new import_decimal.default(paymentRecord.rounding_amount || 0);
-      return sum.plus(new import_decimal.default(paymentRecord.amount || 0).minus(rounding));
+      return sum.plus(this.calculatePaymentGapAmount(paymentRecord));
     }, new import_decimal.default(0));
   }
   resolveNextOrderPaymentType(tempOrder) {
@@ -1058,8 +1063,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   updateTempOrderPaymentStatus(tempOrder, options) {
     const summary = (options == null ? void 0 : options.summary) || this.store.summary || (0, import_utils.createEmptySummary)();
     const paymentTotal = this.calculatePaymentTotal(tempOrder.payments || []);
+    const orderPaymentTotal = this.calculateOrderPaidPaymentTotal(tempOrder.payments || []);
     const refundAmount = this.getSummaryRefundAmount(summary);
-    const netPaymentTotal = import_decimal.default.max(paymentTotal.minus(refundAmount), 0);
+    const netPaymentTotal = import_decimal.default.max(orderPaymentTotal.minus(refundAmount), 0);
     const targetAmount = this.calculatePaymentTargetAmount(
       tempOrder,
       summary,
@@ -1128,7 +1134,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   capVoucherPaymentsByRemainingAmount(params) {
     const targetAmount = this.getPaymentTargetAmount();
-    const nonVoucherTotal = this.calculatePaymentTotal(params.nonVoucherPayments);
+    const nonVoucherTotal = this.calculateOrderPaidPaymentTotal(params.nonVoucherPayments);
     if (targetAmount.lte(0))
       return [];
     let remainingAmount = import_decimal.default.max(
@@ -1171,7 +1177,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           return summary;
         return {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
-          orderPaidAmount: summary.orderPaidAmount.plus(paymentRecord.origin_amount || 0),
+          orderPaidAmount: summary.orderPaidAmount.plus(this.calculatePaymentOrderAmount(paymentRecord)),
           gapPaidAmount: summary.gapPaidAmount.plus(this.calculatePaymentGapAmount(paymentRecord)),
           payServiceChargeAmount: summary.payServiceChargeAmount.plus(this.calculatePaymentServiceFee(paymentRecord)),
           roundingAmount: summary.roundingAmount.plus(this.calculatePaymentRoundingAmount(paymentRecord))
@@ -1196,11 +1202,30 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return new import_decimal.default(payment.amount || 0).times(percentage).plus(fixedAmount);
   }
   calculatePaymentGapAmount(payment) {
-    if (payment.origin_amount === void 0 || payment.origin_amount === null || payment.origin_amount === "") {
-      return new import_decimal.default(0);
+    if (payment.origin_amount !== void 0 && payment.origin_amount !== null && payment.origin_amount !== "") {
+      const rounding2 = new import_decimal.default(payment.rounding_amount || 0);
+      return new import_decimal.default(payment.origin_amount || 0).minus(rounding2);
     }
     const rounding = new import_decimal.default(payment.rounding_amount || 0);
-    return new import_decimal.default(payment.origin_amount || 0).minus(rounding);
+    const amount = new import_decimal.default(payment.amount || 0);
+    const serviceFee = this.calculatePaymentServiceFee(payment);
+    if (serviceFee.lte(0))
+      return amount.minus(rounding);
+    if (!hasSyncedOrderPaymentRecord(payment))
+      return new import_decimal.default(0);
+    return import_decimal.default.max(amount.minus(serviceFee), 0).minus(rounding);
+  }
+  calculatePaymentOrderAmount(payment) {
+    if (payment.origin_amount !== void 0 && payment.origin_amount !== null && payment.origin_amount !== "") {
+      return new import_decimal.default(payment.origin_amount || 0);
+    }
+    const amount = new import_decimal.default(payment.amount || 0);
+    const serviceFee = this.calculatePaymentServiceFee(payment);
+    if (serviceFee.lte(0))
+      return amount;
+    if (!hasSyncedOrderPaymentRecord(payment))
+      return new import_decimal.default(0);
+    return import_decimal.default.max(amount.minus(serviceFee), 0);
   }
   calculatePaymentRoundingAmount(payment) {
     if (payment.rounding_amount === void 0 || payment.rounding_amount === null || payment.rounding_amount === "") {
@@ -1548,7 +1573,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     tempOrder.surcharge_fee = summary.surcharge_fee || tempOrder.surcharge_fee;
     tempOrder.deposit_amount = summary.deposit_amount || "0.00";
     tempOrder.is_deposit = summary.deposit_amount !== "0.00" ? 1 : 0;
+    const previousSummary = this.store.summary;
     this.store.summary = summary;
+    this.updateTempOrderPaymentStatus(tempOrder, {
+      previousSummary,
+      summary
+    });
     return summary;
   }
   clearPersistedAmountFieldsForFullRecalc(products) {
@@ -3659,8 +3689,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const shouldConfirmPendingVoucherPayments = params.confirmPendingVoucherPayments ?? params.submitWhenPaid === true;
     const effectivePayments = shouldConfirmPendingVoucherPayments ? this.confirmPendingVoucherPaymentsInList(mappedPayments) : params.confirmPendingVoucherPayments === false ? this.discardPendingVoucherPaymentsFromList(mappedPayments) : mappedPayments;
     const completion = this.getPaymentCompletion(effectivePayments);
-    const paidPaymentTotal = this.calculatePaymentTotal(effectivePayments);
-    const paymentStatus = completion.isOrderFullyPaid ? params.paymentStatus || "paid" : paidPaymentTotal.gt(0) ? "partially_paid" : "payment_processing";
+    const orderPaidPaymentTotal = this.calculateOrderPaidPaymentTotal(effectivePayments);
+    const paymentStatus = completion.isOrderFullyPaid ? params.paymentStatus || "paid" : orderPaidPaymentTotal.gt(0) ? "partially_paid" : "payment_processing";
     tempOrder.payments = effectivePayments;
     tempOrder.payment_status = paymentStatus;
     this.persistTempOrder();

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

@@ -1316,7 +1316,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       "contacts_info",
       "phone",
       "email",
-      "relation_forms"
+      "relation_forms",
+      "vouchers"
     ];
     const mergedRecord = merged;
     const preferredRecord = preferred;

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 | 5 | 3 | 2 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -441,19 +441,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/package.json

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