@pisell/pisellos 1.0.67 → 1.0.69

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/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,9 +345,9 @@ 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
@@ -362,19 +357,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 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)
               });
               return _context3.abrupt("return", response);
-            case 17:
-              _context3.prev = 17;
+            case 16:
+              _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 22:
+            case 21:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[2, 17]]);
+        }, _callee3, this, [[2, 16]]);
       }));
       function createOrderByCheckout(_x4) {
         return _createOrderByCheckout.apply(this, arguments);

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.js

@@ -131,6 +131,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               return this.ensurePaymentTables();
             case 14:
               this.registerNetworkHandlers();
+
+              // // 预连接数据库
+              // this.dbManager.connect()
+
               console.log('[PaymentModule] 初始化完成');
               this.logInfo('PaymentModule initialized successfully');
             case 17:
@@ -657,7 +661,8 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "createPaymentOrderAsync",
     value: (function () {
       var _createPaymentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
-        var existingOrder, newOrder;
+        var _this3 = this;
+        var newOrder, dbAddStartTime, dbAddDuration;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -666,41 +671,41 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 totalAmount: params.total_amount
               });
               _context7.prev = 1;
-              _context7.next = 4;
-              return this.dbManager.get('order', params.order_id);
-            case 4:
-              existingOrder = _context7.sent;
-              this.logInfo('createPaymentOrderAsync existingOrder', {
-                existingOrder: existingOrder
-              });
+              // 检测是否有重复的 order_id
+              // console.time('createLocalOrderAsync: getExistingOrder')
+              // const existingOrder = await this.dbManager.get('order', params.order_id);
+              // const existingOrders = await this.dbManager.getAll('order');
               // const existingOrder = existingOrders.find(
               //   (order: PaymentOrder) => String(order.id) === String(params.order_id),
               // );
-              if (!existingOrder) {
-                _context7.next = 20;
-                break;
-              }
-              // 如果存在相同 order_id 的订单，更新该订单信息
-              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;
-              existingOrder.deposit_amount = params.deposit_amount || '0.00';
-
-              // 重新计算待付金额
-              this.recalculateOrderAmount(existingOrder);
-
-              // 更新到数据库
-              _context7.next = 15;
-              return this.dbManager.update('order', existingOrder);
-            case 15:
-              _context7.next = 17;
-              return this.core.effects.emit(PaymentHooks.OnOrderUpdated, existingOrder);
-            case 17:
-              return _context7.abrupt("return", existingOrder);
-            case 20:
+              // this.logInfo('createPaymentOrderAsync existingOrder', {
+              //   existingOrder
+              // });
+              // console.timeEnd('createLocalOrderAsync: getExistingOrder')
+              // const existingOrder = existingOrders.find(
+              //   (order: PaymentOrder) => String(order.id) === String(params.order_id),
+              // );
+              // if (existingOrder) {
+              //   // 如果存在相同 order_id 的订单，更新该订单信息
+              //   this.logInfo(
+              //     `createPaymentOrderAsync found duplicate order ID: ${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;
+              //   existingOrder.deposit_amount = params.deposit_amount || '0.00';
+              //   // 重新计算待付金额
+              //   this.recalculateOrderAmount(existingOrder);
+              //   // 更新到数据库
+              //   await this.dbManager.update('order', existingOrder);
+              //   // 触发更新事件
+              //   this.core.effects.emit(
+              //     `${this.name}:onOrderUpdated`,
+              //     existingOrder,
+              //   );
+              //   return existingOrder;
+              // } else {
               // 创建新的支付订单
               newOrder = {
                 uuid: getUniqueId('pay_order_'),
@@ -715,32 +720,37 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 tax_fee: '0.00',
                 is_deposit: params.is_deposit || 0,
                 deposit_amount: params.deposit_amount || '0.00'
-              };
-              _context7.next = 23;
+              }; // 🚀 性能监控：记录数据库添加操作耗时
+              dbAddStartTime = Date.now();
+              _context7.next = 6;
               return this.dbManager.add('order', newOrder);
-            case 23:
-              this.core.effects.emit(PaymentHooks.OnOrderAdded, newOrder);
-              this.logInfo('createPaymentOrderAsync completed - new payment order created', {
+            case 6:
+              dbAddDuration = Date.now() - dbAddStartTime;
+              this.logInfo('Database add operation completed', {
+                operation: 'dbManager.add',
+                table: 'order',
                 orderUuid: newOrder.uuid,
-                orderId: newOrder.id
+                orderId: newOrder.order_id,
+                duration: "".concat(dbAddDuration, "ms"),
+                performance: dbAddDuration > 100 ? 'slow' : dbAddDuration > 50 ? 'medium' : 'fast'
               });
+              setTimeout(function () {
+                _this3.core.effects.emit("".concat(_this3.name, ":onOrderAdded"), newOrder);
+              }, 0);
               return _context7.abrupt("return", newOrder);
-            case 26:
-              _context7.next = 33;
-              break;
-            case 28:
-              _context7.prev = 28;
+            case 12:
+              _context7.prev = 12;
               _context7.t0 = _context7["catch"](1);
               console.error('[PaymentModule] 创建支付订单失败', _context7.t0);
               this.logError('createPaymentOrderAsync failed', _context7.t0, {
                 orderId: params.order_id
               });
               throw _context7.t0;
-            case 33:
+            case 17:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[1, 28]]);
+        }, _callee7, this, [[1, 12]]);
       }));
       function createPaymentOrderAsync(_x6) {
         return _createPaymentOrderAsync.apply(this, arguments);
@@ -812,35 +822,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);
@@ -1043,7 +1054,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, expectAmount, warningMessage, 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:
@@ -1066,8 +1077,15 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             case 7:
               // 🔒 支付锁检查：如果订单待付金额已经为0，不允许继续添加支付项
               expectAmount = new Decimal(order.expect_amount);
-              if (!expectAmount.lte(0)) {
-                _context13.next = 13;
+              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");
@@ -1084,7 +1102,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 paymentItem: paymentItem
               });
               throw new Error(warningMessage);
-            case 13:
+            case 15:
               paymentUuid = getUniqueId('payment_');
               newPaymentItem = {
                 uuid: paymentUuid,
@@ -1107,15 +1125,15 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               };
               order.payment.push(newPaymentItem);
               this.recalculateOrderAmount(order);
-              _context13.next = 19;
-              return this.dbManager.update('order', order);
-            case 19:
               _context13.next = 21;
+              return this.dbManager.update('order', order);
+            case 21:
+              _context13.next = 23;
               return this.core.effects.emit(PaymentHooks.OnPaymentAdded, {
                 orderUuid: orderUuid,
                 payment: newPaymentItem
               });
-            case 21:
+            case 23:
               this.logInfo('addPaymentItemAsync completed successfully', {
                 orderUuid: orderUuid,
                 paymentUuid: newPaymentItem.uuid,
@@ -1129,10 +1147,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 = 29;
+              _context13.next = 31;
               break;
-            case 24:
-              _context13.prev = 24;
+            case 26:
+              _context13.prev = 26;
               _context13.t0 = _context13["catch"](1);
               console.error('[PaymentModule] 添加支付项失败', _context13.t0);
               this.logError('addPaymentItemAsync failed', _context13.t0, {
@@ -1140,11 +1158,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 paymentItem: paymentItem
               });
               throw _context13.t0;
-            case 29:
+            case 31:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[1, 24]]);
+        }, _callee13, this, [[1, 26]]);
       }));
       function addPaymentItemAsync(_x14, _x15) {
         return _addPaymentItemAsync.apply(this, arguments);
@@ -1291,9 +1309,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,
@@ -1303,7 +1322,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
                   };
                 })
               });
@@ -1798,14 +1818,15 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
           // 例如：amount=15, rounding_amount=-0.2，有效支付=15.2（抹掉0.2元零头）
           var paymentAmount = new Decimal(payment.amount || 0);
           var roundingAmount = new Decimal(payment.rounding_amount || 0);
-          var effectiveAmount = paymentAmount.plus(roundingAmount.abs());
+          var effectiveAmount = paymentAmount.plus(roundingAmount.isNegative() ? roundingAmount.abs() : 0);
           return sum.plus(effectiveAmount);
         } catch (error) {
           console.warn("[PaymentModule] \u65E0\u6548\u7684\u652F\u4ED8\u91D1\u989D: amount=".concat(payment.amount, ", rounding_amount=").concat(payment.rounding_amount, "\uFF0C\u8DF3\u8FC7\u8BA1\u7B97"));
           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,
@@ -1825,7 +1846,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             code: p.code,
             amount: p.amount,
             rounding_amount: p.rounding_amount || '0.00',
-            effective_amount: new Decimal(p.amount || 0).plus(new Decimal(p.rounding_amount || 0).abs()).toFixed(2)
+            effective_amount: new Decimal(p.amount || 0).plus(new Decimal(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || 0).abs()).toFixed(2)
           };
         }),
         说明: '有效支付金额包含抹零计算（amount + |rounding_amount|）'
@@ -2035,7 +2056,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:
@@ -2083,8 +2104,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));
@@ -2093,16 +2125,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);
@@ -452,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);

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/modules/Rules/index.js

@@ -536,7 +536,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           } else {
             arr.push(_this3.hooks.setProduct(originProduct, {
               discount_list: [discountDetail],
-              _id: product._id.split('___')[0] + "___" + _selectedDiscount.id + index,
+              _id: product._id.split('___')[0] + "___" + _selectedDiscount.id + "___" + index,
               price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
               quantity: isNeedSplit ? 1 : product.quantity,
               total: targetProductTotal,

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

@@ -111,7 +111,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态