@pisell/pisellos 2.2.192 → 2.2.194

package/dist/solution/BaseSales/index.js

@@ -589,7 +589,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     }()
     /**
      * 加载销售订单到统一 tempOrder 工作区。
-     * 有 app.sqlite 时优先读取本地记录；本地未命中或 forceRemote=true 时再拉云端。
+     * 统一通过 OrderModule 的 sales detail lookup 加载订单详情。
      *
      * 子类可在 `super.loadSalesDetail` 之后基于返回的 `sales` 做业务侧装配
      * （比如把 `sales.customer` 写入 CustomerModule、emit 业务 hook 等）。
@@ -598,7 +598,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadSalesDetail",
     value: (function () {
       var _loadSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(orderIdOrParams) {
-        var params, externalSaleNumber, localRecord, _sales, res, message, sales;
+        var _ref9, _params$orderId;
+        var params, externalSaleNumber, lookup, res, message, sales;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -612,102 +613,41 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 orderId: orderIdOrParams
               };
               externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
-              if (params.forceRemote) {
-                _context5.next = 35;
+              lookup = (_ref9 = (_params$orderId = params.orderId) !== null && _params$orderId !== void 0 ? _params$orderId : externalSaleNumber) !== null && _ref9 !== void 0 ? _ref9 : params.orderNumber;
+              if (!(lookup === undefined || lookup === null || lookup === '')) {
+                _context5.next = 7;
                 break;
               }
-              if (!(params.orderId !== undefined)) {
-                _context5.next = 11;
-                break;
-              }
-              _context5.next = 8;
-              return this.store.order.getLocalOrderByOrderId(params.orderId);
-            case 8:
-              _context5.t0 = _context5.sent;
-              _context5.next = 26;
-              break;
-            case 11:
-              if (!externalSaleNumber) {
-                _context5.next = 17;
-                break;
-              }
-              _context5.next = 14;
-              return this.store.order.getLocalOrderByExternalSaleNumber(externalSaleNumber);
-            case 14:
-              _context5.t1 = _context5.sent;
-              _context5.next = 25;
-              break;
-            case 17:
-              if (!params.orderNumber) {
-                _context5.next = 23;
-                break;
-              }
-              _context5.next = 20;
-              return this.store.order.getLocalOrderByOrderNumber(params.orderNumber);
-            case 20:
-              _context5.t2 = _context5.sent;
-              _context5.next = 24;
-              break;
-            case 23:
-              _context5.t2 = null;
-            case 24:
-              _context5.t1 = _context5.t2;
-            case 25:
-              _context5.t0 = _context5.t1;
-            case 26:
-              localRecord = _context5.t0;
-              if (!localRecord) {
-                _context5.next = 35;
-                break;
-              }
-              _context5.next = 30;
-              return this.store.order.hydrateTempOrderFromRecord(localRecord, {
-                recalcOnHydrate: false
-              });
-            case 30:
-              _sales = _context5.sent;
-              this.currentSalesDetail = _sales;
-              _context5.next = 34;
-              return this.core.effects.emit("".concat(this.name, ":onSalesOrderLoaded"), {
-                sales: _sales
+              throw new Error('加载销售详情需要 orderId、externalSaleNumber 或 orderNumber');
+            case 7:
+              _context5.next = 9;
+              return this.store.order.getSalesOrderByLookup({
+                lookup: lookup,
+                forceRemote: params.forceRemote
               });
-            case 34:
-              return _context5.abrupt("return", _sales);
-            case 35:
-              if (!(params.orderId === undefined || params.orderId === null)) {
-                _context5.next = 37;
-                break;
-              }
-              throw new Error('加载销售详情需要 orderId，或本地库中存在对应 externalSaleNumber/orderNumber');
-            case 37:
-              _context5.next = 39;
-              return this.store.order.getOrderInfoByRemote(Number(params.orderId));
-            case 39:
+            case 9:
               res = _context5.sent;
               if (!(!res || res.code !== 200)) {
-                _context5.next = 43;
+                _context5.next = 13;
                 break;
               }
-              message = res && (res.message || res.msg) || "\u52A0\u8F7D\u9500\u552E\u8BE6\u60C5\u5931\u8D25: ".concat(params.orderId);
+              message = res && (res.message || res.msg) || "\u52A0\u8F7D\u9500\u552E\u8BE6\u60C5\u5931\u8D25: ".concat(lookup);
               throw new Error(message);
-            case 43:
-              _context5.next = 45;
+            case 13:
+              _context5.next = 15;
               return this.store.order.hydrateTempOrderFromRecord(res.data, {
                 recalcOnHydrate: false
               });
-            case 45:
+            case 15:
               sales = _context5.sent;
-              _context5.next = 48;
-              return this.store.order.saveDraft();
-            case 48:
               this.currentSalesDetail = sales;
-              _context5.next = 51;
+              _context5.next = 19;
               return this.core.effects.emit("".concat(this.name, ":onSalesOrderLoaded"), {
                 sales: sales
               });
-            case 51:
+            case 19:
               return _context5.abrupt("return", sales);
-            case 52:
+            case 20:
             case "end":
               return _context5.stop();
           }
@@ -1192,6 +1132,24 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         return !historyIds.has(discount.id);
       })));
     }
+  }, {
+    key: "shouldSkipAutoApplyFetchedDiscountsInEditMode",
+    value: function shouldSkipAutoApplyFetchedDiscountsInEditMode(params) {
+      var _this6 = this;
+      if (params.discountAction !== 'edit') return false;
+      if (!params.products.length) return false;
+      var hasDraftProduct = params.products.some(function (product) {
+        return !_this6.isPersistedOrderProduct(product);
+      });
+      if (hasDraftProduct) return false;
+      var hasSelectedDiscount = params.currentDiscountList.some(function (discount) {
+        return discount.isSelected || discount.isEditMode || discount.isManualSelect;
+      });
+      if (hasSelectedDiscount) return false;
+      return !params.nextDiscountList.some(function (discount) {
+        return discount.isSelected || discount.isEditMode || discount.isManualSelect;
+      });
+    }
   }, {
     key: "mergeCurrentDiscountSelectionState",
     value: function mergeCurrentDiscountSelectionState(discountList, currentDiscountList) {
@@ -1222,7 +1180,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(params) {
         var _this$getOrderIdentit, _tempOrder$customer, _tempOrder$_extend, _tempOrder$_extend2, _discountModule$getDi, _discountModule$getOr, _discountModule$getDi2;
-        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, discountConfigCacheKey, preparedDiscountList, _discountModule$setOr, nextDiscountList, _tempOrder$holder, _tempOrder$holder2, _orderStore$summary, holders, result, _iterator, _step, _product$metadata2, _tempOrder$_extend3, _product$metadata3, _product$metadata$sou, _product$metadata4, _product$metadata5, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
+        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, discountConfigCacheKey, preparedDiscountList, _discountModule$setOr, nextDiscountList, shouldSkipAutoApplyFetchedDiscounts, _summary, _tempOrder$holder, _tempOrder$holder2, _orderStore$summary, holders, result, _iterator, _step, _product$metadata2, _tempOrder$_extend3, _product$metadata3, _product$metadata$sou, _product$metadata4, _product$metadata5, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
@@ -1285,8 +1243,38 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               _context12.next = 31;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
             case 31:
+              shouldSkipAutoApplyFetchedDiscounts = this.shouldSkipAutoApplyFetchedDiscountsInEditMode({
+                discountAction: discountAction,
+                products: tempOrder.products || [],
+                currentDiscountList: currentDiscountList,
+                nextDiscountList: nextDiscountList
+              });
+              if (!shouldSkipAutoApplyFetchedDiscounts) {
+                _context12.next = 40;
+                break;
+              }
+              _context12.next = 35;
+              return this.store.order.recalculateSummary({
+                createIfMissing: true
+              });
+            case 35:
+              _summary = _context12.sent;
+              this.store.order.persistTempOrder();
+              _context12.next = 39;
+              return this.effectsEmit('onDiscountApplied', {
+                productList: tempOrder.products || [],
+                discountList: nextDiscountList,
+                selectedDiscountList: tempOrder.discount_list || [],
+                tempOrder: tempOrder
+              });
+            case 39:
+              return _context12.abrupt("return", {
+                productList: tempOrder.products || [],
+                discountList: nextDiscountList
+              });
+            case 40:
               if (!rulesModule) {
-                _context12.next = 67;
+                _context12.next = 76;
                 break;
               }
               holders = (_tempOrder$holder = tempOrder.holder) !== null && _tempOrder$holder !== void 0 && _tempOrder$holder.form_record_id ? [{
@@ -1306,22 +1294,22 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.products = result.productList;
               }
               _iterator = _createForOfIteratorHelper(tempOrder.products || []);
-              _context12.prev = 36;
+              _context12.prev = 45;
               _iterator.s();
-            case 38:
+            case 47:
               if ((_step = _iterator.n()).done) {
-                _context12.next = 53;
+                _context12.next = 62;
                 break;
               }
               product = _step.value;
               productUid = (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.unique_identification_number;
               runtimeOrigin = productUid ? (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3[productUid]) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.origin : undefined;
               if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || (_product$metadata3 = product.metadata) !== null && _product$metadata3 !== void 0 && _product$metadata3.is_manual_discount)) {
-                _context12.next = 44;
+                _context12.next = 53;
                 break;
               }
-              return _context12.abrupt("continue", 51);
-            case 44:
+              return _context12.abrupt("continue", 60);
+            case 53:
               totalPerUnitDiscount = (product.discount_list || []).reduce(function (sum, pd) {
                 return sum + Number(pd.amount || 0);
               }, 0);
@@ -1337,58 +1325,58 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 mainPrice: newMainSellingPrice,
                 bundle: product.product_bundle
               });
-            case 51:
-              _context12.next = 38;
+            case 60:
+              _context12.next = 47;
               break;
-            case 53:
-              _context12.next = 58;
+            case 62:
+              _context12.next = 67;
               break;
-            case 55:
-              _context12.prev = 55;
-              _context12.t0 = _context12["catch"](36);
+            case 64:
+              _context12.prev = 64;
+              _context12.t0 = _context12["catch"](45);
               _iterator.e(_context12.t0);
-            case 58:
-              _context12.prev = 58;
+            case 67:
+              _context12.prev = 67;
               _iterator.f();
-              return _context12.finish(58);
-            case 61:
+              return _context12.finish(67);
+            case 70:
               if (!result.discountList) {
-                _context12.next = 67;
+                _context12.next = 76;
                 break;
               }
               nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context12.next = 66;
+              _context12.next = 75;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 66:
+            case 75:
               tempOrder.discount_list = nextDiscountList.filter(function (discount) {
                 return discount.isSelected;
               });
-            case 67:
-              _context12.next = 69;
+            case 76:
+              _context12.next = 78;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 69:
+            case 78:
               summary = _context12.sent;
               this.store.order.persistTempOrder();
-              _context12.next = 73;
+              _context12.next = 82;
               return this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList,
                 selectedDiscountList: tempOrder.discount_list || [],
                 tempOrder: tempOrder
               });
-            case 73:
+            case 82:
               return _context12.abrupt("return", {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList
               });
-            case 74:
+            case 83:
             case "end":
               return _context12.stop();
           }
-        }, _callee12, this, [[36, 55, 58, 61]]);
+        }, _callee12, this, [[45, 64, 67, 70]]);
       }));
       function loadDiscountConfig(_x7) {
         return _loadDiscountConfig.apply(this, arguments);
@@ -1853,7 +1841,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncPaymentsToOrder",
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(params) {
-        var _ref9, _params$businessCode, _this$otherParams10, _this$otherParams11, _params$channel;
+        var _ref10, _params$businessCode, _this$otherParams10, _this$otherParams11, _params$channel;
         var businessCode, channel, syncParams, syncState, payments, syncResult;
         return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
@@ -1864,7 +1852,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('order 模块未初始化');
             case 2:
-              businessCode = (_ref9 = (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.businessCode) !== null && _ref9 !== void 0 ? _ref9 : (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.business_code;
+              businessCode = (_ref10 = (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.businessCode) !== null && _ref10 !== void 0 ? _ref10 : (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.business_code;
               channel = (_params$channel = params.channel) !== null && _params$channel !== void 0 ? _params$channel : this.getSubmitOrderSalesChannel();
               syncParams = _objectSpread(_objectSpread(_objectSpread({}, params), businessCode !== undefined ? {
                 businessCode: businessCode
@@ -1948,11 +1936,17 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "addOrderPayment",
     value: function addOrderPayment(payment) {
       var _this$otherParams12,
-        _this6 = this;
+        _this7 = this;
       if (!this.store.order) throw new Error('order 模块未初始化');
       var paymentRecord = payment;
+      var paymentAmount = new Decimal(paymentRecord.amount || 0);
+      if (paymentAmount.isZero()) {
+        this.logWarning('addOrderPayment: 支付金额为 0，跳过添加支付项', {
+          payment: paymentRecord
+        });
+        return this.store.order.getOrderPayments();
+      }
       var metadata = paymentRecord.metadata && _typeof(paymentRecord.metadata) === 'object' ? _objectSpread({}, paymentRecord.metadata) : {};
-      debugger;
       var shopWalletPassId = (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.shop_wallet_pass_id;
       if (shopWalletPassId !== undefined && shopWalletPassId !== null) {
         metadata.shop_wallet_pass_id = shopWalletPassId;
@@ -1973,7 +1967,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           submitWhenPaid: true,
           smallTicketDataFlag: 1
         }).catch(function (error) {
-          _this6.logError('auto sync payments failed', {
+          _this7.logError('auto sync payments failed', {
             error: error instanceof Error ? error.message : String(error)
           });
         });
@@ -2065,7 +2059,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "initWalletData",
     value: function () {
       var _initWalletData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
-        var _params$order_wait_pa, _ref10, _tempOrder$is_price_i;
+        var _params$order_wait_pa, _ref11, _tempOrder$is_price_i;
         var snapshot, tempOrder, amount, walletBusinessData, result;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
@@ -2108,7 +2102,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 },
                 products: this.getWalletProductList(),
                 order_wait_pay_amount: (_params$order_wait_pa = params === null || params === void 0 ? void 0 : params.order_wait_pay_amount) !== null && _params$order_wait_pa !== void 0 ? _params$order_wait_pa : Number(amount.amountGap || 0),
-                is_price_include_tax: (_ref10 = (_tempOrder$is_price_i = tempOrder.is_price_include_tax) !== null && _tempOrder$is_price_i !== void 0 ? _tempOrder$is_price_i : this.otherParams.is_price_include_tax) !== null && _ref10 !== void 0 ? _ref10 : 1
+                is_price_include_tax: (_ref11 = (_tempOrder$is_price_i = tempOrder.is_price_include_tax) !== null && _tempOrder$is_price_i !== void 0 ? _tempOrder$is_price_i : this.otherParams.is_price_include_tax) !== null && _ref11 !== void 0 ? _ref11 : 1
               }, snapshot.identity.orderId ? {
                 payment_order_id: String(snapshot.identity.orderId)
               } : {});
@@ -2224,7 +2218,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "sendCustomerPayLink",
     value: (function () {
       var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(params) {
-        var orderIds, _ref11, _ref12, _submitResult$data$or, _submitResult$data, _submitResult$data2, submitResult, orderId;
+        var orderIds, _ref12, _ref13, _submitResult$data$or, _submitResult$data, _submitResult$data2, submitResult, orderId;
         return _regeneratorRuntime().wrap(function _callee22$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
             case 0:
@@ -2245,7 +2239,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 6:
               submitResult = _context22.sent;
-              orderId = (_ref11 = (_ref12 = (_submitResult$data$or = submitResult === null || submitResult === void 0 || (_submitResult$data = submitResult.data) === null || _submitResult$data === void 0 ? void 0 : _submitResult$data.order_id) !== null && _submitResult$data$or !== void 0 ? _submitResult$data$or : submitResult === null || submitResult === void 0 ? void 0 : submitResult.order_id) !== null && _ref12 !== void 0 ? _ref12 : submitResult === null || submitResult === void 0 || (_submitResult$data2 = submitResult.data) === null || _submitResult$data2 === void 0 ? void 0 : _submitResult$data2.id) !== null && _ref11 !== void 0 ? _ref11 : submitResult === null || submitResult === void 0 ? void 0 : submitResult.id;
+              orderId = (_ref12 = (_ref13 = (_submitResult$data$or = submitResult === null || submitResult === void 0 || (_submitResult$data = submitResult.data) === null || _submitResult$data === void 0 ? void 0 : _submitResult$data.order_id) !== null && _submitResult$data$or !== void 0 ? _submitResult$data$or : submitResult === null || submitResult === void 0 ? void 0 : submitResult.order_id) !== null && _ref13 !== void 0 ? _ref13 : submitResult === null || submitResult === void 0 || (_submitResult$data2 = submitResult.data) === null || _submitResult$data2 === void 0 ? void 0 : _submitResult$data2.id) !== null && _ref12 !== void 0 ? _ref12 : submitResult === null || submitResult === void 0 ? void 0 : submitResult.id;
               if (orderId) {
                 _context22.next = 10;
                 break;
@@ -2646,14 +2640,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setOtherParams",
     value: function () {
       var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
-        var _ref13,
-          _ref13$cover,
+        var _ref14,
+          _ref14$cover,
           cover,
           _args31 = arguments;
         return _regeneratorRuntime().wrap(function _callee31$(_context31) {
           while (1) switch (_context31.prev = _context31.next) {
             case 0:
-              _ref13 = _args31.length > 1 && _args31[1] !== undefined ? _args31[1] : {}, _ref13$cover = _ref13.cover, cover = _ref13$cover === void 0 ? false : _ref13$cover;
+              _ref14 = _args31.length > 1 && _args31[1] !== undefined ? _args31[1] : {}, _ref14$cover = _ref14.cover, cover = _ref14$cover === void 0 ? false : _ref14$cover;
               if (cover) {
                 this.otherParams = params;
               } else {

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -145,7 +145,6 @@ export function transformBaseProductToOrderProduct(params) {
     duration: payload.duration,
     policy_id: payload.policy_id,
     source_shop_id: payload.source_shop_id,
-    origin: origin,
     source_product_price: sourceProductPrice,
     main_product_selling_price: mainProductSellingPrice,
     main_product_original_price: mainProductOriginalPrice,

package/dist/solution/ScanOrder/index.js

@@ -2760,7 +2760,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               _context36.next = 67;
-              return (_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 ? void 0 : _this$store$order6.getOrderInfoByRemote(tempOrder.order_id);
+              return (_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 ? void 0 : _this$store$order6.getSalesOrderByLookup({
+                lookup: tempOrder.order_id
+              });
             case 67:
               res = _context36.sent;
               // 找到下单的时候输入的 entryPaxNumber

package/lib/model/strategy/adapter/walletPass/utils.js

@@ -346,7 +346,8 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     );
     const maxDeduction = import_decimal.default.min(
       new import_decimal.default(usageAmount),
-      new import_decimal.default(maxDeductionAmount)
+      new import_decimal.default(maxDeductionAmount),
+      remainingOrderAmount
     );
     let deductionLeft = maxDeduction;
     const deductionDetails = [];
@@ -488,7 +489,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
       });
       return;
     }
-    const usageAmount = typeof selectedVoucher.edit_current_amount === "number" ? selectedVoucher.edit_current_amount : getRecommendedAmount(selectedVoucher);
+    const usageAmount = typeof selectedVoucher.edit_current_amount === "number" ? selectedVoucher.edit_current_amount : selectedVoucher._available_max_amount ?? getRecommendedAmount(selectedVoucher);
     const maxDeduction = import_decimal.default.min(
       new import_decimal.default(usageAmount),
       new import_decimal.default(maxDeductionAmount),

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

@@ -13,7 +13,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private store;
     private request;
     private logger;
-    private dbManager;
     private window;
     private cacheId;
     private salesSummaryModuleName;
@@ -134,11 +133,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private ensureExternalSaleNumber;
     private ensureRequestUniqueIdempotencyToken;
     private buildPaymentSyncIdempotencyToken;
-    hasLocalDatabase(): boolean;
-    private buildLocalOrderRecord;
-    getLocalOrderByOrderId(orderId: number | string): Promise<Record<string, any> | null>;
-    getLocalOrderByOrderNumber(orderNumber: string): Promise<Record<string, any> | null>;
-    getLocalOrderByExternalSaleNumber(externalSaleNumber: string): Promise<Record<string, any> | null>;
     saveDraft(): Promise<void>;
     private saveDraftInBackground;
     private hydrateTempOrderFromLocalRecord;
@@ -147,8 +141,12 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculatePaymentTotal;
     private normalizePaymentSource;
     private updateTempOrderPaymentStatus;
+    private shouldKeepPaymentStatusAfterAmountRecalc;
+    private resolveWalletPassUseValue;
+    private capVoucherPaymentsByRemainingAmount;
     private calculatePaidPaymentSummary;
     private calculatePaymentServiceFee;
+    private calculatePaymentGapAmount;
     private formatSummaryMetadataMoney;
     private syncSummaryProductMetadata;
     private calculateSummaryAmountGap;
@@ -164,6 +162,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     addNewOrder(): Promise<OrderTempOrder>;
     getOrderProducts(): OrderProduct[];
     private getProductUid;
+    private sanitizeOrderProductForTempOrder;
+    private sanitizeTempOrderProducts;
     private ensureExtend;
     private captureProductRuntime;
     private createLinkedProductAndBooking;
@@ -245,7 +245,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * 提交当前 Sales tempOrder。
      *
      * smallTicketDataFlag 用于 B 端 checkout 小票数据返回。PaymentModal 在支付提交时
-     * 应传 1，确保 /order/sales/checkout 返回打印所需数据。
+     * 应传 1，确保 /shop/order/sales/checkout 返回打印所需数据。
      */
     submitTempOrder<T = any>(params?: {
         cacheId?: string;
@@ -287,7 +287,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * Checkout 专用：创建订单到后端
      *
      * 专门为 Checkout 模块设计的订单创建方法，
-     * 直接调用 /order/checkout 接口创建订单
+     * 通过 OS Server 调用 checkout 接口创建订单
      * 接收已经处理好的订单数据，无需再处理购物车
      *
      * @param params Checkout 订单参数（已处理的订单数据）
@@ -302,7 +302,10 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * OrderModule 只负责校验 order_ids 并调用 /order/batch-email。
      */
     sendCustomerPayLink<T = any>(params: SendCustomerPayLinkParams): Promise<T>;
-    getOrderInfoByRemote(order_id: number): Promise<any>;
+    getSalesOrderByLookup(params: {
+        lookup: number | string;
+        forceRemote?: boolean;
+    }): Promise<any>;
     /**
      * 把 sqlite / 后端返回的订单记录直接恢复为 tempOrder。
      *