@pisell/pisellos 2.2.176 → 2.2.178

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

@@ -127,6 +127,9 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculatePaymentTotal;
     private calculatePaidPaymentSummary;
     private calculatePaymentServiceFee;
+    private formatSummaryMetadataMoney;
+    private syncSummaryProductMetadata;
+    private calculateSummaryPaymentBalance;
     private getPaymentTargetAmount;
     ensureTempOrder(): OrderTempOrder;
     restoreOrder(): OrderTempOrder;

package/dist/modules/Order/index.js

@@ -1134,6 +1134,91 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var fixedAmount = new Decimal(serviceCharge.amount || 0);
       return new Decimal(payment.amount || 0).times(percentage).plus(fixedAmount);
     }
+  }, {
+    key: "formatSummaryMetadataMoney",
+    value: function formatSummaryMetadataMoney(value) {
+      if (value === undefined || value === null || value === '') return undefined;
+      if (value instanceof Decimal) return value.toFixed(2);
+      return new Decimal(String(value || 0)).toFixed(2);
+    }
+  }, {
+    key: "syncSummaryProductMetadata",
+    value: function syncSummaryProductMetadata(products) {
+      var moneyKeys = ['main_product_attached_bundle_surcharge_fee', 'main_product_attached_bundle_tax_fee', 'surcharge_rounding_remainder', 'tax_fee_rounding_remainder'];
+      var _iterator5 = _createForOfIteratorHelper(products || []),
+        _step5;
+      try {
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var product = _step5.value;
+          var productRecord = product;
+          var metadata = productRecord.metadata && _typeof(productRecord.metadata) === 'object' ? _objectSpread({}, productRecord.metadata) : {};
+          var hasMetadataPatch = false;
+          var _iterator6 = _createForOfIteratorHelper(moneyKeys),
+            _step6;
+          try {
+            for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+              var key = _step6.value;
+              var value = this.formatSummaryMetadataMoney(productRecord[key]);
+              if (value === undefined) continue;
+              metadata[key] = value;
+              hasMetadataPatch = true;
+            }
+          } catch (err) {
+            _iterator6.e(err);
+          } finally {
+            _iterator6.f();
+          }
+          if (Array.isArray(productRecord.relation_surcharge_ids)) {
+            metadata.relation_surcharge_ids = productRecord.relation_surcharge_ids;
+            hasMetadataPatch = true;
+          }
+          if (hasMetadataPatch) productRecord.metadata = metadata;
+          if (!Array.isArray(productRecord.product_bundle)) continue;
+          var _iterator7 = _createForOfIteratorHelper(productRecord.product_bundle),
+            _step7;
+          try {
+            for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+              var bundle = _step7.value;
+              var bundleRecord = bundle;
+              var bundleMetadata = bundleRecord.metadata && _typeof(bundleRecord.metadata) === 'object' ? _objectSpread({}, bundleRecord.metadata) : {};
+              var hasBundleMetadataPatch = false;
+              var bundleSurchargeFee = this.formatSummaryMetadataMoney(bundleRecord.surcharge_fee);
+              if (bundleSurchargeFee !== undefined) {
+                bundleMetadata.surcharge_fee = bundleSurchargeFee;
+                hasBundleMetadataPatch = true;
+              }
+              if (Array.isArray(bundleRecord.relation_surcharge_ids)) {
+                bundleMetadata.relation_surcharge_ids = bundleRecord.relation_surcharge_ids;
+                hasBundleMetadataPatch = true;
+              }
+              if (hasBundleMetadataPatch) bundleRecord.metadata = bundleMetadata;
+            }
+          } catch (err) {
+            _iterator7.e(err);
+          } finally {
+            _iterator7.f();
+          }
+        }
+      } catch (err) {
+        _iterator5.e(err);
+      } finally {
+        _iterator5.f();
+      }
+    }
+  }, {
+    key: "calculateSummaryPaymentBalance",
+    value: function calculateSummaryPaymentBalance(params) {
+      var tempOrder = params.tempOrder,
+        summary = params.summary,
+        orderPaidAmount = params.orderPaidAmount;
+      var depositAmount = summary.deposit_amount || tempOrder.deposit_amount || '0.00';
+      var isDeposit = tempOrder.is_deposit === 1 || new Decimal(depositAmount || 0).gt(0);
+      var targetAmount = isDeposit ? new Decimal(depositAmount || 0) : new Decimal(summary.total_amount || summary.expect_amount || 0);
+      return {
+        amountGap: Decimal.max(0, targetAmount.minus(orderPaidAmount)).toFixed(2),
+        totalRefundAmount: Decimal.max(0, orderPaidAmount.minus(targetAmount)).toFixed(2)
+      };
+    }
   }, {
     key: "getPaymentTargetAmount",
     value: function getPaymentTargetAmount() {
@@ -1450,7 +1535,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "recalculateSummary",
     value: function () {
       var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(options) {
-        var tempOrder, salesSummary, existedSummary, paidPaymentSummary, emptySummary, salesSummaryResult, summary;
+        var tempOrder, salesSummary, paidPaymentSummary, _paymentBalance, emptySummary, salesSummaryResult, paymentBalance, summary;
         return _regeneratorRuntime().wrap(function _callee12$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
             case 0:
@@ -1462,16 +1547,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context14.abrupt("return", null);
             case 3:
               salesSummary = this.getSalesSummary();
-              existedSummary = this.store.summary || createEmptySummary();
               paidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
               if (salesSummary) {
                 _context14.next = 11;
                 break;
               }
+              _paymentBalance = this.calculateSummaryPaymentBalance({
+                tempOrder: tempOrder,
+                summary: createEmptySummary(),
+                orderPaidAmount: paidPaymentSummary.orderPaidAmount
+              });
               emptySummary = _objectSpread(_objectSpread({}, createEmptySummary()), {}, {
-                total_refund_amount: existedSummary.total_refund_amount || '0.00',
+                total_refund_amount: _paymentBalance.totalRefundAmount,
                 customer_paid_amount: paidPaymentSummary.customerPaidAmount.toFixed(2),
                 order_paid_amount: paidPaymentSummary.orderPaidAmount.toFixed(2),
+                amount_gap: _paymentBalance.amountGap,
                 pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
               });
               this.store.summary = emptySummary;
@@ -1486,10 +1576,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 13:
               salesSummaryResult = _context14.sent;
+              this.syncSummaryProductMetadata(tempOrder.products || []);
+              paymentBalance = this.calculateSummaryPaymentBalance({
+                tempOrder: tempOrder,
+                summary: salesSummaryResult,
+                orderPaidAmount: paidPaymentSummary.orderPaidAmount
+              });
               summary = _objectSpread(_objectSpread({}, salesSummaryResult), {}, {
-                total_refund_amount: existedSummary.total_refund_amount || '0.00',
+                total_refund_amount: paymentBalance.totalRefundAmount,
                 customer_paid_amount: paidPaymentSummary.customerPaidAmount.toFixed(2),
                 order_paid_amount: paidPaymentSummary.orderPaidAmount.toFixed(2),
+                amount_gap: paymentBalance.amountGap,
                 pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
               });
               this.store.summary = summary;
@@ -1504,7 +1601,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               tempOrder.deposit_amount = summary.deposit_amount || '0.00';
               tempOrder.is_deposit = summary.deposit_amount !== '0.00' ? 1 : 0;
               return _context14.abrupt("return", this.store.summary);
-            case 23:
+            case 25:
             case "end":
               return _context14.stop();
           }
@@ -1791,13 +1888,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPayment",
     value: function addOrderPayment(payment) {
+      var _paymentRecord$status,
+        _ref21,
+        _paymentRecord$origin,
+        _this6 = this;
       this.logInfo('addOrderPayment', {
         payment: payment
       });
       var tempOrder = this.ensureTempOrder();
-      var mapped = mapPaymentItemsToOrderPayments([payment]);
+      var paymentRecord = payment;
+      var mapped = mapPaymentItemsToOrderPayments([_objectSpread(_objectSpread({}, paymentRecord), {}, {
+        status: (_paymentRecord$status = paymentRecord.status) !== null && _paymentRecord$status !== void 0 ? _paymentRecord$status : 'paid',
+        origin_amount: (_ref21 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref21 !== void 0 ? _ref21 : '0.00'
+      })]);
       tempOrder.payments = [].concat(_toConsumableArray(tempOrder.payments || []), _toConsumableArray(mapped));
       this.persistTempOrder();
+      void this.recalculateSummary({
+        createIfMissing: true
+      }).catch(function (error) {
+        _this6.logError('recalculate summary after addOrderPayment failed', {
+          error: error instanceof Error ? error.message : String(error)
+        });
+      });
       return tempOrder.payments;
     }
 
@@ -1920,7 +2032,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "addProductToOrder",
     value: function () {
       var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(product, booking) {
-        var _this6 = this;
+        var _this7 = this;
         var tempOrder, linked, productToAdd, incomingFingerprint, normalizedIncoming, hasIncomingGoodPass, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, _targetProduct$metada, targetProduct, targetUid, normalizedProduct;
         return _regeneratorRuntime().wrap(function _callee16$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
@@ -1937,7 +2049,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               hasIncomingGoodPass = this.hasGoodPassDiscount(normalizedIncoming);
               shouldForceNewLine = !!booking;
               matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
-                if (_this6.hasGoodPassDiscount(item)) return false;
+                if (_this7.hasGoodPassDiscount(item)) return false;
                 if (item.product_id !== productToAdd.product_id) return false;
                 if (item.product_variant_id !== productToAdd.product_variant_id) return false;
                 var existedFingerprint = buildProductLineFingerprint(item.product_option_item, item.product_bundle);
@@ -2494,10 +2606,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function extractSubmitErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this7 = this;
+        _this8 = 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 _this7.isSubmitErrorResponse(candidate);
+        return _this8.isSubmitErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -3075,7 +3187,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this8 = this;
+      var _this9 = this;
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), raw || {});
       delete nextTempOrder.summary;
       delete nextTempOrder.lastOrderInfo;
@@ -3093,7 +3205,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.metadata = raw.metadata && _typeof(raw.metadata) === 'object' ? _objectSpread({}, raw.metadata) : {};
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
       nextTempOrder.products = Array.isArray(raw.products) ? raw.products.map(function (p) {
-        return _this8.normalizeHydratedOrderProduct(p);
+        return _this9.normalizeHydratedOrderProduct(p);
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
         return _objectSpread(_objectSpread({}, b || {}), {}, {
@@ -3187,46 +3299,46 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
      */
     function populateSavedAmounts(productList, discountList) {
       var savedMap = new Map();
-      var _iterator5 = _createForOfIteratorHelper(productList),
-        _step5;
+      var _iterator8 = _createForOfIteratorHelper(productList),
+        _step8;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var product = _step5.value;
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var product = _step8.value;
           var qty = product.num || 1;
-          var _iterator7 = _createForOfIteratorHelper(product.discount_list || []),
-            _step7;
+          var _iterator10 = _createForOfIteratorHelper(product.discount_list || []),
+            _step10;
           try {
-            for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+            for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
               var _pd$discount, _pd$metadata;
-              var pd = _step7.value;
+              var pd = _step10.value;
               var discountKey = ((_pd$discount = pd.discount) === null || _pd$discount === void 0 ? void 0 : _pd$discount.resource_id) || pd.id;
               if (discountKey == null) continue;
               var amount = new Decimal(pd.amount || 0).times(qty).plus(((_pd$metadata = pd.metadata) === null || _pd$metadata === void 0 ? void 0 : _pd$metadata.product_discount_difference) || 0);
               savedMap.set(discountKey, (savedMap.get(discountKey) || new Decimal(0)).plus(amount));
             }
           } catch (err) {
-            _iterator7.e(err);
+            _iterator10.e(err);
           } finally {
-            _iterator7.f();
+            _iterator10.f();
           }
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator5.f();
+        _iterator8.f();
       }
-      var _iterator6 = _createForOfIteratorHelper(discountList),
-        _step6;
+      var _iterator9 = _createForOfIteratorHelper(discountList),
+        _step9;
       try {
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var d = _step6.value;
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+          var d = _step9.value;
           var key = d.id;
           d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
         }
       } catch (err) {
-        _iterator6.e(err);
+        _iterator9.e(err);
       } finally {
-        _iterator6.f();
+        _iterator9.f();
       }
     }
   }]);

package/dist/modules/SalesSummary/utils.js

@@ -280,6 +280,7 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
         isChargeTax: (_product$is_charge_ta2 = product.is_charge_tax) !== null && _product$is_charge_ta2 !== void 0 ? _product$is_charge_ta2 : 0
       });
       var mainTaxRounded = mainTaxPrecise.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
+      product.main_product_attached_bundle_tax_fee = mainTaxRounded.toFixed(2);
       if (mainTaxPrecise.gt(0)) {
         lastTaxableItem = {
           type: 'main',
@@ -313,15 +314,16 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
           var bundleQuantity = new Decimal(getSafeNum((_bundleItem$num2 = bundleItem.num) !== null && _bundleItem$num2 !== void 0 ? _bundleItem$num2 : bundleItem.quantity));
           var bundlePrice = toDecimal((_ref4 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref4 !== void 0 ? _ref4 : 0);
           var bundleOriginalPrice = toDecimal((_ref5 = (_ref6 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref6 !== void 0 ? _ref6 : bundleItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
+          var bundleSurchargeFee = toDecimal(bundleItem.surcharge_fee);
           var bundleTaxPrecise = calculateSingleItemTax({
-            price: bundlePrice,
+            price: bundlePrice.plus(bundleSurchargeFee),
             taxRate: rate,
             isPriceIncludeTax: isPriceIncludeTax,
             isChargeTax: (_ref7 = (_bundleItem$is_charge = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge !== void 0 ? _bundleItem$is_charge : product.is_charge_tax) !== null && _ref7 !== void 0 ? _ref7 : 0
           });
           var bundleTaxRounded = bundleTaxPrecise.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
           var bundleOrigTaxPrecise = calculateSingleItemTax({
-            price: bundleOriginalPrice,
+            price: bundleOriginalPrice.plus(bundleSurchargeFee),
             taxRate: rate,
             isPriceIncludeTax: isPriceIncludeTax,
             isChargeTax: (_ref8 = (_bundleItem$is_charge2 = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge2 !== void 0 ? _bundleItem$is_charge2 : product.is_charge_tax) !== null && _ref8 !== void 0 ? _ref8 : 0
@@ -444,8 +446,20 @@ export function calculateSalesSummary(params) {
     isEdit: false
   }) || 0);
   for (var i = 0; i < products.length; i++) {
-    var _surchargeServiceItem;
-    products[i].surcharge_fee = ((_surchargeServiceItem = surchargeServiceItems[i]) === null || _surchargeServiceItem === void 0 ? void 0 : _surchargeServiceItem.surcharge_fee) || 0;
+    var sourceItem = surchargeServiceItems[i] || {};
+    var product = products[i];
+    product.surcharge_fee = sourceItem.surcharge_fee || 0;
+    var relationSurchargeIds = Array.isArray(sourceItem.relation_surcharge_ids) ? sourceItem.relation_surcharge_ids : [];
+    var hasSurcharge = new Decimal(product.surcharge_fee || 0).gt(0) || relationSurchargeIds.length > 0;
+    if (hasSurcharge) {
+      product.main_product_attached_bundle_surcharge_fee = toFixed2(product.surcharge_fee);
+    }
+    if (relationSurchargeIds.length > 0) {
+      product.relation_surcharge_ids = sourceItem.relation_surcharge_ids;
+    }
+    if (hasSurcharge && sourceItem.surcharge_rounding_remainder !== undefined) {
+      product.surcharge_rounding_remainder = sourceItem.surcharge_rounding_remainder;
+    }
   }
   var hasTaxRate = taxRate !== undefined && taxRate !== null && taxRate > 0;
   var productTaxFee;

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

@@ -18,6 +18,7 @@ export declare class OrderModule extends BaseModule implements Module {
     private resourceIdIndex;
     private logger;
     private storage;
+    private orderSQLiteSaveQueue;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
@@ -130,6 +131,28 @@ export declare class OrderModule extends BaseModule implements Module {
     private getStorageItem;
     private setStorageItem;
     private loadOrdersFromSQLite;
+    /**
+     * 串行执行订单 SQLite 保存任务，保证 clear + bulkAdd 组合不会被其它订单保存插入。
+     *
+     * @example
+     * await this.runInOrderSQLiteSaveQueue(async () => {
+     *   await this.dbManager.clear(INDEXDB_STORE_NAME)
+     *   await this.dbManager.bulkAdd(INDEXDB_STORE_NAME, orders)
+     * })
+     */
+    private runInOrderSQLiteSaveQueue;
+    /**
+     * 保存订单列表到 SQLite，内部会先清空 orders 表再批量写入当前快照。
+     *
+     * @example
+     * await this.saveOrdersToSQLite(this.store.list)
+     */
     private saveOrdersToSQLite;
+    /**
+     * 清空订单模块的内存数据和本地 SQLite 订单表。
+     *
+     * @example
+     * await orderModule.clear()
+     */
     clear(): Promise<void>;
 }

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

@@ -63,6 +63,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "logger", void 0);
     // LoggerManager 实例
     _defineProperty(_assertThisInitialized(_this), "storage", void 0);
+    _defineProperty(_assertThisInitialized(_this), "orderSQLiteSaveQueue", Promise.resolve());
     return _this;
   }
   _createClass(OrderModule, [{
@@ -1276,92 +1277,168 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return loadOrdersFromSQLite;
     }()
+    /**
+     * 串行执行订单 SQLite 保存任务，保证 clear + bulkAdd 组合不会被其它订单保存插入。
+     *
+     * @example
+     * await this.runInOrderSQLiteSaveQueue(async () => {
+     *   await this.dbManager.clear(INDEXDB_STORE_NAME)
+     *   await this.dbManager.bulkAdd(INDEXDB_STORE_NAME, orders)
+     * })
+     */
   }, {
-    key: "saveOrdersToSQLite",
-    value: function () {
-      var _saveOrdersToSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(orderList) {
+    key: "runInOrderSQLiteSaveQueue",
+    value: (function () {
+      var _runInOrderSQLiteSaveQueue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(task) {
+        var queuedTask;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
+            case 0:
+              queuedTask = this.orderSQLiteSaveQueue.then(task, task);
+              this.orderSQLiteSaveQueue = queuedTask.then(function () {
+                return undefined;
+              }, function () {
+                return undefined;
+              });
+              return _context15.abrupt("return", queuedTask);
+            case 3:
+            case "end":
+              return _context15.stop();
+          }
+        }, _callee15, this);
+      }));
+      function runInOrderSQLiteSaveQueue(_x8) {
+        return _runInOrderSQLiteSaveQueue.apply(this, arguments);
+      }
+      return runInOrderSQLiteSaveQueue;
+    }()
+    /**
+     * 保存订单列表到 SQLite，内部会先清空 orders 表再批量写入当前快照。
+     *
+     * @example
+     * await this.saveOrdersToSQLite(this.store.list)
+     */
+    )
+  }, {
+    key: "saveOrdersToSQLite",
+    value: (function () {
+      var _saveOrdersToSQLite = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(orderList) {
+        var _this10 = this;
+        var orderListSnapshot;
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               if (this.dbManager) {
-                _context15.next = 2;
+                _context17.next = 2;
                 break;
               }
-              return _context15.abrupt("return");
+              return _context17.abrupt("return");
             case 2:
-              _context15.prev = 2;
-              this.logInfo('saveOrdersToSQLite-开始', {
-                count: orderList.length
-              });
-              _context15.next = 6;
-              return this.dbManager.clear(INDEXDB_STORE_NAME);
+              orderListSnapshot = cloneDeep(orderList);
+              _context17.prev = 3;
+              _context17.next = 6;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+                return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+                  while (1) switch (_context16.prev = _context16.next) {
+                    case 0:
+                      _this10.logInfo('saveOrdersToSQLite-开始', {
+                        count: orderListSnapshot.length
+                      });
+                      _context16.next = 3;
+                      return _this10.dbManager.clear(INDEXDB_STORE_NAME);
+                    case 3:
+                      _this10.logInfo('saveOrdersToSQLite-clear完成', {
+                        count: orderListSnapshot.length
+                      });
+                      if (!(orderListSnapshot.length === 0)) {
+                        _context16.next = 6;
+                        break;
+                      }
+                      return _context16.abrupt("return");
+                    case 6:
+                      _context16.next = 8;
+                      return _this10.dbManager.bulkAdd(INDEXDB_STORE_NAME, orderListSnapshot);
+                    case 8:
+                      _this10.logInfo('saveOrdersToSQLite-bulkAdd完成', {
+                        count: orderListSnapshot.length
+                      });
+                    case 9:
+                    case "end":
+                      return _context16.stop();
+                  }
+                }, _callee16);
+              })));
             case 6:
-              this.logInfo('saveOrdersToSQLite-clear完成', {
-                count: orderList.length
-              });
-              if (!(orderList.length === 0)) {
-                _context15.next = 9;
-                break;
-              }
-              return _context15.abrupt("return");
-            case 9:
-              _context15.next = 11;
-              return this.dbManager.bulkAdd(INDEXDB_STORE_NAME, orderList);
-            case 11:
-              this.logInfo('saveOrdersToSQLite-bulkAdd完成', {
-                count: orderList.length
-              });
-              _context15.next = 17;
+              _context17.next = 11;
               break;
-            case 14:
-              _context15.prev = 14;
-              _context15.t0 = _context15["catch"](2);
+            case 8:
+              _context17.prev = 8;
+              _context17.t0 = _context17["catch"](3);
               // SQLite 异常，避免影响主流程
               this.logError('保存订单到 SQLite 失败', {
-                error: _context15.t0 instanceof Error ? _context15.t0.message : String(_context15.t0),
-                orderList: orderList.length
+                error: _context17.t0 instanceof Error ? _context17.t0.message : String(_context17.t0),
+                orderList: orderListSnapshot.length
               });
-            case 17:
+            case 11:
             case "end":
-              return _context15.stop();
+              return _context17.stop();
           }
-        }, _callee15, this, [[2, 14]]);
+        }, _callee17, this, [[3, 8]]);
       }));
-      function saveOrdersToSQLite(_x8) {
+      function saveOrdersToSQLite(_x9) {
         return _saveOrdersToSQLite.apply(this, arguments);
       }
       return saveOrdersToSQLite;
     }()
+    /**
+     * 清空订单模块的内存数据和本地 SQLite 订单表。
+     *
+     * @example
+     * await orderModule.clear()
+     */
+    )
   }, {
     key: "clear",
-    value: function () {
-      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+    value: (function () {
+      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
+        var _this11 = this;
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               this.store.list = [];
               this.store.map = new Map();
               this.resourceIdIndex.clear();
               if (!this.dbManager) {
-                _context16.next = 6;
+                _context19.next = 6;
                 break;
               }
-              _context16.next = 6;
-              return this.dbManager.clear(INDEXDB_STORE_NAME);
+              _context19.next = 6;
+              return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
+                return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+                  while (1) switch (_context18.prev = _context18.next) {
+                    case 0:
+                      _context18.next = 2;
+                      return _this11.dbManager.clear(INDEXDB_STORE_NAME);
+                    case 2:
+                    case "end":
+                      return _context18.stop();
+                  }
+                }, _callee18);
+              })));
             case 6:
               this.setStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY, '');
               this.core.effects.emit(OrderHooks.onOrdersChanged, this.store.list);
             case 8:
             case "end":
-              return _context16.stop();
+              return _context19.stop();
           }
-        }, _callee16, this);
+        }, _callee19, this);
       }));
       function clear() {
         return _clear.apply(this, arguments);
       }
       return clear;
-    }()
+    }())
   }]);
   return OrderModule;
 }(BaseModule);

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

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

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

@@ -127,6 +127,9 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculatePaymentTotal;
     private calculatePaidPaymentSummary;
     private calculatePaymentServiceFee;
+    private formatSummaryMetadataMoney;
+    private syncSummaryProductMetadata;
+    private calculateSummaryPaymentBalance;
     private getPaymentTargetAmount;
     ensureTempOrder(): OrderTempOrder;
     restoreOrder(): OrderTempOrder;

package/lib/modules/Order/index.js

@@ -696,6 +696,69 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const fixedAmount = new import_decimal.default(serviceCharge.amount || 0);
     return new import_decimal.default(payment.amount || 0).times(percentage).plus(fixedAmount);
   }
+  formatSummaryMetadataMoney(value) {
+    if (value === void 0 || value === null || value === "")
+      return void 0;
+    if (value instanceof import_decimal.default)
+      return value.toFixed(2);
+    return new import_decimal.default(String(value || 0)).toFixed(2);
+  }
+  syncSummaryProductMetadata(products) {
+    const moneyKeys = [
+      "main_product_attached_bundle_surcharge_fee",
+      "main_product_attached_bundle_tax_fee",
+      "surcharge_rounding_remainder",
+      "tax_fee_rounding_remainder"
+    ];
+    for (const product of products || []) {
+      const productRecord = product;
+      const metadata = productRecord.metadata && typeof productRecord.metadata === "object" ? { ...productRecord.metadata } : {};
+      let hasMetadataPatch = false;
+      for (const key of moneyKeys) {
+        const value = this.formatSummaryMetadataMoney(productRecord[key]);
+        if (value === void 0)
+          continue;
+        metadata[key] = value;
+        hasMetadataPatch = true;
+      }
+      if (Array.isArray(productRecord.relation_surcharge_ids)) {
+        metadata.relation_surcharge_ids = productRecord.relation_surcharge_ids;
+        hasMetadataPatch = true;
+      }
+      if (hasMetadataPatch)
+        productRecord.metadata = metadata;
+      if (!Array.isArray(productRecord.product_bundle))
+        continue;
+      for (const bundle of productRecord.product_bundle) {
+        const bundleRecord = bundle;
+        const bundleMetadata = bundleRecord.metadata && typeof bundleRecord.metadata === "object" ? { ...bundleRecord.metadata } : {};
+        let hasBundleMetadataPatch = false;
+        const bundleSurchargeFee = this.formatSummaryMetadataMoney(
+          bundleRecord.surcharge_fee
+        );
+        if (bundleSurchargeFee !== void 0) {
+          bundleMetadata.surcharge_fee = bundleSurchargeFee;
+          hasBundleMetadataPatch = true;
+        }
+        if (Array.isArray(bundleRecord.relation_surcharge_ids)) {
+          bundleMetadata.relation_surcharge_ids = bundleRecord.relation_surcharge_ids;
+          hasBundleMetadataPatch = true;
+        }
+        if (hasBundleMetadataPatch)
+          bundleRecord.metadata = bundleMetadata;
+      }
+    }
+  }
+  calculateSummaryPaymentBalance(params) {
+    const { tempOrder, summary, orderPaidAmount } = params;
+    const depositAmount = summary.deposit_amount || tempOrder.deposit_amount || "0.00";
+    const isDeposit = tempOrder.is_deposit === 1 || new import_decimal.default(depositAmount || 0).gt(0);
+    const targetAmount = isDeposit ? new import_decimal.default(depositAmount || 0) : new import_decimal.default(summary.total_amount || summary.expect_amount || 0);
+    return {
+      amountGap: import_decimal.default.max(0, targetAmount.minus(orderPaidAmount)).toFixed(2),
+      totalRefundAmount: import_decimal.default.max(0, orderPaidAmount.minus(targetAmount)).toFixed(2)
+    };
+  }
   getPaymentTargetAmount() {
     const tempOrder = this.ensureTempOrder();
     const summary = this.store.summary || (0, import_utils.createEmptySummary)();
@@ -941,16 +1004,21 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!tempOrder)
       return null;
     const salesSummary = this.getSalesSummary();
-    const existedSummary = this.store.summary || (0, import_utils.createEmptySummary)();
     const paidPaymentSummary = this.calculatePaidPaymentSummary(
       tempOrder.payments || []
     );
     if (!salesSummary) {
+      const paymentBalance2 = this.calculateSummaryPaymentBalance({
+        tempOrder,
+        summary: (0, import_utils.createEmptySummary)(),
+        orderPaidAmount: paidPaymentSummary.orderPaidAmount
+      });
       const emptySummary = {
         ...(0, import_utils.createEmptySummary)(),
-        total_refund_amount: existedSummary.total_refund_amount || "0.00",
+        total_refund_amount: paymentBalance2.totalRefundAmount,
         customer_paid_amount: paidPaymentSummary.customerPaidAmount.toFixed(2),
         order_paid_amount: paidPaymentSummary.orderPaidAmount.toFixed(2),
+        amount_gap: paymentBalance2.amountGap,
         pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
       };
       this.store.summary = emptySummary;
@@ -962,11 +1030,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       isPriceIncludeTax: tempOrder.is_price_include_tax,
       shopDiscount: tempOrder.shop_discount
     });
+    this.syncSummaryProductMetadata(tempOrder.products || []);
+    const paymentBalance = this.calculateSummaryPaymentBalance({
+      tempOrder,
+      summary: salesSummaryResult,
+      orderPaidAmount: paidPaymentSummary.orderPaidAmount
+    });
     const summary = {
       ...salesSummaryResult,
-      total_refund_amount: existedSummary.total_refund_amount || "0.00",
+      total_refund_amount: paymentBalance.totalRefundAmount,
       customer_paid_amount: paidPaymentSummary.customerPaidAmount.toFixed(2),
       order_paid_amount: paidPaymentSummary.orderPaidAmount.toFixed(2),
+      amount_gap: paymentBalance.amountGap,
       pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
     };
     this.store.summary = summary;
@@ -1189,9 +1264,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       payment
     });
     const tempOrder = this.ensureTempOrder();
-    const mapped = (0, import_utils.mapPaymentItemsToOrderPayments)([payment]);
+    const paymentRecord = payment;
+    const mapped = (0, import_utils.mapPaymentItemsToOrderPayments)([{
+      ...paymentRecord,
+      status: paymentRecord.status ?? "paid",
+      origin_amount: paymentRecord.origin_amount ?? paymentRecord.amount ?? "0.00"
+    }]);
     tempOrder.payments = [...tempOrder.payments || [], ...mapped];
     this.persistTempOrder();
+    void this.recalculateSummary({ createIfMissing: true }).catch((error) => {
+      this.logError("recalculate summary after addOrderPayment failed", {
+        error: error instanceof Error ? error.message : String(error)
+      });
+    });
     return tempOrder.payments;
   }
   /**

package/lib/modules/SalesSummary/utils.js

@@ -236,6 +236,7 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
       isChargeTax: product.is_charge_tax ?? 0
     });
     const mainTaxRounded = mainTaxPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
+    product.main_product_attached_bundle_tax_fee = mainTaxRounded.toFixed(2);
     if (mainTaxPrecise.gt(0)) {
       lastTaxableItem = { type: "main", item: product };
     }
@@ -258,15 +259,16 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
       const bundleQuantity = new import_decimal.default(getSafeNum(bundleItem.num ?? bundleItem.quantity));
       const bundlePrice = toDecimal(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
       const bundleOriginalPrice = toDecimal(bundleItem.original_price ?? bundleItem.product_price ?? bundleItem.price ?? 0);
+      const bundleSurchargeFee = toDecimal(bundleItem.surcharge_fee);
       const bundleTaxPrecise = calculateSingleItemTax({
-        price: bundlePrice,
+        price: bundlePrice.plus(bundleSurchargeFee),
         taxRate: rate,
         isPriceIncludeTax,
         isChargeTax: bundleItem.is_charge_tax ?? product.is_charge_tax ?? 0
       });
       const bundleTaxRounded = bundleTaxPrecise.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
       const bundleOrigTaxPrecise = calculateSingleItemTax({
-        price: bundleOriginalPrice,
+        price: bundleOriginalPrice.plus(bundleSurchargeFee),
         taxRate: rate,
         isPriceIncludeTax,
         isChargeTax: bundleItem.is_charge_tax ?? product.is_charge_tax ?? 0
@@ -332,7 +334,6 @@ function createEmptySalesSummary() {
   };
 }
 function calculateSalesSummary(params) {
-  var _a;
   const {
     products,
     isPriceIncludeTax,
@@ -379,7 +380,20 @@ function calculateSalesSummary(params) {
     ) || 0
   );
   for (let i = 0; i < products.length; i++) {
-    products[i].surcharge_fee = ((_a = surchargeServiceItems[i]) == null ? void 0 : _a.surcharge_fee) || 0;
+    const sourceItem = surchargeServiceItems[i] || {};
+    const product = products[i];
+    product.surcharge_fee = sourceItem.surcharge_fee || 0;
+    const relationSurchargeIds = Array.isArray(sourceItem.relation_surcharge_ids) ? sourceItem.relation_surcharge_ids : [];
+    const hasSurcharge = new import_decimal.default(product.surcharge_fee || 0).gt(0) || relationSurchargeIds.length > 0;
+    if (hasSurcharge) {
+      product.main_product_attached_bundle_surcharge_fee = toFixed2(product.surcharge_fee);
+    }
+    if (relationSurchargeIds.length > 0) {
+      product.relation_surcharge_ids = sourceItem.relation_surcharge_ids;
+    }
+    if (hasSurcharge && sourceItem.surcharge_rounding_remainder !== void 0) {
+      product.surcharge_rounding_remainder = sourceItem.surcharge_rounding_remainder;
+    }
   }
   const hasTaxRate = taxRate !== void 0 && taxRate !== null && taxRate > 0;
   let productTaxFee;

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

@@ -18,6 +18,7 @@ export declare class OrderModule extends BaseModule implements Module {
     private resourceIdIndex;
     private logger;
     private storage;
+    private orderSQLiteSaveQueue;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
@@ -130,6 +131,28 @@ export declare class OrderModule extends BaseModule implements Module {
     private getStorageItem;
     private setStorageItem;
     private loadOrdersFromSQLite;
+    /**
+     * 串行执行订单 SQLite 保存任务，保证 clear + bulkAdd 组合不会被其它订单保存插入。
+     *
+     * @example
+     * await this.runInOrderSQLiteSaveQueue(async () => {
+     *   await this.dbManager.clear(INDEXDB_STORE_NAME)
+     *   await this.dbManager.bulkAdd(INDEXDB_STORE_NAME, orders)
+     * })
+     */
+    private runInOrderSQLiteSaveQueue;
+    /**
+     * 保存订单列表到 SQLite，内部会先清空 orders 表再批量写入当前快照。
+     *
+     * @example
+     * await this.saveOrdersToSQLite(this.store.list)
+     */
     private saveOrdersToSQLite;
+    /**
+     * 清空订单模块的内存数据和本地 SQLite 订单表。
+     *
+     * @example
+     * await orderModule.clear()
+     */
     clear(): Promise<void>;
 }

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

@@ -50,6 +50,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.isIdlePhase = true;
     // Map<resource_id, OrderId[]> 资源到订单的倒排索引
     this.resourceIdIndex = /* @__PURE__ */ new Map();
+    this.orderSQLiteSaveQueue = Promise.resolve();
   }
   async initialize(core, options) {
     var _a, _b;
@@ -743,36 +744,67 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return [];
     }
   }
+  /**
+   * 串行执行订单 SQLite 保存任务，保证 clear + bulkAdd 组合不会被其它订单保存插入。
+   *
+   * @example
+   * await this.runInOrderSQLiteSaveQueue(async () => {
+   *   await this.dbManager.clear(INDEXDB_STORE_NAME)
+   *   await this.dbManager.bulkAdd(INDEXDB_STORE_NAME, orders)
+   * })
+   */
+  async runInOrderSQLiteSaveQueue(task) {
+    const queuedTask = this.orderSQLiteSaveQueue.then(task, task);
+    this.orderSQLiteSaveQueue = queuedTask.then(() => void 0, () => void 0);
+    return queuedTask;
+  }
+  /**
+   * 保存订单列表到 SQLite，内部会先清空 orders 表再批量写入当前快照。
+   *
+   * @example
+   * await this.saveOrdersToSQLite(this.store.list)
+   */
   async saveOrdersToSQLite(orderList) {
     if (!this.dbManager)
       return;
+    const orderListSnapshot = (0, import_lodash_es.cloneDeep)(orderList);
     try {
-      this.logInfo("saveOrdersToSQLite-开始", {
-        count: orderList.length
-      });
-      await this.dbManager.clear(INDEXDB_STORE_NAME);
-      this.logInfo("saveOrdersToSQLite-clear完成", {
-        count: orderList.length
-      });
-      if (orderList.length === 0)
-        return;
-      await this.dbManager.bulkAdd(INDEXDB_STORE_NAME, orderList);
-      this.logInfo("saveOrdersToSQLite-bulkAdd完成", {
-        count: orderList.length
+      await this.runInOrderSQLiteSaveQueue(async () => {
+        this.logInfo("saveOrdersToSQLite-开始", {
+          count: orderListSnapshot.length
+        });
+        await this.dbManager.clear(INDEXDB_STORE_NAME);
+        this.logInfo("saveOrdersToSQLite-clear完成", {
+          count: orderListSnapshot.length
+        });
+        if (orderListSnapshot.length === 0)
+          return;
+        await this.dbManager.bulkAdd(INDEXDB_STORE_NAME, orderListSnapshot);
+        this.logInfo("saveOrdersToSQLite-bulkAdd完成", {
+          count: orderListSnapshot.length
+        });
       });
     } catch (error) {
       this.logError("保存订单到 SQLite 失败", {
         error: error instanceof Error ? error.message : String(error),
-        orderList: orderList.length
+        orderList: orderListSnapshot.length
       });
     }
   }
+  /**
+   * 清空订单模块的内存数据和本地 SQLite 订单表。
+   *
+   * @example
+   * await orderModule.clear()
+   */
   async clear() {
     this.store.list = [];
     this.store.map = /* @__PURE__ */ new Map();
     this.resourceIdIndex.clear();
     if (this.dbManager) {
-      await this.dbManager.clear(INDEXDB_STORE_NAME);
+      await this.runInOrderSQLiteSaveQueue(async () => {
+        await this.dbManager.clear(INDEXDB_STORE_NAME);
+      });
     }
     this.setStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY, "");
     this.core.effects.emit(import_types.OrderHooks.onOrdersChanged, this.store.list);

package/package.json

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