@pisell/pisellos 1.0.66 → 1.0.68

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

@@ -3,6 +3,7 @@ import { BaseModule } from '../BaseModule';
 import { CartItem, CartModuleAPI, ECartItemCheckType, ECartItemInfoType, IAddItemParams, IUpdateItemParams } from './types';
 import { Account } from '../Account';
 export * from './types';
+export { getProductDeposit } from './utils';
 /**
  * 购物车模块实现
  */

package/dist/modules/Cart/index.js

@@ -29,6 +29,7 @@ import { createCartItemOrigin, deleteHolderFromCartItem, deleteRelationFormsFrom
 import { cloneDeep } from 'lodash-es';
 import { isNormalProduct } from "../Product/utils";
 export * from "./types";
+export { getProductDeposit } from "./utils";
 
 /**
  * 购物车模块实现

package/dist/modules/Date/index.js

@@ -267,6 +267,10 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
         if (!resource.times || !Array.isArray(resource.times) || !resource.start_time) {
           return resource;
         }
+        // 如果resource.advanced 为 null 或者 resource.advanced.unit 为 0，则不进行修正
+        if (!resource.advanced || resource.advanced.unit === 0) {
+          return resource;
+        }
         var resourceStartTime = dayjs(resource.start_time);
 
         // 过滤和修正时间段

package/dist/modules/Order/index.js

@@ -292,18 +292,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 bookings: [],
                 relation_products: [],
                 relation_forms: [],
-                payments: []
+                payments: [],
+                is_full_overwrite_flag: 1
               }, params);
               if ((_orderData$payments = orderData.payments) !== null && _orderData$payments !== void 0 && _orderData$payments.length) {
                 orderData.small_ticket_data_flag = 1;
               }
 
-              // 如果进来的order_id 是真实的，则不需要再传递 bookings 和 relation_products
-              if (params.order_id) {
-                orderData.bookings = [];
-                orderData.relation_products = [];
-              }
-
               // 兜底策略，如果是第一次下单，没有 order_id，且没有 schedule_date，则设置为当前时间
               if (!params.order_id && !orderData.schedule_date) {
                 orderData.schedule_date = dayjs().format('YYYY-MM-DD HH:mm:ss');
@@ -350,10 +345,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 调用后端接口
-              _context3.next = 11;
+              _context3.next = 10;
               return this.request.post('/order/checkout', orderData);
-            case 11:
+            case 10:
               response = _context3.sent;
+              this.logInfo('Order API called successfully', {
+                response: response
+              });
               console.log('[Order] 订单创建成功，后端响应:', {
                 success: !!response,
                 hasOrderId: !!(response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && _response$data.order_id || response !== null && response !== void 0 && response.order_id)
@@ -363,8 +361,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _context3.prev = 16;
               _context3.t0 = _context3["catch"](2);
               console.error('[Order] createOrderByCheckout 创建订单失败:', _context3.t0);
+              this.logInfo('Order API called failed', {
+                error: _context3.t0 instanceof Error ? _context3.t0.message : String(_context3.t0)
+              });
               throw _context3.t0;
-            case 20:
+            case 21:
             case "end":
               return _context3.stop();
           }

package/dist/modules/Payment/cashRecommendationAlgorithm.js

@@ -19,7 +19,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
  */
 export var CURRENCY_DENOMINATIONS = {
   // 美元
-  'USD': [100, 50, 20, 10, 5, 2, 1, 0.5, 0.25, 0.1, 0.05, 0.01],
+  'USD': [100, 50, 20, 10, 5, 1, 0.5, 0.25, 0.1, 0.05, 0.01],
   // 人民币
   'CNY': [100, 50, 20, 10, 5, 1, 0.5, 0.1, 0.05, 0.01],
   'RMB': [100, 50, 20, 10, 5, 1, 0.5, 0.1, 0.05, 0.01],

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

@@ -23,6 +23,7 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     private store;
     private dbManager;
     private logger;
+    protected otherParams: any;
     cash: CashPayment;
     eftpos: EftposPayment;
     wallet: WalletPassPayment;

package/dist/modules/Payment/index.js

@@ -85,6 +85,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     // IndexDBManager 实例
     _defineProperty(_assertThisInitialized(_this), "logger", void 0);
     // LoggerManager 实例
+    _defineProperty(_assertThisInitialized(_this), "otherParams", {});
     // 支付方式实例
     _defineProperty(_assertThisInitialized(_this), "cash", void 0);
     _defineProperty(_assertThisInitialized(_this), "eftpos", void 0);
@@ -104,34 +105,35 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.core = core;
               this.store = options.store;
+              this.otherParams = options.otherParams || {};
 
               // 获取依赖的插件
               this.request = core.getPlugin('request');
               appPlugin = core.getPlugin('app');
               if (this.request) {
-                _context.next = 6;
+                _context.next = 7;
                 break;
               }
               throw new Error('支付模块需要 request 插件支持');
-            case 6:
+            case 7:
               if (appPlugin) {
-                _context.next = 8;
+                _context.next = 9;
                 break;
               }
               throw new Error('支付模块需要 app 插件支持');
-            case 8:
+            case 9:
               this.app = appPlugin.getApp();
               this.dbManager = this.app.dbManager;
               this.logger = this.app.logger;
 
               // 确保支付模块所需的对象存储已创建
-              _context.next = 13;
+              _context.next = 14;
               return this.ensurePaymentTables();
-            case 13:
+            case 14:
               this.registerNetworkHandlers();
               console.log('[PaymentModule] 初始化完成');
               this.logInfo('PaymentModule initialized successfully');
-            case 16:
+            case 17:
             case "end":
               return _context.stop();
           }
@@ -148,6 +150,15 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "logInfo",
     value: function logInfo(title, metadata) {
+      var _this$otherParams;
+      if ((_this$otherParams = this.otherParams) !== null && _this$otherParams !== void 0 && _this$otherParams.fatherModule) {
+        var _this$otherParams2;
+        var fatherModule = this.core.getModule((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.fatherModule);
+        if (fatherModule) {
+          fatherModule.logInfo("".concat(title), metadata);
+          return;
+        }
+      }
       if (this.logger) {
         this.logger.addLog({
           type: 'info',
@@ -646,7 +657,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "createPaymentOrderAsync",
     value: (function () {
       var _createPaymentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
-        var existingOrders, existingOrder, originalOrder, newOrder;
+        var existingOrder, newOrder;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -656,19 +667,23 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               });
               _context7.prev = 1;
               _context7.next = 4;
-              return this.dbManager.getAll('order');
+              return this.dbManager.get('order', params.order_id);
             case 4:
-              existingOrders = _context7.sent;
-              existingOrder = existingOrders.find(function (order) {
-                return String(order.id) === String(params.order_id);
+              existingOrder = _context7.sent;
+              this.logInfo('createPaymentOrderAsync existingOrder', {
+                existingOrder: existingOrder
               });
+              // const existingOrder = existingOrders.find(
+              //   (order: PaymentOrder) => String(order.id) === String(params.order_id),
+              // );
               if (!existingOrder) {
-                _context7.next = 21;
+                _context7.next = 20;
                 break;
               }
               // 如果存在相同 order_id 的订单，更新该订单信息
-              console.log("[PaymentModule] \u53D1\u73B0\u91CD\u590D\u8BA2\u5355 ID: ".concat(params.order_id, "\uFF0C\u66F4\u65B0\u73B0\u6709\u652F\u4ED8\u8BA2\u5355"));
-              originalOrder = _objectSpread({}, existingOrder);
+              this.logInfo("createPaymentOrderAsync found duplicate order ID: ".concat(params.order_id, ", updating existing payment order"));
+
+              // const originalOrder = { ...existingOrder };
               existingOrder.order_info = params.order_info;
               existingOrder.total_amount = params.total_amount;
               existingOrder.is_deposit = params.is_deposit || 0;
@@ -678,14 +693,14 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               this.recalculateOrderAmount(existingOrder);
 
               // 更新到数据库
-              _context7.next = 16;
+              _context7.next = 15;
               return this.dbManager.update('order', existingOrder);
-            case 16:
-              _context7.next = 18;
+            case 15:
+              _context7.next = 17;
               return this.core.effects.emit(PaymentHooks.OnOrderUpdated, existingOrder);
-            case 18:
+            case 17:
               return _context7.abrupt("return", existingOrder);
-            case 21:
+            case 20:
               // 创建新的支付订单
               newOrder = {
                 uuid: getUniqueId('pay_order_'),
@@ -701,33 +716,31 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 is_deposit: params.is_deposit || 0,
                 deposit_amount: params.deposit_amount || '0.00'
               };
-              _context7.next = 24;
+              _context7.next = 23;
               return this.dbManager.add('order', newOrder);
-            case 24:
-              _context7.next = 26;
-              return this.core.effects.emit(PaymentHooks.OnOrderAdded, newOrder);
-            case 26:
+            case 23:
+              this.core.effects.emit(PaymentHooks.OnOrderAdded, newOrder);
               this.logInfo('createPaymentOrderAsync completed - new payment order created', {
                 orderUuid: newOrder.uuid,
                 orderId: newOrder.id
               });
               return _context7.abrupt("return", newOrder);
-            case 28:
-              _context7.next = 35;
+            case 26:
+              _context7.next = 33;
               break;
-            case 30:
-              _context7.prev = 30;
+            case 28:
+              _context7.prev = 28;
               _context7.t0 = _context7["catch"](1);
               console.error('[PaymentModule] 创建支付订单失败', _context7.t0);
               this.logError('createPaymentOrderAsync failed', _context7.t0, {
                 orderId: params.order_id
               });
               throw _context7.t0;
-            case 35:
+            case 33:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[1, 30]]);
+        }, _callee7, this, [[1, 28]]);
       }));
       function createPaymentOrderAsync(_x6) {
         return _createPaymentOrderAsync.apply(this, arguments);
@@ -799,35 +812,36 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             case 3:
               order = _context9.sent;
               if (!order) {
-                _context9.next = 12;
+                _context9.next = 13;
                 break;
               }
               updatedOrder = _objectSpread(_objectSpread({}, order), params);
-              _context9.next = 8;
+              this.recalculateOrderAmount(updatedOrder);
+              _context9.next = 9;
               return this.dbManager.update('order', updatedOrder);
-            case 8:
-              _context9.next = 10;
+            case 9:
+              _context9.next = 11;
               return this.core.effects.emit(PaymentHooks.OnOrderUpdated, updatedOrder);
-            case 10:
-              _context9.next = 12;
+            case 11:
+              _context9.next = 13;
               return this.core.effects.emit(PaymentHooks.OnOrderChanged, {
                 action: 'update',
                 order: updatedOrder,
                 originalOrder: order
               });
-            case 12:
-              _context9.next = 18;
+            case 13:
+              _context9.next = 19;
               break;
-            case 14:
-              _context9.prev = 14;
+            case 15:
+              _context9.prev = 15;
               _context9.t0 = _context9["catch"](0);
               console.error('[PaymentModule] 更新订单失败', _context9.t0);
               throw _context9.t0;
-            case 18:
+            case 19:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[0, 14]]);
+        }, _callee9, this, [[0, 15]]);
       }));
       function updateOrderAsync(_x8, _x9) {
         return _updateOrderAsync.apply(this, arguments);
@@ -1030,7 +1044,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "addPaymentItemAsync",
     value: (function () {
       var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderUuid, paymentItem) {
-        var _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, paymentUuid, newPaymentItem;
+        var _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, paidDepositAmount, expectedDepositAmount, warningMessage, paymentUuid, newPaymentItem;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -1051,6 +1065,34 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error("Order not found: ".concat(orderUuid));
             case 7:
+              // 🔒 支付锁检查：如果订单待付金额已经为0，不允许继续添加支付项
+              expectAmount = new Decimal(order.expect_amount);
+              paidDepositAmount = order.payment.reduce(function (sum, payment) {
+                if (payment.order_payment_type === 'deposit' && payment.status !== 'voided') {
+                  return sum.plus(new Decimal(payment.amount));
+                }
+                return sum;
+              }, new Decimal(0));
+              expectedDepositAmount = new Decimal(order.deposit_amount || '0').sub(paidDepositAmount); // 有一种特殊情况,订单金额为 0，但是定金金额>0，且此时是定金状态的，允许添加支付项
+              if (!(expectAmount.lte(0) && expectedDepositAmount.eq(0))) {
+                _context13.next = 15;
+                break;
+              }
+              warningMessage = "\u8BA2\u5355 ".concat(orderUuid, " \u5F85\u4ED8\u91D1\u989D\u5DF2\u4E3A0\uFF0C\u4E0D\u5141\u8BB8\u6DFB\u52A0\u65B0\u7684\u652F\u4ED8\u9879");
+              console.warn('[PaymentModule] Payment lock triggered:', {
+                orderUuid: orderUuid,
+                expectAmount: order.expect_amount,
+                attemptedPaymentAmount: paymentItem.amount,
+                attemptedPaymentCode: paymentItem.code,
+                reason: 'Order already fully paid'
+              });
+              this.logError('addPaymentItemAsync blocked by payment lock', new Error(warningMessage), {
+                orderUuid: orderUuid,
+                expectAmount: order.expect_amount,
+                paymentItem: paymentItem
+              });
+              throw new Error(warningMessage);
+            case 15:
               paymentUuid = getUniqueId('payment_');
               newPaymentItem = {
                 uuid: paymentUuid,
@@ -1073,15 +1115,15 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               };
               order.payment.push(newPaymentItem);
               this.recalculateOrderAmount(order);
-              _context13.next = 13;
+              _context13.next = 21;
               return this.dbManager.update('order', order);
-            case 13:
-              _context13.next = 15;
+            case 21:
+              _context13.next = 23;
               return this.core.effects.emit(PaymentHooks.OnPaymentAdded, {
                 orderUuid: orderUuid,
                 payment: newPaymentItem
               });
-            case 15:
+            case 23:
               this.logInfo('addPaymentItemAsync completed successfully', {
                 orderUuid: orderUuid,
                 paymentUuid: newPaymentItem.uuid,
@@ -1095,10 +1137,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 actualPaidAmount: (_newPaymentItem$metad2 = newPaymentItem.metadata) === null || _newPaymentItem$metad2 === void 0 ? void 0 : _newPaymentItem$metad2.actual_paid_amount,
                 changeGivenAmount: (_newPaymentItem$metad3 = newPaymentItem.metadata) === null || _newPaymentItem$metad3 === void 0 ? void 0 : _newPaymentItem$metad3.change_given_amount
               });
-              _context13.next = 23;
+              _context13.next = 31;
               break;
-            case 18:
-              _context13.prev = 18;
+            case 26:
+              _context13.prev = 26;
               _context13.t0 = _context13["catch"](1);
               console.error('[PaymentModule] 添加支付项失败', _context13.t0);
               this.logError('addPaymentItemAsync failed', _context13.t0, {
@@ -1106,11 +1148,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 paymentItem: paymentItem
               });
               throw _context13.t0;
-            case 23:
+            case 31:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[1, 18]]);
+        }, _callee13, this, [[1, 26]]);
       }));
       function addPaymentItemAsync(_x14, _x15) {
         return _addPaymentItemAsync.apply(this, arguments);
@@ -1257,9 +1299,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error("\u8BA2\u5355\u4E0D\u5B58\u5728: ".concat(orderUuid));
             case 7:
-              // 1. 查找所有现有的代金券类支付项（带 voucher_id 且状态不是 voided）
+              // 1. 查找所有现有的代金券类支付项（带 voucher_id 且状态不是 voided)并且还没有同步给后端
+              // 如果同步给了后端的voucher 不允许删除
               existingVoucherItems = order.payment.filter(function (payment) {
-                return payment.voucher_id && payment.status !== 'voided';
+                return payment.voucher_id && payment.status !== 'voided' && !payment.isSynced;
               });
               console.log('[PaymentModule] 发现现有代金券支付项:', {
                 orderUuid: orderUuid,
@@ -1269,7 +1312,8 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                     uuid: item.uuid,
                     code: item.code,
                     amount: item.amount,
-                    voucher_id: item.voucher_id
+                    voucher_id: item.voucher_id,
+                    isSynced: item.isSynced
                   };
                 })
               });
@@ -1771,7 +1815,8 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
           return sum;
         }
       }, new Decimal(0));
-      var remainingAmount = totalAmount.minus(paidAmount);
+      // 如果是定金模式，则使用deposit_amount 去减已付款金额
+      var remainingAmount = order.is_deposit === 1 ? new Decimal(order.deposit_amount).minus(paidAmount) : totalAmount.minus(paidAmount);
       order.expect_amount = Decimal.max(0, remainingAmount).toFixed(2);
       console.log("[PaymentModule] \u91CD\u65B0\u8BA1\u7B97\u8BA2\u5355\u91D1\u989D:", {
         orderUuid: order.uuid,
@@ -2001,7 +2046,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "roundAmountAsync",
     value: function () {
       var _roundAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(originalAmount, interval, rule) {
-        var amount, roundingInterval, supportedIntervals, intervalValue, baseValue, roundedValue, finalAmount, roundedAmountStr, originalAmountStr, roundingDifference, roundingDifferenceStr;
+        var amount, roundingInterval, supportedIntervals, intervalValue, baseValue, roundedValue, finalAmount, originalAmountStr, roundedAmountStr, roundingDifference, roundingDifferenceStr;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
@@ -2049,8 +2094,19 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             case 22:
               // 计算最终金额：roundedValue * interval
               finalAmount = roundedValue.mul(roundingInterval);
-              roundedAmountStr = finalAmount.toFixed(2);
-              originalAmountStr = amount.toFixed(2); // 计算舍入差额
+              originalAmountStr = amount.toFixed(2); // 如果最终金额是 0 元，则不采用舍入金额，返回原始金额
+              if (!finalAmount.eq(0)) {
+                _context26.next = 27;
+                break;
+              }
+              console.log("[PaymentModule] \u6700\u7EC8\u91D1\u989D\u4E3A0\uFF0C\u8FD4\u56DE\u539F\u59CB\u91D1\u989D: ".concat(originalAmountStr));
+              return _context26.abrupt("return", {
+                originalAmount: originalAmountStr,
+                roundedAmount: originalAmountStr,
+                roundingDifference: '0.00'
+              });
+            case 27:
+              roundedAmountStr = finalAmount.toFixed(2); // 计算舍入差额
               roundingDifference = finalAmount.sub(amount);
               roundingDifferenceStr = roundingDifference.toFixed(2);
               console.log("[PaymentModule] \u820D\u5165\u7ED3\u679C - \u539F\u59CB\u91D1\u989D: ".concat(originalAmountStr, ", \u820D\u5165\u540E\u91D1\u989D: ").concat(roundedAmountStr, ", \u820D\u5165\u5DEE\u989D: ").concat(roundingDifferenceStr));
@@ -2059,16 +2115,16 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 roundedAmount: roundedAmountStr,
                 roundingDifference: roundingDifferenceStr
               });
-            case 31:
-              _context26.prev = 31;
+            case 34:
+              _context26.prev = 34;
               _context26.t1 = _context26["catch"](0);
               console.error('[PaymentModule] 金额舍入失败:', _context26.t1);
               throw new Error("\u91D1\u989D\u820D\u5165\u5931\u8D25: ".concat(_context26.t1 instanceof Error ? _context26.t1.message : String(_context26.t1)));
-            case 35:
+            case 38:
             case "end":
               return _context26.stop();
           }
-        }, _callee26, this, [[0, 31]]);
+        }, _callee26, this, [[0, 34]]);
       }));
       function roundAmountAsync(_x28, _x29, _x30) {
         return _roundAmountAsync.apply(this, arguments);

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

@@ -129,6 +129,15 @@ export interface PaymentItem {
     origin_amount?: string;
     /** 订单支付类型 */
     order_payment_type?: 'normal' | 'deposit';
+    /** 本支付项是否已成功同步到后端 */
+    isSynced?: boolean;
+    /** 最近一次同步失败信息（存在则代表同步失败过） */
+    syncError?: {
+        error: string;
+        errorCode?: string;
+        statusCode?: number;
+        timestamp: number;
+    };
 }
 /**
  * 订单信息
@@ -614,6 +623,8 @@ export interface WalletDeductionRecommendParams {
         amount: number;
         tag: string;
     }[];
+    /** 订单ID */
+    payment_order_id?: string;
 }
 /**
  * 钱包初始化业务数据接口
@@ -626,6 +637,10 @@ export interface WalletInitBusinessData {
     amountInfo: {
         totalAmount: string;
         subTotal: string;
+        /** 是否是定金订单 */
+        isDeposit?: number;
+        /** 定金金额 */
+        depositAmount?: string;
     };
     /** 商品列表 */
     products: {
@@ -635,6 +650,8 @@ export interface WalletInitBusinessData {
         selling_price: number;
     }[];
     order_wait_pay_amount?: number;
+    /** 订单ID */
+    payment_order_id?: string;
 }
 /**
  * 查询用户识别码列表请求参数
@@ -652,6 +669,8 @@ export interface UserIdentificationCodeParams extends WalletDeductionRecommendPa
         amount: number;
         tag: string;
     }[];
+    /** 订单ID */
+    payment_order_id?: string;
 }
 /**
  * 钱包推荐扣款响应数据
@@ -703,6 +722,8 @@ export interface UserIdentificationCodeItem {
 export interface SearchIdentificationCodeParams extends WalletDeductionRecommendParams {
     /** 识别码 */
     code: string;
+    /** 订单ID */
+    payment_order_id?: string;
 }
 /**
  * 搜索识别码响应数据

package/dist/modules/Payment/walletpass.js

@@ -59,7 +59,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
       var customer_id = businessData.customer_id,
         amountInfo = businessData.amountInfo,
         products = businessData.products,
-        order_wait_pay_amount = businessData.order_wait_pay_amount;
+        order_wait_pay_amount = businessData.order_wait_pay_amount,
+        payment_order_id = businessData.payment_order_id;
 
       // 转换金额为数字类型
       var totalAmount = Number(amountInfo.totalAmount);
@@ -72,10 +73,11 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
         // 订单小计金额
         order_product_amount: subTotal,
         // 订单待支付金额
-        order_wait_pay_amount: order_wait_pay_amount || totalAmount,
+        order_wait_pay_amount: order_wait_pay_amount || (amountInfo !== null && amountInfo !== void 0 && amountInfo.isDeposit ? Number(amountInfo === null || amountInfo === void 0 ? void 0 : amountInfo.depositAmount) : totalAmount),
         // order_behavior_count_customer_id: 1,
         products: products,
-        prepare_payments: []
+        prepare_payments: [],
+        payment_order_id: payment_order_id
       };
 
       // 存储生成的参数到模块中
@@ -252,7 +254,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "getWalletPassRecommendListAsync",
     value: function () {
       var _getWalletPassRecommendListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-        var response;
+        var _this$walletParams, response;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -260,7 +262,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               this.paymentModule.logInfo('[WalletPass] 开始获取钱包推荐列表', {
                 customer_id: params.customer_id,
                 order_expect_amount: params.order_expect_amount,
-                sale_channel: params.sale_channel
+                sale_channel: params.sale_channel,
+                payment_order_id: (_this$walletParams = this.walletParams) === null || _this$walletParams === void 0 ? void 0 : _this$walletParams.payment_order_id
               });
               _context3.next = 4;
               return this.paymentModule.request.post('/machinecode/prepare/deduction/recommend', params // 将 params 作为请求体数据
@@ -315,7 +318,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "getUserIdentificationCodeListAsync",
     value: function () {
       var _getUserIdentificationCodeListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-        var _newParams$prepare_pa, newParams, response, sortedData;
+        var _newParams$prepare_pa, _this$walletParams2, newParams, response, sortedData;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -325,7 +328,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 customer_id: newParams.customer_id,
                 available: newParams.available,
                 prepare_payments_count: ((_newParams$prepare_pa = newParams.prepare_payments) === null || _newParams$prepare_pa === void 0 ? void 0 : _newParams$prepare_pa.length) || 0,
-                filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass
+                filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass,
+                payment_order_id: (_this$walletParams2 = this.walletParams) === null || _this$walletParams2 === void 0 ? void 0 : _this$walletParams2.payment_order_id
               });
               _context4.next = 5;
               return this.paymentModule.request.post('/machinecode/prepare/deduction', newParams);
@@ -406,9 +410,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               });
 
               // 检查识别码是否为9位且前3位为"000"
-              // const isWalletCode = code.length === 9 && code.startsWith('000');
-              // 测试环境先使用 WL
-              isWalletCode = code.startsWith('WL');
+              isWalletCode = code.length === 9 && code.startsWith('000'); // 测试环境先使用 WL
+              // const isWalletCode = code.startsWith('WL');
               if (!isWalletCode) {
                 _context5.next = 14;
                 break;
@@ -443,7 +446,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               baseWalletParams = this.walletParams; // 构建完整的搜索参数，包含钱包扣款推荐的所有参数
               searchParams = {
                 // 基础钱包参数
-                sale_channel: params.sale_channel || (baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.sale_channel),
+                sale_channel: params.sale_channel || (baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.sale_channel) || "pos",
                 customer_id: params.customer_id || (baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.customer_id),
                 order_expect_amount: params.order_expect_amount || (baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.order_expect_amount),
                 order_product_amount: params.order_product_amount || (baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.order_product_amount),
@@ -453,13 +456,15 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 prepare_payments: params.prepare_payments || (baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.prepare_payments),
                 multiple: 1,
                 // 搜索特有参数
-                code: params.code
+                code: params.code,
+                payment_order_id: baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.payment_order_id
               };
               this.paymentModule.logInfo('[WalletPass] 搜索普通识别码', {
                 code: searchParams.code,
                 customer_id: searchParams.customer_id,
                 order_expect_amount: searchParams.order_expect_amount,
-                multiple: searchParams.multiple
+                multiple: searchParams.multiple,
+                payment_order_id: baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.payment_order_id
               });
               _context5.next = 19;
               return this.paymentModule.request.post('/machinecode/prepare/deduction/search', searchParams);