@pisell/pisellos 1.0.88 → 1.0.90

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

@@ -107,10 +107,10 @@ export interface Discount {
     week_order_behavior_count?: number;
     month_order_behavior_count?: number;
     customer_order_behavior_count?: number;
-    num?: number;
     custom_schedule_snapshot?: {
         data: any[];
     };
+    num?: number;
 }
 export interface DiscountState {
     discountList: Discount[];

package/dist/modules/Order/utils.js

@@ -56,7 +56,7 @@ export var getAllDiscountList = function getAllDiscountList(cartItem) {
   var _cartItem$_origin, _cartItem$_origin2;
   var discountList = (cartItem === null || cartItem === void 0 || (_cartItem$_origin = cartItem._origin) === null || _cartItem$_origin === void 0 || (_cartItem$_origin = _cartItem$_origin.product) === null || _cartItem$_origin === void 0 ? void 0 : _cartItem$_origin.discount_list) || [];
   ((cartItem === null || cartItem === void 0 || (_cartItem$_origin2 = cartItem._origin) === null || _cartItem$_origin2 === void 0 || (_cartItem$_origin2 = _cartItem$_origin2.product) === null || _cartItem$_origin2 === void 0 ? void 0 : _cartItem$_origin2.product_bundle) || []).forEach(function (item) {
-    discountList = [].concat(_toConsumableArray(discountList), _toConsumableArray(item.discount_list));
+    discountList = [].concat(_toConsumableArray(discountList), _toConsumableArray(item.discount_list || []));
     item.discount_list = undefined;
   });
   return discountList;

package/dist/modules/Payment/index.js

@@ -634,7 +634,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:
@@ -723,7 +723,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', {
@@ -1054,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, paidDepositAmount, expectedDepositAmount, warningMessage, paymentUuid, newPaymentItem;
+        var _paymentItem$metadata, _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:
@@ -1065,16 +1065,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) {
@@ -1085,7 +1092,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               }, new Decimal(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");
@@ -1102,8 +1109,12 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 paymentItem: paymentItem
               });
               throw new Error(warningMessage);
-            case 15:
-              paymentUuid = getUniqueId('payment_');
+            case 17:
+              if ((_paymentItem$metadata = paymentItem.metadata) !== null && _paymentItem$metadata !== void 0 && _paymentItem$metadata.unique_payment_number) {
+                paymentUuid = paymentItem.metadata.unique_payment_number;
+              } else {
+                paymentUuid = getUniqueId('payment_');
+              }
               newPaymentItem = {
                 uuid: paymentUuid,
                 id: paymentItem.id || 0,
@@ -1125,15 +1136,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,
@@ -1147,10 +1163,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, {
@@ -1158,11 +1174,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

@@ -652,6 +652,7 @@ export interface WalletInitBusinessData {
     order_wait_pay_amount?: number;
     /** 订单ID */
     payment_order_id?: string;
+    is_price_include_tax: number;
 }
 /**
  * 查询用户识别码列表请求参数

package/dist/modules/Payment/walletpass.js

@@ -63,12 +63,14 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
         amountInfo = businessData.amountInfo,
         products = businessData.products,
         order_wait_pay_amount = businessData.order_wait_pay_amount,
-        payment_order_id = businessData.payment_order_id;
+        payment_order_id = businessData.payment_order_id,
+        is_price_include_tax = businessData.is_price_include_tax;
 
       // 转换金额为数字类型
       var totalAmount = Number(amountInfo.totalAmount);
       var subTotal = Number(amountInfo.subTotal);
       var walletParams = {
+        is_price_include_tax: is_price_include_tax,
         sale_channel: 'pos',
         customer_id: customer_id || 0,
         // 提供默认值，确保类型为 number

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/ProductList/index.js

@@ -129,9 +129,9 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 with_count: with_count,
                 // client_schedule_ids: schedule_ids,
                 schedule_date: schedule_date,
+                application_code: (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel,
                 with_schedule: with_schedule,
                 schedule_datetime: schedule_datetime,
-                application_code: (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel,
                 is_eject: 1
               }, {
                 useCache: true
@@ -140,17 +140,16 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               productsData = _context3.sent;
               sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
-              });
-              if (sortedList.length) {
-                sortedList.forEach(function (n) {
-                  if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {
-                    n.is_eject = 1;
-                  }
-                });
-              }
+              }); // if (sortedList.length) {
+              //   sortedList.forEach((n: any) => {
+              //     if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {
+              //       n.is_eject = 1
+              //     }
+              //   })
+              // }
               this.addProduct(sortedList);
               return _context3.abrupt("return", sortedList);
-            case 11:
+            case 10:
             case "end":
               return _context3.stop();
           }

package/dist/modules/Rules/index.js

@@ -24,7 +24,6 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
-import { RulesHooks } from "./types";
 import { uniqueById, getDiscountAmount, getDiscountListAmountTotal, getDiscountListAmount, filterDiscountListByBookingTime } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
 import Decimal from 'decimal.js';
@@ -74,7 +73,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.store.rulesList = rulesList;
               _context2.next = 3;
-              return this.core.effects.emit(RulesHooks.OnRulesListChange, rulesList);
+              return this.core.effects.emit("".concat(this.name, ":onRulesListChange"), rulesList);
             case 3:
             case "end":
               return _context2.stop();
@@ -143,10 +142,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 遍历处理后的产品列表，检查是否有产品使用了新折扣
       result.productList.forEach(function (product) {
         var _this2$hooks$getProdu = _this2.hooks.getProduct(product),
-          discount_list = _this2$hooks$getProdu.discount_list;
-        if (discount_list && discount_list.length > 0) {
+          discount_list = _this2$hooks$getProdu.discount_list,
+          bundle = _this2$hooks$getProdu.bundle;
+        var allDiscountList = _toConsumableArray(discount_list || []);
+        (bundle || []).forEach(function (item) {
+          allDiscountList.push.apply(allDiscountList, _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
+        });
+        if (allDiscountList && allDiscountList.length > 0) {
           // 检查是否有使用新折扣的情况
-          var usedNewDiscount = discount_list.some(function (discount) {
+          var usedNewDiscount = allDiscountList.some(function (discount) {
             var _discount$discount;
             return newDiscountIds.includes(discount === null || discount === void 0 || (_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id);
           });
@@ -418,7 +422,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct && isBundleAvailable && timeLimit) {
+          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
             var _discountApplicabilit, _discount$metadata;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -499,14 +503,18 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
-          var _product$discount_lis3;
+          var _product$discount_lis3, _product$discount_lis4;
           // 如果商品价格为 0，其实不需要使用任何优惠券，直接 return true
-          // 商品券时主商品价格小于等于0不可用
-          if ((Number(product.price) <= 0 || !product.price) && (discount.tag || discount.type) === 'good_pass') return false;
-          // 折扣卡时总价小于等于0时不可用
+          // 商品券时主商品价格为0不可用
           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);
@@ -546,12 +554,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 {
@@ -570,9 +578,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;
           })) {
@@ -580,8 +588,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           // bundle子商品：检查自己的 discount_list 或父主商品的 discount_list
           if (flatItem.type === 'bundle') {
-            var _product$discount_lis6, _flatItem$parentProdu;
-            if ((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.some(function (item) {
+            var _product$discount_lis7, _flatItem$parentProdu;
+            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$parentProdu = flatItem.parentProduct) !== null && _flatItem$parentProdu !== void 0 && (_flatItem$parentProdu = _flatItem$parentProdu.discount_list) !== null && _flatItem$parentProdu !== void 0 && _flatItem$parentProdu.some(function (item) {
@@ -593,9 +601,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;
@@ -606,8 +614,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           // bundle子商品：检查自己的 discount_list 或父主商品的 discount_list
           if (flatItem.type === 'bundle') {
-            var _product$discount_lis8, _flatItem$parentProdu2;
-            if ((_product$discount_lis8 = product.discount_list) !== null && _product$discount_lis8 !== void 0 && _product$discount_lis8.some(function (item) {
+            var _product$discount_lis9, _flatItem$parentProdu2;
+            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;
@@ -697,7 +705,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];
             // 标记优惠券为已使用
@@ -709,7 +717,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/solution/BookingByStep/index.js

@@ -31,7 +31,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { BaseModule } from "../../modules/BaseModule";
 import { createModule } from "./types";
 import { formatProductToCartItem, createCartItemOrigin, getUniqueId, handleVariantProduct, formatDateToCartItem, formatAccountToCartItem } from "../../modules/Cart/utils";
-import { getAvailableProductResources } from "./utils/products";
+import { getAvailableProductResources, isSessionProduct } from "./utils/products";
 import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getOthersSelectedResources, getOthersCartSelectedResources, filterScheduleByDateRange, checkSessionProductLeadTime, sortCombinedResources, filterResourcesByFormItem, checkTwoResourcesIntersection, isConflict } from "./utils/resources";
 import dayjs from 'dayjs';
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
@@ -238,19 +238,29 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: (function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date, res;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, schedule_date = _ref.schedule_date;
-              return _context2.abrupt("return", this.store.products.loadProducts({
+              _context2.next = 3;
+              return this.store.products.loadProducts({
                 category_ids: category_ids,
                 product_ids: product_ids,
                 collection: collection,
                 schedule_date: schedule_date,
                 cacheId: this.cacheId
-              }));
-            case 2:
+              });
+            case 3:
+              res = _context2.sent;
+              // 预拉取当天的资源数据
+              this.getAvailableDate({
+                startDate: schedule_date || dayjs().format('YYYY-MM-DD'),
+                endDate: schedule_date || dayjs().format('YYYY-MM-DD'),
+                products: _toConsumableArray(res)
+              });
+              return _context2.abrupt("return", res);
+            case 6:
             case "end":
               return _context2.stop();
           }
@@ -282,7 +292,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _loadProductByScheduleDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
         var _schedule$product_ids;
-        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, newProductIds, schedule, otherProductsIds, allProductIds;
+        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, newProductIds, schedule, otherProductsIds, allProductIds, res;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -329,8 +339,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 schedule_date: date
               });
             case 10:
-              return _context3.abrupt("return", _context3.sent);
-            case 11:
+              res = _context3.sent;
+              return _context3.abrupt("return", res);
+            case 12:
             case "end":
               return _context3.stop();
           }
@@ -1150,6 +1161,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var productData = _objectSpread(_objectSpread({}, origin), {}, {
         product_variant_id: product_variant_id
       });
+      debugger;
+      // 保护，如果进来的是 session 商品，则必须要有 date 和时间片，否则不允许添加
+      if (isSessionProduct(productData)) {
+        if (!date || !date.startTime || !date.endTime) {
+          return {
+            success: false,
+            errorCode: 'date_or_time_required'
+          };
+        }
+      }
 
       // 库存检测
       var currentCartItems = this.store.cart.getItems();

package/dist/solution/BookingByStep/utils/capacity.js

@@ -24,8 +24,9 @@ export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref) {
   if ((capacity === null || capacity === void 0 ? void 0 : capacity.type) === 'package') {
     return (product_bundle || []).map(function (d) {
       var id = d.bundle_product_id;
+      var variantId = d.bundle_variant_id;
       var item = ((capacity === null || capacity === void 0 ? void 0 : capacity.package) || []).find(function (item) {
-        return item.product_id === id;
+        return item.product_id === id || item.product_id === variantId;
       });
       return {
         id: id,

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

@@ -9,3 +9,9 @@ export declare const getAvailableProductResources: (products: ProductData[]) =>
     rules: any[];
     resourcesMap: Record<number, ProductResourceItem>;
 };
+/**
+ * 判断商品是否是 session 商品
+ * @param product 商品数据
+ * @returns 是否是 session 商品
+ */
+export declare const isSessionProduct: (product: ProductData) => boolean;

package/dist/solution/BookingByStep/utils/products.js

@@ -47,4 +47,14 @@ export var getAvailableProductResources = function getAvailableProductResources(
     rules: rules,
     resourcesMap: resourcesMap
   };
+};
+
+/**
+ * 判断商品是否是 session 商品
+ * @param product 商品数据
+ * @returns 是否是 session 商品
+ */
+export var isSessionProduct = function isSessionProduct(product) {
+  var _product$scheduleIds, _product$scheduleIds2;
+  return ((_product$scheduleIds = product === null || product === void 0 || (_product$scheduleIds2 = product['schedule.ids']) === null || _product$scheduleIds2 === void 0 ? void 0 : _product$scheduleIds2.length) !== null && _product$scheduleIds !== void 0 ? _product$scheduleIds : 0) > 0;
 };

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

@@ -48,6 +48,7 @@ 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;

package/dist/solution/Checkout/index.js

@@ -371,10 +371,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
       }
       return initializeCheckoutAsync;
     }())
+  }, {
+    key: "getHolderIdFromBooking",
+    value: function getHolderIdFromBooking(obj) {
+      var _obj$holder;
+      if (!obj) return undefined;
+      var ret = obj.holder_id || ((_obj$holder = obj.holder) === null || _obj$holder === void 0 ? void 0 : _obj$holder.form_record);
+      if (Array.isArray(ret)) {
+        return ret.length > 0 ? Number(ret[0]) : undefined;
+      }
+      return Number(ret) || undefined;
+    }
   }, {
     key: "getProductListByOrder",
     value: function getProductListByOrder() {
-      var _this$store$currentOr, _this$store$currentOr2;
+      var _this$store$currentOr,
+        _this3 = this,
+        _this$store$currentOr2;
       if (!this.store.currentOrder) {
         return [];
       }
@@ -396,12 +409,22 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             tax_fee: item.tax_fee,
             // 整个商品折扣后的总金额
             selling_price: item.calculated_selling_price,
+            // 使用者id
+            holder_id: item.holder_id,
             // 整个商品折扣前的总金额
             original_price: item.calculated_original_price,
             // 主商品折扣前金额，不包含套餐子商品
             main_product_original_price: item.price,
             // 主商品折扣后金额，不包含套餐子商品
             main_product_selling_price: item.main_product_selling_price,
+            metadata: {
+              // 主商品+非原价(加减价)子商品税费
+              "main_product_attached_bundle_tax_fee": item.metadata.main_product_attached_bundle_tax_fee,
+              // 主商品+非原价(加减价)子商品附加费
+              "main_product_attached_bundle_surcharge_fee": item.metadata.main_product_attached_bundle_surcharge_fee,
+              // 可选，附加费均摊舍入金额
+              "surcharge_rounding_remainder": item.metadata.surcharge_rounding_remainder
+            },
             product_bundle: item.product_bundle.map(function (bundle) {
               return {
                 bundle_id: bundle.bundle_id,
@@ -413,14 +436,24 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 bundle_sum_price: bundle.bundle_sum_price,
                 // 套餐子商品折扣后金额
                 bundle_selling_price: bundle.bundle_selling_price,
-                num: bundle.num
+                num: bundle.num,
+                is_charge_tax: bundle.is_charge_tax,
+                tax_fee: bundle.tax_fee,
+                metadata: {
+                  // 子商品单数量附加费
+                  "surcharge_fee": bundle.metadata.surcharge_fee,
+                  // 可选，附加费均摊舍入金额
+                  "surcharge_rounding_remainder": bundle.metadata.surcharge_rounding_remainder
+                }
               };
             })
           };
         }) || [];
       };
       var productList = formatProduct(((_this$store$currentOr = this.store.currentOrder.order_info) === null || _this$store$currentOr === void 0 || (_this$store$currentOr = _this$store$currentOr.original_order_data) === null || _this$store$currentOr === void 0 || (_this$store$currentOr = _this$store$currentOr.bookings) === null || _this$store$currentOr === void 0 ? void 0 : _this$store$currentOr.map(function (item) {
-        return item.product;
+        return _objectSpread(_objectSpread({}, item.product), {}, {
+          holder_id: _this3.getHolderIdFromBooking(item)
+        });
       })) || []);
       var relationProducts = formatProduct(((_this$store$currentOr2 = this.store.currentOrder.order_info) === null || _this$store$currentOr2 === void 0 || (_this$store$currentOr2 = _this$store$currentOr2.original_order_data) === null || _this$store$currentOr2 === void 0 ? void 0 : _this$store$currentOr2.relation_products) || []);
       return [].concat(_toConsumableArray(productList), _toConsumableArray(relationProducts));
@@ -456,7 +489,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   depositAmount: (_this$store$currentOr4 = this.store.currentOrder) === null || _this$store$currentOr4 === void 0 ? void 0 : _this$store$currentOr4.deposit_amount,
                   isDeposit: (_this$store$currentOr5 = this.store.currentOrder) === null || _this$store$currentOr5 === void 0 ? void 0 : _this$store$currentOr5.is_deposit
                 },
-                products: this.getProductListByOrder()
+                products: this.getProductListByOrder(),
+                is_price_include_tax: this.otherParams.is_price_include_tax
               }, params); // 判断订单是否已经同步，如果是则追加payment_order_id参数
               if (this.store.isOrderSynced) {
                 walletBusinessData.payment_order_id = (_this$store$currentOr6 = this.store.currentOrder) === null || _this$store$currentOr6 === void 0 ? void 0 : _this$store$currentOr6.order_id;
@@ -1566,7 +1600,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateVoucherPaymentItemsAsync",
     value: (function () {
       var _updateVoucherPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(voucherPaymentItems) {
-        var _this3 = this;
+        var _this4 = this;
         var paymentItems, allPaymentItemsSynced, remainingAmount, remainingValue, isOrderSynced, orderPaymentType, voucherPaymentItemsWithType, currentOrderId, isCurrentOrderReal, updatedOrder;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
@@ -1618,8 +1652,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
                 // 从 otherParams 获取 metadata 字段
                 var metadata = _objectSpread(_objectSpread({}, item.metadata), {}, {
-                  rounding_rule: _this3.otherParams.order_rounding_setting,
-                  shop_wallet_pass_id: _this3.otherParams.shop_wallet_pass_id
+                  rounding_rule: _this4.otherParams.order_rounding_setting,
+                  shop_wallet_pass_id: _this4.otherParams.shop_wallet_pass_id
                 });
                 return _objectSpread(_objectSpread({}, item), {}, {
                   order_payment_type: orderPaymentType,
@@ -3164,7 +3198,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateStateAmountToRemaining",
     value: (function () {
       var _updateStateAmountToRemaining = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36() {
-        var _this4 = this;
+        var _this5 = this;
         var checkOrder,
           _yield$this$fetchOrde3,
           paymentItems,
@@ -3215,8 +3249,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 depositPaidAmount = paymentItems.filter(function (item) {
                   return item.order_payment_type === 'deposit' && item.status !== 'voided';
                 }).reduce(function (sum, item) {
-                  // 如果是 wallet，并且还没同步到后端，则不计入这一部分金额
-                  if (item.voucher_id && !item.isSynced) {
+                  // 如果是 wallet，并且还没同步到后端，且此时还没有其他类型的支付项（现金，eftpos，标记支付）,不计入已付金额
+                  // 如果有其他支付项了，代表此时处于马上要同步的状态，所以计入
+                  if (item.voucher_id && !item.isSynced && paymentItems.filter(function (item) {
+                    return !item.voucher_id;
+                  }).length === 0) {
                     return sum;
                   }
                   var amount = new Decimal(item.amount || '0');
@@ -3257,7 +3294,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 hasStateChanged = true;
                 setTimeout(function () {
                   // 发出 stateAmount 变更事件
-                  _this4.core.effects.emit("".concat(_this4.name, ":onStateAmountChanged"), {
+                  _this5.core.effects.emit("".concat(_this5.name, ":onStateAmountChanged"), {
                     oldAmount: currentStateAmount,
                     newAmount: remainingAmount,
                     timestamp: Date.now(),
@@ -3278,7 +3315,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
                 // 发出 balanceDueAmount 变更事件
                 setTimeout(function () {
-                  _this4.core.effects.emit("".concat(_this4.name, ":onBalanceDueAmountChanged"), {
+                  _this5.core.effects.emit("".concat(_this5.name, ":onBalanceDueAmountChanged"), {
                     oldAmount: currentBalanceDueAmount,
                     newAmount: remainingAmount,
                     timestamp: Date.now(),
@@ -3576,7 +3613,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncOrderToBackendWithReturn",
     value: (function () {
       var _syncOrderToBackendWithReturn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39() {
-        var _this5 = this,
+        var _this6 = this,
           _this$store$currentOr23,
           _this$store$currentOr24,
           _this$store$currentCu2,
@@ -3657,8 +3694,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 var _item$metadata, _item$metadata2;
                 return _objectSpread(_objectSpread({}, item), {}, {
                   metadata: _objectSpread(_objectSpread({}, item.metadata), {}, {
-                    rounding_rule: ((_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.rounding_rule) || _this5.otherParams.order_rounding_setting,
-                    shop_wallet_pass_id: ((_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.shop_wallet_pass_id) || _this5.otherParams.shop_wallet_pass_id
+                    rounding_rule: ((_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.rounding_rule) || _this6.otherParams.order_rounding_setting,
+                    shop_wallet_pass_id: ((_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.shop_wallet_pass_id) || _this6.otherParams.shop_wallet_pass_id
                   })
                 });
               }); // 确定最终的定金金额：优先使用手动设置的值，否则从支付项中计算
@@ -4365,7 +4402,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "resetStoreState",
     value: function resetStoreState() {
-      var _this6 = this;
+      var _this7 = this;
       try {
         var prevOrderInfo = this.store.currentOrder ? {
           uuid: this.store.currentOrder.uuid,
@@ -4400,7 +4437,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
         // 使用 setTimeout 确保事件处理不会阻塞状态重置
         if (prevOrderInfo) {
           setTimeout(function () {
-            _this6.core.effects.emit("".concat(_this6.name, ":onOrderCleared"), {
+            _this7.core.effects.emit("".concat(_this7.name, ":onOrderCleared"), {
               previousOrder: prevOrderInfo,
               timestamp: Date.now()
             });

package/dist/solution/index.d.ts

@@ -2,5 +2,5 @@ export * from './BuyTickets';
 export * from './BookingByStep';
 export * from './BookingTicket';
 export * from './ShopDiscount';
-export * from './Checkout';
 export * from './RegisterAndLogin';
+export * from './Checkout';

package/dist/solution/index.js

@@ -2,5 +2,5 @@ export * from "./BuyTickets";
 export * from "./BookingByStep";
 export * from "./BookingTicket";
 export * from "./ShopDiscount";
-export * from "./Checkout";
-export * from "./RegisterAndLogin";
+export * from "./RegisterAndLogin";
+export * from "./Checkout";

package/lib/modules/Discount/types.d.ts

@@ -107,10 +107,10 @@ export interface Discount {
     week_order_behavior_count?: number;
     month_order_behavior_count?: number;
     customer_order_behavior_count?: number;
-    num?: number;
     custom_schedule_snapshot?: {
         data: any[];
     };
+    num?: number;
 }
 export interface DiscountState {
     discountList: Discount[];

package/lib/modules/Order/utils.js

@@ -60,7 +60,7 @@ var getAllDiscountList = (cartItem) => {
   var _a, _b, _c, _d;
   let discountList = ((_b = (_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.product) == null ? void 0 : _b.discount_list) || [];
   (((_d = (_c = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _c.product) == null ? void 0 : _d.product_bundle) || []).forEach((item) => {
-    discountList = [...discountList, ...item.discount_list];
+    discountList = [...discountList, ...item.discount_list || []];
     item.discount_list = void 0;
   });
   return discountList;

package/lib/modules/Payment/index.js

@@ -308,7 +308,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
    */
   async getPaymentOrderByUuidAsync(orderUuid) {
     try {
-      return await this.dbManager.get("order", orderUuid);
+      return await this.dbManager.get("order", orderUuid, true);
     } catch (error) {
       console.error("[PaymentModule] 获取支付订单失败", error);
       return null;
@@ -338,7 +338,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         deposit_amount: params.deposit_amount || "0.00"
       };
       const dbAddStartTime = Date.now();
-      await this.dbManager.add("order", newOrder);
+      await this.dbManager.add("order", newOrder, true);
       const dbAddDuration = Date.now() - dbAddStartTime;
       this.logInfo("Database add operation completed", {
         operation: "dbManager.add",
@@ -502,7 +502,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
    * 为某个订单添加支付项（新方法）
    */
   async addPaymentItemAsync(orderUuid, paymentItem) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     this.logInfo("Starting addPaymentItemAsync", {
       orderUuid,
       paymentAmount: paymentItem.amount,
@@ -510,7 +510,14 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       orderPaymentType: paymentItem.order_payment_type
     });
     try {
+      this.logInfo("准备获取订单", {
+        orderUuid
+      });
       const order = await this.getPaymentOrderByUuidAsync(orderUuid);
+      this.logInfo("获取订单信息成功", {
+        orderUuid,
+        order
+      });
       if (!order) {
         throw new Error(`Order not found: ${orderUuid}`);
       }
@@ -538,7 +545,12 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         });
         throw new Error(warningMessage);
       }
-      const paymentUuid = (0, import_utils.getUniqueId)("payment_");
+      let paymentUuid;
+      if ((_a = paymentItem.metadata) == null ? void 0 : _a.unique_payment_number) {
+        paymentUuid = paymentItem.metadata.unique_payment_number;
+      } else {
+        paymentUuid = (0, import_utils.getUniqueId)("payment_");
+      }
       const newPaymentItem = {
         uuid: paymentUuid,
         id: paymentItem.id || 0,
@@ -562,23 +574,30 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       };
       order.payment.push(newPaymentItem);
       this.recalculateOrderAmount(order);
-      await this.dbManager.update("order", order);
-      await this.core.effects.emit(`${this.name}:onPaymentAdded`, {
+      this.logInfo("开始更新订单支付项", {
+        orderUuid,
+        order
+      });
+      await this.dbManager.update("order", order, true);
+      this.logInfo("更新订单支付项完成", {
+        orderUuid
+      });
+      this.core.effects.emit(`${this.name}:onPaymentAdded`, {
         orderUuid,
         payment: newPaymentItem
       });
       this.logInfo("addPaymentItemAsync completed successfully", {
         orderUuid,
         paymentUuid: newPaymentItem.uuid,
-        uniquePaymentNumber: (_a = newPaymentItem.metadata) == null ? void 0 : _a.unique_payment_number,
+        uniquePaymentNumber: (_b = newPaymentItem.metadata) == null ? void 0 : _b.unique_payment_number,
         newExpectAmount: order.expect_amount,
         paymentAmount: newPaymentItem.amount,
         paymentCode: newPaymentItem.code,
         orderPaymentType: newPaymentItem.order_payment_type,
         metadataFields: Object.keys(newPaymentItem.metadata || {}),
         // 现金支付找零信息
-        actualPaidAmount: (_b = newPaymentItem.metadata) == null ? void 0 : _b.actual_paid_amount,
-        changeGivenAmount: (_c = newPaymentItem.metadata) == null ? void 0 : _c.change_given_amount
+        actualPaidAmount: (_c = newPaymentItem.metadata) == null ? void 0 : _c.actual_paid_amount,
+        changeGivenAmount: (_d = newPaymentItem.metadata) == null ? void 0 : _d.change_given_amount
       });
     } catch (error) {
       console.error("[PaymentModule] 添加支付项失败", error);

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

@@ -652,6 +652,7 @@ export interface WalletInitBusinessData {
     order_wait_pay_amount?: number;
     /** 订单ID */
     payment_order_id?: string;
+    is_price_include_tax: number;
 }
 /**
  * 查询用户识别码列表请求参数

package/lib/modules/Payment/walletpass.js

@@ -51,10 +51,18 @@ var WalletPassPaymentImpl = class {
    */
   generateWalletParams(businessData) {
     var _a;
-    const { customer_id, amountInfo, products, order_wait_pay_amount, payment_order_id } = businessData;
+    const {
+      customer_id,
+      amountInfo,
+      products,
+      order_wait_pay_amount,
+      payment_order_id,
+      is_price_include_tax
+    } = businessData;
     const totalAmount = Number(amountInfo.totalAmount);
     const subTotal = Number(amountInfo.subTotal);
     const walletParams = {
+      is_price_include_tax,
       sale_channel: "pos",
       customer_id: customer_id || 0,
       // 提供默认值，确保类型为 number

package/lib/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/lib/modules/ProductList/index.js

@@ -95,21 +95,14 @@ var ProductList = class extends import_BaseModule.BaseModule {
         with_count,
         // client_schedule_ids: schedule_ids,
         schedule_date,
+        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel,
         with_schedule,
         schedule_datetime,
-        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel,
         is_eject: 1
       },
       { useCache: true }
     );
     const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
-    if (sortedList.length) {
-      sortedList.forEach((n) => {
-        if (n.is_eject !== 1 && n["schedule.ids"] && n["schedule.ids"].length) {
-          n.is_eject = 1;
-        }
-      });
-    }
     this.addProduct(sortedList);
     return sortedList;
   }

package/lib/modules/Rules/index.js

@@ -33,7 +33,6 @@ __export(Rules_exports, {
 });
 module.exports = __toCommonJS(Rules_exports);
 var import_BaseModule = require("../BaseModule");
-var import_types = require("./types");
 var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
 var import_decimal = __toESM(require("decimal.js"));
@@ -53,7 +52,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   }
   async setRulesList(rulesList) {
     this.store.rulesList = rulesList;
-    await this.core.effects.emit(import_types.RulesHooks.OnRulesListChange, rulesList);
+    await this.core.effects.emit(`${this.name}:onRulesListChange`, rulesList);
   }
   getRulesList() {
     return this.store.rulesList;
@@ -96,9 +95,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     let hasApplicableDiscount = false;
     const newDiscountIds = newDiscountList.map((discount) => discount.id);
     result.productList.forEach((product) => {
-      const { discount_list } = this.hooks.getProduct(product);
-      if (discount_list && discount_list.length > 0) {
-        const usedNewDiscount = discount_list.some(
+      const { discount_list, bundle } = this.hooks.getProduct(product);
+      const allDiscountList = [...discount_list || []];
+      (bundle || []).forEach((item) => {
+        allDiscountList.push(...(item == null ? void 0 : item.discount_list) || []);
+      });
+      if (allDiscountList && allDiscountList.length > 0) {
+        const usedNewDiscount = allDiscountList.some(
           (discount) => {
             var _a;
             return newDiscountIds.includes((_a = discount == null ? void 0 : discount.discount) == null ? void 0 : _a.resource_id);
@@ -273,7 +276,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const isLimitedProduct = limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id);
         const isAvailableProduct = flatItem.type === "main" ? !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.tag || discount2.type)))) : !((flatItem == null ? void 0 : flatItem.booking_id) && ((_d = (_c = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _c.metadata) == null ? void 0 : _d.custom_product_bundle_map_id));
         const isBundleAvailable = this.checkPackageSubItemUsageRules(discount, flatItem);
-        if (isAvailableProduct && isLimitedProduct && isBundleAvailable && timeLimit) {
+        if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
           (_e = discountApplicability.get(discount.id)) == null ? void 0 : _e.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           const discountType = discount.tag || discount.type;
@@ -335,12 +338,15 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return;
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
-        var _a2;
-        if ((Number(product.price) <= 0 || !product.price) && (discount.tag || discount.type) === "good_pass")
-          return false;
+        var _a2, _b2;
         if ((Number(product.price) <= 0 || !product.price) && !((_a2 = product.discount_list) == null ? void 0 : _a2.find((n) => {
           var _a3;
           return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
+        })) && (discount.tag || discount.type) === "good_pass")
+          return false;
+        if ((Number(product.price) <= 0 || !product.price) && !((_b2 = product.discount_list) == null ? void 0 : _b2.find((n) => {
+          var _a3;
+          return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
         })) && (discount.tag || discount.type) !== "good_pass")
           return false;
         const targetUsedDiscounts = usedDiscounts.get(discount.id);

package/lib/solution/BookingByStep/index.js

@@ -185,13 +185,19 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     collection = [],
     schedule_date
   }) {
-    return this.store.products.loadProducts({
+    const res = await this.store.products.loadProducts({
       category_ids,
       product_ids,
       collection,
       schedule_date,
       cacheId: this.cacheId
     });
+    this.getAvailableDate({
+      startDate: schedule_date || (0, import_dayjs.default)().format("YYYY-MM-DD"),
+      endDate: schedule_date || (0, import_dayjs.default)().format("YYYY-MM-DD"),
+      products: [...res]
+    });
+    return res;
   }
   /**
    * 通过 schedule 来读取商品，适用于 session 类商品
@@ -228,11 +234,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const allProductIds = [...newProductIds, ...otherProductsIds].filter(
       (n, index, self) => self.indexOf(n) === index
     );
-    return await this.loadProducts({
+    const res = await this.loadProducts({
       product_ids: allProductIds,
       category_ids,
       schedule_date: date
     });
+    return res;
   }
   /**
    * 更新完商品数据、切换日期、或者在较后的流程里登录了，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
@@ -599,6 +606,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       quantity = 1
     } = product || {};
     const productData = { ...origin, product_variant_id };
+    debugger;
+    if ((0, import_products.isSessionProduct)(productData)) {
+      if (!date || !date.startTime || !date.endTime) {
+        return { success: false, errorCode: "date_or_time_required" };
+      }
+    }
     const currentCartItems = this.store.cart.getItems();
     const stockCheckResult = (0, import_stock.checkProductStock)({
       productData,

package/lib/solution/BookingByStep/utils/capacity.js

@@ -47,8 +47,9 @@ var formatDefaultCapacitys = ({
   if ((capacity == null ? void 0 : capacity.type) === "package") {
     return (product_bundle || []).map((d) => {
       const id = d.bundle_product_id;
+      const variantId = d.bundle_variant_id;
       const item = ((capacity == null ? void 0 : capacity.package) || []).find(
-        (item2) => item2.product_id === id
+        (item2) => item2.product_id === id || item2.product_id === variantId
       );
       return {
         id,

package/lib/solution/BookingByStep/utils/products.d.ts

@@ -9,3 +9,9 @@ export declare const getAvailableProductResources: (products: ProductData[]) =>
     rules: any[];
     resourcesMap: Record<number, ProductResourceItem>;
 };
+/**
+ * 判断商品是否是 session 商品
+ * @param product 商品数据
+ * @returns 是否是 session 商品
+ */
+export declare const isSessionProduct: (product: ProductData) => boolean;

package/lib/solution/BookingByStep/utils/products.js

@@ -19,7 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/solution/BookingByStep/utils/products.ts
 var products_exports = {};
 __export(products_exports, {
-  getAvailableProductResources: () => getAvailableProductResources
+  getAvailableProductResources: () => getAvailableProductResources,
+  isSessionProduct: () => isSessionProduct
 });
 module.exports = __toCommonJS(products_exports);
 var getAvailableProductResources = (products) => {
@@ -57,7 +58,12 @@ var getAvailableProductResources = (products) => {
   });
   return { resourceIds: [...new Set(resourceIds)], rules, resourcesMap };
 };
+var isSessionProduct = (product) => {
+  var _a;
+  return (((_a = product == null ? void 0 : product["schedule.ids"]) == null ? void 0 : _a.length) ?? 0) > 0;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getAvailableProductResources
+  getAvailableProductResources,
+  isSessionProduct
 });

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

@@ -48,6 +48,7 @@ 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;

package/lib/solution/Checkout/index.js

@@ -196,6 +196,16 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  getHolderIdFromBooking(obj) {
+    var _a;
+    if (!obj)
+      return void 0;
+    let ret = obj.holder_id || ((_a = obj.holder) == null ? void 0 : _a.form_record);
+    if (Array.isArray(ret)) {
+      return ret.length > 0 ? Number(ret[0]) : void 0;
+    }
+    return Number(ret) || void 0;
+  }
   getProductListByOrder() {
     var _a, _b, _c, _d, _e;
     if (!this.store.currentOrder) {
@@ -218,12 +228,22 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           tax_fee: item.tax_fee,
           // 整个商品折扣后的总金额
           selling_price: item.calculated_selling_price,
+          // 使用者id
+          holder_id: item.holder_id,
           // 整个商品折扣前的总金额
           original_price: item.calculated_original_price,
           // 主商品折扣前金额，不包含套餐子商品
           main_product_original_price: item.price,
           // 主商品折扣后金额，不包含套餐子商品
           main_product_selling_price: item.main_product_selling_price,
+          metadata: {
+            // 主商品+非原价(加减价)子商品税费
+            "main_product_attached_bundle_tax_fee": item.metadata.main_product_attached_bundle_tax_fee,
+            // 主商品+非原价(加减价)子商品附加费
+            "main_product_attached_bundle_surcharge_fee": item.metadata.main_product_attached_bundle_surcharge_fee,
+            // 可选，附加费均摊舍入金额
+            "surcharge_rounding_remainder": item.metadata.surcharge_rounding_remainder
+          },
           product_bundle: item.product_bundle.map((bundle) => {
             return {
               bundle_id: bundle.bundle_id,
@@ -235,13 +255,30 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
               bundle_sum_price: bundle.bundle_sum_price,
               // 套餐子商品折扣后金额
               bundle_selling_price: bundle.bundle_selling_price,
-              num: bundle.num
+              num: bundle.num,
+              is_charge_tax: bundle.is_charge_tax,
+              tax_fee: bundle.tax_fee,
+              metadata: {
+                // 子商品单数量附加费
+                "surcharge_fee": bundle.metadata.surcharge_fee,
+                // 可选，附加费均摊舍入金额
+                "surcharge_rounding_remainder": bundle.metadata.surcharge_rounding_remainder
+              }
             };
           })
         })
       ) || [];
     };
-    const productList = formatProduct(((_c = (_b = (_a = this.store.currentOrder.order_info) == null ? void 0 : _a.original_order_data) == null ? void 0 : _b.bookings) == null ? void 0 : _c.map((item) => item.product)) || []);
+    const productList = formatProduct(
+      ((_c = (_b = (_a = this.store.currentOrder.order_info) == null ? void 0 : _a.original_order_data) == null ? void 0 : _b.bookings) == null ? void 0 : _c.map(
+        (item) => {
+          return {
+            ...item.product,
+            holder_id: this.getHolderIdFromBooking(item)
+          };
+        }
+      )) || []
+    );
     const relationProducts = formatProduct(((_e = (_d = this.store.currentOrder.order_info) == null ? void 0 : _d.original_order_data) == null ? void 0 : _e.relation_products) || []);
     return [...productList, ...relationProducts];
   }
@@ -266,6 +303,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         isDeposit: (_e = this.store.currentOrder) == null ? void 0 : _e.is_deposit
       },
       products: this.getProductListByOrder(),
+      is_price_include_tax: this.otherParams.is_price_include_tax,
+      // core 有
       ...params
     };
     if (this.store.isOrderSynced) {
@@ -1988,7 +2027,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         const depositPaidAmount = paymentItems.filter(
           (item) => item.order_payment_type === "deposit" && item.status !== "voided"
         ).reduce((sum, item) => {
-          if (item.voucher_id && !item.isSynced) {
+          if (item.voucher_id && !item.isSynced && paymentItems.filter((item2) => !item2.voucher_id).length === 0) {
             return sum;
           }
           const amount = new import_decimal.default(item.amount || "0");

package/lib/solution/index.d.ts

@@ -2,5 +2,5 @@ export * from './BuyTickets';
 export * from './BookingByStep';
 export * from './BookingTicket';
 export * from './ShopDiscount';
-export * from './Checkout';
 export * from './RegisterAndLogin';
+export * from './Checkout';

package/lib/solution/index.js

@@ -20,14 +20,14 @@ __reExport(solution_exports, require("./BuyTickets"), module.exports);
 __reExport(solution_exports, require("./BookingByStep"), module.exports);
 __reExport(solution_exports, require("./BookingTicket"), module.exports);
 __reExport(solution_exports, require("./ShopDiscount"), module.exports);
-__reExport(solution_exports, require("./Checkout"), module.exports);
 __reExport(solution_exports, require("./RegisterAndLogin"), module.exports);
+__reExport(solution_exports, require("./Checkout"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./BuyTickets"),
   ...require("./BookingByStep"),
   ...require("./BookingTicket"),
   ...require("./ShopDiscount"),
-  ...require("./Checkout"),
-  ...require("./RegisterAndLogin")
+  ...require("./RegisterAndLogin"),
+  ...require("./Checkout")
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "1.0.88",
+  "version": "1.0.90",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",