@pisell/pisellos 2.2.192 → 2.2.194

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

@@ -494,7 +494,7 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     // ======================================================================================
 
     // 计算本次抵扣金额（使用同样的 usageAmount）
-    var maxDeduction = Decimal.min(new Decimal(usageAmount), new Decimal(maxDeductionAmount));
+    var maxDeduction = Decimal.min(new Decimal(usageAmount), new Decimal(maxDeductionAmount), remainingOrderAmount);
     var deductionLeft = maxDeduction;
     var deductionDetails = [];
     if (allowCrossProduct) {
@@ -677,6 +677,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
 
   // 第一步：按顺序应用已选中的券，计算实际抵扣
   selectedVouchers.forEach(function (selectedVoucher) {
+    var _selectedVoucher$_ava;
     var config = selectedVoucher.config,
       id = selectedVoucher.id;
     var maxDeductionAmount = config.maxDeductionAmount,
@@ -710,9 +711,11 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
       return;
     }
 
-    // 计算本次抵扣金额
-    // 优先使用用户手动编辑的金额，否则根据 deductTaxAndFee 配置获取推荐金额
-    var usageAmount = typeof selectedVoucher.edit_current_amount === 'number' ? selectedVoucher.edit_current_amount : getRecommendedAmount(selectedVoucher);
+    // 计算本次抵扣金额：
+    // - 用户手动编辑时以编辑金额为准；
+    // - 自动推荐/重算时沿用上一轮基于剩余待付金额算出的 _available_max_amount，
+    //   避免 recalculateVouchers 又回退到后端单券 recommended_usage_amount 造成超付。
+    var usageAmount = typeof selectedVoucher.edit_current_amount === 'number' ? selectedVoucher.edit_current_amount : (_selectedVoucher$_ava = selectedVoucher._available_max_amount) !== null && _selectedVoucher$_ava !== void 0 ? _selectedVoucher$_ava : getRecommendedAmount(selectedVoucher);
     var maxDeduction = Decimal.min(new Decimal(usageAmount), new Decimal(maxDeductionAmount), remainingOrderAmount);
     var deductionLeft = maxDeduction;
     var deductionDetails = [];

package/dist/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。
      *