@pisell/pisellos 0.0.371 → 0.0.373

package/dist/effects/index.d.ts

@@ -1,8 +1,8 @@
-type EffectCallback = (payload: any) => void | Promise<void | {
+declare type EffectCallback = (payload: any) => void | Promise<void | {
     status: boolean;
     message?: string;
 }>;
-type UnsubscribeFunction = () => void;
+declare type UnsubscribeFunction = () => void;
 declare class EffectsManager {
     private listeners;
     on(event: string, callback: EffectCallback): UnsubscribeFunction;

package/dist/model/strategy/type.d.ts

@@ -225,4 +225,4 @@ export interface EngineOptions {
 /**
  * 运算符处理器
  */
-export type OperatorHandler = (fieldValue: any, compareValue: any, rule: ConditionRule) => boolean;
+export declare type OperatorHandler = (fieldValue: any, compareValue: any, rule: ConditionRule) => boolean;

package/dist/modules/Customer/index.js

@@ -153,7 +153,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 skip: skip,
                 num: num,
                 sort_by: SORT_BY,
-                with: ['latestWalletDetail.wallet', 'contactsInfo'],
+                with: ['latestWalletDetail.wallet', 'contactsInfo', 'formRecord'],
                 search_wallet_flag: 1,
                 search_wallet_pass_flag: 1
               }, search && {

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

@@ -33,7 +33,7 @@ export interface ShopCustomer extends ICustomer {
  * walletDetails.wallet: 用户所有wallet
  * latestWalletDetail.wallet: 用户最新wallet
  */
-type CustomerWith = 'formRecord' | 'walletDetails.wallet' | 'latestWalletDetail.wallet';
+declare type CustomerWith = 'formRecord' | 'walletDetails.wallet' | 'latestWalletDetail.wallet';
 /**
  * 获取客户列表参数
  */

package/dist/modules/Payment/index.js

@@ -637,7 +637,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               _context6.prev = 0;
               _context6.next = 3;
-              return this.dbManager.get('order', orderUuid);
+              return this.dbManager.get('order', orderUuid, true);
             case 3:
               return _context6.abrupt("return", _context6.sent);
             case 6:
@@ -726,7 +726,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               }; // 🚀 性能监控：记录数据库添加操作耗时
               dbAddStartTime = Date.now();
               _context7.next = 6;
-              return this.dbManager.add('order', newOrder);
+              return this.dbManager.add('order', newOrder, true);
             case 6:
               dbAddDuration = Date.now() - dbAddStartTime;
               this.logInfo('Database add operation completed', {
@@ -1068,16 +1068,23 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 orderPaymentType: paymentItem.order_payment_type
               });
               _context13.prev = 1;
-              _context13.next = 4;
+              this.logInfo('准备获取订单', {
+                orderUuid: orderUuid
+              });
+              _context13.next = 5;
               return this.getPaymentOrderByUuidAsync(orderUuid);
-            case 4:
+            case 5:
               order = _context13.sent;
+              this.logInfo('获取订单信息成功', {
+                orderUuid: orderUuid,
+                order: order
+              });
               if (order) {
-                _context13.next = 7;
+                _context13.next = 9;
                 break;
               }
               throw new Error("Order not found: ".concat(orderUuid));
-            case 7:
+            case 9:
               // 🔒 支付锁检查：如果订单待付金额已经为0，不允许继续添加支付项
               expectAmount = new Decimal(order.expect_amount);
               paidDepositAmount = order.payment.reduce(function (sum, payment) {
@@ -1086,9 +1093,9 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 }
                 return sum;
               }, new Decimal(0));
-              expectedDepositAmount = new Decimal(order.deposit_amount || '0').sub(paidDepositAmount); // 有一种特殊情况,订单金额为 0，但是定金金额不等于0，且此时是定金状态的，允许添加支付项
+              expectedDepositAmount = new Decimal(order.deposit_amount || '0').sub(paidDepositAmount); // 有一种特殊情况,订单金额为 0，但是定金金额>0，且此时是定金状态的，允许添加支付项
               if (!(expectAmount.lte(0) && expectedDepositAmount.eq(0))) {
-                _context13.next = 15;
+                _context13.next = 17;
                 break;
               }
               warningMessage = "\u8BA2\u5355 ".concat(orderUuid, " \u5F85\u4ED8\u91D1\u989D\u5DF2\u4E3A0\uFF0C\u4E0D\u5141\u8BB8\u6DFB\u52A0\u65B0\u7684\u652F\u4ED8\u9879");
@@ -1105,7 +1112,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 paymentItem: paymentItem
               });
               throw new Error(warningMessage);
-            case 15:
+            case 17:
               if ((_paymentItem$metadata = paymentItem.metadata) !== null && _paymentItem$metadata !== void 0 && _paymentItem$metadata.unique_payment_number) {
                 paymentUuid = paymentItem.metadata.unique_payment_number;
               } else {
@@ -1132,15 +1139,20 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               };
               order.payment.push(newPaymentItem);
               this.recalculateOrderAmount(order);
-              _context13.next = 21;
-              return this.dbManager.update('order', order);
-            case 21:
-              _context13.next = 23;
-              return this.core.effects.emit("".concat(this.name, ":onPaymentAdded"), {
+              this.logInfo('开始更新订单支付项', {
+                orderUuid: orderUuid,
+                order: order
+              });
+              _context13.next = 24;
+              return this.dbManager.update('order', order, true);
+            case 24:
+              this.logInfo('更新订单支付项完成', {
+                orderUuid: orderUuid
+              });
+              this.core.effects.emit("".concat(this.name, ":onPaymentAdded"), {
                 orderUuid: orderUuid,
                 payment: newPaymentItem
               });
-            case 23:
               this.logInfo('addPaymentItemAsync completed successfully', {
                 orderUuid: orderUuid,
                 paymentUuid: newPaymentItem.uuid,
@@ -1154,10 +1166,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 = 31;
+              _context13.next = 34;
               break;
-            case 26:
-              _context13.prev = 26;
+            case 29:
+              _context13.prev = 29;
               _context13.t0 = _context13["catch"](1);
               console.error('[PaymentModule] 添加支付项失败', _context13.t0);
               this.logError('addPaymentItemAsync failed', _context13.t0, {
@@ -1165,11 +1177,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 paymentItem: paymentItem
               });
               throw _context13.t0;
-            case 31:
+            case 34:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[1, 26]]);
+        }, _callee13, this, [[1, 29]]);
       }));
       function addPaymentItemAsync(_x14, _x15) {
         return _addPaymentItemAsync.apply(this, arguments);

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

@@ -581,12 +581,12 @@ export declare enum PaymentHooks {
     OnOrderAmountChanged = "payment:onOrderAmountChanged",
     OnPaymentSyncError = "payment:onPaymentSyncError",
     OnPaymentSyncSuccess = "payment:onPaymentSyncSuccess",
-    OnWalletRecommendListUpdated = "wallet:onWalletRecommendListUpdated",
-    OnWalletRecommendListCleared = "wallet:onWalletRecommendListCleared",
-    OnUserIdentificationCodesUpdated = "wallet:onUserIdentificationCodesUpdated",
-    OnUserIdentificationCodesCleared = "wallet:onUserIdentificationCodesCleared",
-    OnWalletCacheCleared = "wallet:onWalletCacheCleared",
-    OnSearchIdentificationCodeCompleted = "wallet:onSearchIdentificationCodeCompleted"
+    OnWalletRecommendListUpdated = 0,
+    OnWalletRecommendListCleared = 0,
+    OnUserIdentificationCodesUpdated = 0,
+    OnUserIdentificationCodesCleared = 0,
+    OnWalletCacheCleared = 0,
+    OnSearchIdentificationCodeCompleted = 0
 }
 /**
  * 钱包推荐扣款请求参数
@@ -598,6 +598,8 @@ export interface WalletDeductionRecommendParams {
     expect_columns?: string[];
     /** 客户id */
     customer_id?: number;
+    /** 客户holder_id */
+    holder_id?: number;
     /** 订单总计金额 */
     order_expect_amount: number;
     /** 订单小计金额 */
@@ -616,6 +618,8 @@ export interface WalletDeductionRecommendParams {
         quantity: number;
         /** 商品使用了所有优惠后的最终价格 */
         selling_price: number;
+        /** 客户holder_id */
+        holder_id?: number;
     }[];
     /** 预备支付 */
     prepare_payments?: {
@@ -633,6 +637,10 @@ export interface WalletDeductionRecommendParams {
 export interface WalletInitBusinessData {
     /** 客户ID（可选） */
     customer_id?: number;
+    /** 客户 holder */
+    holder?: {
+        form_record: number[];
+    };
     /** 金额信息 */
     amountInfo: {
         totalAmount: string;
@@ -648,6 +656,7 @@ export interface WalletInitBusinessData {
         product_variant_id: string;
         quantity: number;
         selling_price: number;
+        holder_id?: number;
     }[];
     order_wait_pay_amount?: number;
     /** 订单ID */
@@ -740,7 +749,7 @@ export interface SearchIdentificationCodeResponse {
 /**
  * 搜索识别码结果类型
  */
-export type SearchIdentificationCodeResult = {
+export declare type SearchIdentificationCodeResult = {
     type: 'walletCode';
     data: SearchIdentificationCodeItem[];
 } | {

package/dist/modules/Payment/walletpass.js

@@ -63,8 +63,9 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
   }, {
     key: "generateWalletParams",
     value: function generateWalletParams(businessData) {
-      var _walletParams$product;
+      var _holder$form_record, _walletParams$product;
       var customer_id = businessData.customer_id,
+        holder = businessData.holder,
         amountInfo = businessData.amountInfo,
         products = businessData.products,
         order_wait_pay_amount = businessData.order_wait_pay_amount,
@@ -79,6 +80,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
         sale_channel: 'pos',
         customer_id: customer_id || 0,
         // 提供默认值，确保类型为 number
+        holder_id: (holder === null || holder === void 0 || (_holder$form_record = holder.form_record) === null || _holder$form_record === void 0 ? void 0 : _holder$form_record[0]) || undefined,
         order_expect_amount: totalAmount,
         // 订单小计金额
         order_product_amount: subTotal,
@@ -94,6 +96,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
       this.walletParams = walletParams;
       this.paymentModule.logInfo('[WalletPass] 钱包默认参数已生成并存储', {
         customer_id: walletParams.customer_id,
+        holder_id: walletParams.holder_id,
         order_expect_amount: walletParams.order_expect_amount,
         order_product_amount: walletParams.order_product_amount,
         order_wait_pay_amount: walletParams.order_wait_pay_amount,

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(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/dist/modules/Rules/index.js

@@ -587,7 +587,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
-          var _product$discount_lis3, _flatItem$parentProdu2, _flatItem$product2;
+          var _product$discount_lis3, _product$discount_lis4, _flatItem$parentProdu2, _flatItem$product2;
           // 🔥 检查策略可用性（针对 good_pass 和折扣卡）
           var discountType = discount.tag || discount.type;
           if (['good_pass', 'discount_card', 'product_discount_card'].includes(discountType)) {
@@ -600,12 +600,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 如果商品价格为 0，其实不需要使用任何优惠券，直接 return true
           // 商品券时主商品价格为0不可用
-          if ((Number(product.price) <= 0 || !product.price) && flatItem.type === 'main' && (discount.tag || discount.type) === 'good_pass') return false;
-
-          // 折扣卡时总价为0时不可用
-          if ((Number(product.total) <= 0 || !product.total) && !((_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.find(function (n) {
+          if ((Number(product.price) <= 0 || !product.price) && !((_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.find(function (n) {
             var _n$discount;
             return ((_n$discount = n.discount) === null || _n$discount === void 0 ? void 0 : _n$discount.resource_id) === discount.id;
+          })) && (discount.tag || discount.type) === 'good_pass') return false;
+
+          // 折扣卡商品价格为0时不可用
+          if ((Number(product.price) <= 0 || !product.price) && !((_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.find(function (n) {
+            var _n$discount2;
+            return ((_n$discount2 = n.discount) === null || _n$discount2 === void 0 ? void 0 : _n$discount2.resource_id) === discount.id;
           })) && (discount.tag || discount.type) !== 'good_pass') return false;
           // 如果优惠券已被使用，则跳过
           var targetUsedDiscounts = usedDiscounts.get(discount.id);
@@ -654,12 +657,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 如果是手动折扣，则不适用优惠券
         var isManualDiscount = false;
         if (flatItem.type === 'main') {
-          var _product$discount_lis4, _product7, _product7$every;
+          var _product$discount_lis5, _product7, _product7$every;
           // 主商品：判断自身是否手动折扣
           isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (product.bundle || []).every(function (item) {
             var _ref3;
             return !((_ref3 = item.discount_list || []) !== null && _ref3 !== void 0 && _ref3.length);
-          }) && (!((_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.length) || ((_product7 = product) === null || _product7 === void 0 || (_product7 = _product7.discount_list) === null || _product7 === void 0 || (_product7$every = _product7.every) === null || _product7$every === void 0 ? void 0 : _product7$every.call(_product7, function (item) {
+          }) && (!((_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.length) || ((_product7 = product) === null || _product7 === void 0 || (_product7 = _product7.discount_list) === null || _product7 === void 0 || (_product7$every = _product7.every) === null || _product7$every === void 0 ? void 0 : _product7$every.call(_product7, function (item) {
             return item.type === 'product';
           })));
         } else {
@@ -678,9 +681,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
         // 勾选时覆盖手动折扣
         if (options !== null && options !== void 0 && options.discountId) {
-          var _product$discount_lis5;
+          var _product$discount_lis6;
           // 主商品：检查自己的 discount_list
-          if (flatItem.type === 'main' && (_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.some(function (item) {
+          if (flatItem.type === 'main' && (_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.some(function (item) {
             var _item$discount;
             return ((_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) === options.discountId;
           })) {
@@ -688,8 +691,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           // bundle子商品：检查自己的 discount_list 或父主商品的 discount_list
           if (flatItem.type === 'bundle') {
-            var _product$discount_lis6, _flatItem$parentProdu3;
-            if ((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.some(function (item) {
+            var _product$discount_lis7, _flatItem$parentProdu3;
+            if ((_product$discount_lis7 = product.discount_list) !== null && _product$discount_lis7 !== void 0 && _product$discount_lis7.some(function (item) {
               var _item$discount2;
               return ((_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.resource_id) === options.discountId;
             }) || (_flatItem$parentProdu3 = flatItem.parentProduct) !== null && _flatItem$parentProdu3 !== void 0 && (_flatItem$parentProdu3 = _flatItem$parentProdu3.discount_list) !== null && _flatItem$parentProdu3 !== void 0 && _flatItem$parentProdu3.some(function (item) {
@@ -701,9 +704,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
         }
         if (options !== null && options !== void 0 && options.selectedList) {
-          var _product$discount_lis7;
+          var _product$discount_lis8;
           // 主商品：检查自己的 discount_list
-          if (flatItem.type === 'main' && (_product$discount_lis7 = product.discount_list) !== null && _product$discount_lis7 !== void 0 && _product$discount_lis7.some(function (item) {
+          if (flatItem.type === 'main' && (_product$discount_lis8 = product.discount_list) !== null && _product$discount_lis8 !== void 0 && _product$discount_lis8.some(function (item) {
             var _options$selectedList;
             return options === null || options === void 0 || (_options$selectedList = options.selectedList) === null || _options$selectedList === void 0 ? void 0 : _options$selectedList.some(function (n) {
               var _item$discount4;
@@ -714,8 +717,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           // bundle子商品：检查自己的 discount_list 或父主商品的 discount_list
           if (flatItem.type === 'bundle') {
-            var _product$discount_lis8, _flatItem$parentProdu4;
-            if ((_product$discount_lis8 = product.discount_list) !== null && _product$discount_lis8 !== void 0 && _product$discount_lis8.some(function (item) {
+            var _product$discount_lis9, _flatItem$parentProdu4;
+            if ((_product$discount_lis9 = product.discount_list) !== null && _product$discount_lis9 !== void 0 && _product$discount_lis9.some(function (item) {
               var _options$selectedList2;
               return options === null || options === void 0 || (_options$selectedList2 = options.selectedList) === null || _options$selectedList2 === void 0 ? void 0 : _options$selectedList2.some(function (n) {
                 var _item$discount5;
@@ -812,7 +815,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }));
           }
           for (var i = 0; i < splitCount; i++) {
-            var _product$discount_lis9, _originProduct, _selectedDiscount$met;
+            var _product$discount_lis10, _originProduct, _selectedDiscount$met;
             // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
             var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
@@ -824,7 +827,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 优先从 origin_total拿，可能会拿不到（比如用户端预约在没有配置 original_price 的情况下）
             var productOriginTotal = product.origin_total || product.total || 0;
             // 如果当前 product 有 discount_list，则先从 origin_total 拿
-            if ((_product$discount_lis9 = product.discount_list) !== null && _product$discount_lis9 !== void 0 && _product$discount_lis9.length && product.origin_total) {
+            if ((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.length && product.origin_total) {
               productOriginTotal = product.origin_total;
             }
             // 如果originProduct?._productInit?.original_price为 0，product.origin_total可能为空，此时取 product.total

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

@@ -28,7 +28,7 @@ export interface RulesModuleAPI {
         }[];
     }) => DiscountResult;
 }
-type ProductDetail = {
+declare type ProductDetail = {
     isClient?: boolean;
     isManualDiscount?: boolean;
     booking_id: any;
@@ -45,6 +45,7 @@ type ProductDetail = {
     quantity: number;
     vouchersApplicable?: boolean;
     startDate?: any;
+    holder_id?: number | string;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

package/dist/modules/Schedule/type.d.ts

@@ -1,4 +1,4 @@
-export type ScheduleItem = {
+export declare type ScheduleItem = {
     /** 颜色 */
     color: string;
     /** 创建时间 */
@@ -65,7 +65,7 @@ export type ScheduleItem = {
         schedule_id: number;
     }[];
 };
-export type ScheduleFormOtherValue = {
+export declare type ScheduleFormOtherValue = {
     /** 截止模式
      * 1: 永不截止
      * 2: 按日期截止
@@ -79,11 +79,11 @@ export type ScheduleFormOtherValue = {
     includeStatus: boolean;
     type: 'standard' | 'time-slots' | 'designation';
 };
-export type ExcIncDate = {
+export declare type ExcIncDate = {
     start: string;
     end: string;
 };
-export type ScheduleFormData = {
+export declare type ScheduleFormData = {
     /** 颜色 */
     color: string;
     /** 日程名称 */
@@ -131,20 +131,20 @@ export type ScheduleFormData = {
     start_time: any;
     end_time: any;
 };
-export type CalendarDataItem = {
+export declare type CalendarDataItem = {
     date: string;
     color: string[];
     isExcluded: boolean;
     schedule_ids?: number[];
     [key: string]: any;
 };
-export type RequestData<Data> = {
+export declare type RequestData<Data> = {
     data: Data;
     status: boolean;
     message: string;
     code: number;
 };
-export type ResponseListData<Data> = {
+export declare type ResponseListData<Data> = {
     status: boolean;
     message: string;
     code: number;

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

@@ -4,7 +4,7 @@ export interface ScheduleState {
     availabilityDateList: ScheduleAvailabilityDateItem[];
     otherProductsIds: number[];
 }
-export type ScheduleAvailabilityDateItem = {
+export declare type ScheduleAvailabilityDateItem = {
     date: string;
     schedule_id: number[];
     product_ids: number[];
@@ -24,7 +24,7 @@ export interface LoadScheduleAvailableDateParams {
 }
 export interface ScheduleModuleAPI {
 }
-export type ScheduleItem = {
+export declare type ScheduleItem = {
     /** 颜色 */
     color: string;
     /** 创建时间 */
@@ -91,7 +91,7 @@ export type ScheduleItem = {
         schedule_id: number;
     }[];
 };
-export type ScheduleFormOtherValue = {
+export declare type ScheduleFormOtherValue = {
     /** 截止模式
      * 1: 永不截止
      * 2: 按日期截止
@@ -105,11 +105,11 @@ export type ScheduleFormOtherValue = {
     includeStatus: boolean;
     type: 'standard' | 'time-slots' | 'designation';
 };
-export type ExcIncDate = {
+export declare type ExcIncDate = {
     start: string;
     end: string;
 };
-export type ScheduleFormData = {
+export declare type ScheduleFormData = {
     /** 颜色 */
     color: string;
     /** 日程名称 */
@@ -157,20 +157,20 @@ export type ScheduleFormData = {
     start_time: any;
     end_time: any;
 };
-export type CalendarDataItem = {
+export declare type CalendarDataItem = {
     date: string;
     color: string[];
     isExcluded: boolean;
     schedule_ids?: number[];
     [key: string]: any;
 };
-export type RequestData<Data> = {
+export declare type RequestData<Data> = {
     data: Data;
     status: boolean;
     message: string;
     code: number;
 };
-export type ResponseListData<Data> = {
+export declare type ResponseListData<Data> = {
     status: boolean;
     message: string;
     code: number;
@@ -181,7 +181,7 @@ export type ResponseListData<Data> = {
         skip: number;
     };
 };
-export type ScheduleAllMap = Record<string, {
+export declare type ScheduleAllMap = Record<string, {
     minTime: dayjs.Dayjs | null;
     maxTime: dayjs.Dayjs | null;
     minTimeStr: string | null;

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

@@ -308,7 +308,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -353,7 +353,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/BookingByStep/utils/resources.d.ts

@@ -6,7 +6,7 @@ import { CartItem, ProductData } from '../../../modules';
  * 3. 格式化资源相关 格式化资源列表 --> 格式化资源 --> 获取时间切片列表 --> 判断单个时间切片是否可用 formatResources
  *
  */
-type DateType = Dayjs;
+declare type DateType = Dayjs;
 export interface TimeSliceItem {
     start_time: string;
     end_time: string;

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

@@ -48,11 +48,13 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 初始化结账流程
      */
     initializeCheckoutAsync(params: CheckoutInitParams): Promise<void>;
+    getHolderIdFromBooking(obj: any): number | undefined;
     getProductListByOrder(): {
         product_id: number;
         product_variant_id: string;
         quantity: number;
         selling_price: number;
+        holder_id?: number;
     }[];
     initWalletData(params?: {
         order_wait_pay_amount: number;