@pisell/pisellos 0.0.132 → 0.0.135

package/dist/modules/Discount/index.js

@@ -206,7 +206,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
       }
       if (discount.appliedProductDetails) {
         return discount.appliedProductDetails.reduce(function (total, product) {
-          var price = new Decimal((product === null || product === void 0 ? void 0 : product.amount) || 0);
+          var price = new Decimal((product === null || product === void 0 ? void 0 : product.amount) || 0).mul((product === null || product === void 0 ? void 0 : product.num) || 1);
           return new Decimal(total).plus(price).toNumber();
         }, 0);
       }

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

@@ -27,6 +27,7 @@ interface ApplicableProductDetails {
     resource_id: number;
     title: string;
     original_amount: string;
+    num: number;
 }
 export interface Discount {
     id: number;

package/dist/modules/Rules/index.js

@@ -242,7 +242,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 编辑的商品 使用了优惠券不可用
           var isAvailableProduct = !(product !== null && product !== void 0 && product.booking_id && product !== null && product !== void 0 && (_product$discount_lis = product.discount_list) !== null && _product$discount_lis !== void 0 && _product$discount_lis.length && product !== null && product !== void 0 && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.every(function (discount) {
-            return discount.id && discount.type === 'good_pass';
+            return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.type);
           }));
 
           // 判断优惠券是否适用于该商品
@@ -261,7 +261,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 title: discount.format_title,
                 original_amount: product.origin_total,
                 pre_value: discount.par_value
-              }
+              },
+              num: product.num || 1
             });
             discountApplicableProducts.set(discount.id, applicableProducts);
           }
@@ -273,7 +274,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var _product$discount_lis3, _product$discount_lis4, _product$discount_lis5, _product$discount_lis6, _product$discount_lis7;
         var product = _this3.hooks.getProduct(originProduct);
         if (product !== null && product !== void 0 && product.booking_id && (_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.length && product !== null && product !== void 0 && (_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.every(function (discount) {
-          return discount.id && discount.type === 'good_pass';
+          return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.type);
         })) {
           processedProductsMap.set(product._id, originProduct);
           return;
@@ -358,7 +359,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             original_amount: product.price,
             product_id: selectedDiscount.product_id,
             percent: selectedDiscount.par_value
-          }
+          },
+          num: product.num || 1
         };
         appliedProducts.push(discountDetail);
         appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
@@ -388,7 +390,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
             price: new Decimal(targetProductPrice).toNumber(),
-            total: new Decimal(product.origin_total || product.total || 0).minus(new Decimal(product.price || 0)).toNumber(),
+            total: new Decimal(product.origin_total || product.total || 0).minus(new Decimal(product.price || 0).minus(new Decimal(targetProductPrice))).toNumber(),
             origin_total: product.origin_total || product.total
           }));
         }

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

@@ -37,6 +37,7 @@ type ProductDetail = {
     options?: any[];
     bundle?: any[];
     original_price?: number | string;
+    num?: number;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

package/dist/solution/BookingByStep/index.js

@@ -568,7 +568,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               _ref4 = productData || {}, bundle = _ref4.bundle, options = _ref4.options, origin = _ref4.origin, product_variant_id = _ref4.product_variant_id, _ref4$quantity = _ref4.quantity, quantity = _ref4$quantity === void 0 ? 1 : _ref4$quantity, rowKey = _ref4.rowKey; // 检查购物车里是否已经存在 rowKey相同的数据，如果是则更新数量
               cartItems = this.store.cart.getItems();
               if (!rowKey) {
-                _context8.next = 8;
+                _context8.next = 9;
                 break;
               }
               targetCartItem = cartItems.find(function (n) {
@@ -576,7 +576,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 return ((_n$_productOrigin = n._productOrigin) === null || _n$_productOrigin === void 0 ? void 0 : _n$_productOrigin.rowKey) === rowKey;
               });
               if (!(targetCartItem && isNormalProduct(targetCartItem._productOrigin))) {
-                _context8.next = 8;
+                _context8.next = 9;
                 break;
               }
               this.store.cart.updateItem({
@@ -584,8 +584,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 product: _objectSpread({}, targetCartItem._productOrigin),
                 quantity: (targetCartItem.num || 1) + quantity
               });
+              // 这里需要单独触发一个，购物车商品数量发生改变的 hook
+              this.core.effects.emit("".concat(this.store.cart.name, ":onUpdateCartItemNums"), {});
               return _context8.abrupt("return");
-            case 8:
+            case 9:
               product = _objectSpread(_objectSpread({}, origin), {}, {
                 product_variant_id: product_variant_id,
                 rowKey: rowKey
@@ -600,7 +602,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 addCartItem.account = activeAccount;
               }
               this.store.cart.addItem(addCartItem);
-            case 12:
+            case 13:
             case "end":
               return _context8.stop();
           }
@@ -1568,7 +1570,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         } else {
           var _cartItem$_productOri4, _this9$shopStore$get;
           var hasFlexibleDuration = ((_cartItem$_productOri4 = cartItem._productOrigin) === null || _cartItem$_productOri4 === void 0 || (_cartItem$_productOri4 = _cartItem$_productOri4.duration) === null || _cartItem$_productOri4 === void 0 ? void 0 : _cartItem$_productOri4.type) === 'flexible';
-          var operating_day_boundary = (_this9$shopStore$get = _this9.shopStore.get('core')) === null || _this9$shopStore$get === void 0 || (_this9$shopStore$get = _this9$shopStore$get.core) === null || _this9$shopStore$get === void 0 || (_this9$shopStore$get = _this9$shopStore$get.operating_day_boundary) === null || _this9$shopStore$get === void 0 ? void 0 : _this9$shopStore$get.time;
+          var operating_day_boundary = (_this9$shopStore$get = _this9.shopStore.get('core')) === null || _this9$shopStore$get === void 0 || (_this9$shopStore$get = _this9$shopStore$get.core) === null || _this9$shopStore$get === void 0 ? void 0 : _this9$shopStore$get.operating_day_boundary;
           productResources.forEach(function (item) {
             // 如果资源的 capacity 已经小于了当前需要的 capacity ，则需要把资源给过滤掉
             // 同时，在这一步尝试去拉一下时间片，基于商品的时长，看每个资源是否还有空余时间能对这个商品做服务，如果没有则过滤
@@ -2298,7 +2300,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var _item$_productOrigin17;
         return ((_item$_productOrigin17 = item._productOrigin) === null || _item$_productOrigin17 === void 0 || (_item$_productOrigin17 = _item$_productOrigin17.duration) === null || _item$_productOrigin17 === void 0 ? void 0 : _item$_productOrigin17.type) === 'flexible';
       });
-      var operating_day_boundary = (_this$shopStore$get = this.shopStore.get('core')) === null || _this$shopStore$get === void 0 || (_this$shopStore$get = _this$shopStore$get.core) === null || _this$shopStore$get === void 0 || (_this$shopStore$get = _this$shopStore$get.operating_day_boundary) === null || _this$shopStore$get === void 0 ? void 0 : _this$shopStore$get.time;
+      var operating_day_boundary = (_this$shopStore$get = this.shopStore.get('core')) === null || _this$shopStore$get === void 0 || (_this$shopStore$get = _this$shopStore$get.core) === null || _this$shopStore$get === void 0 ? void 0 : _this$shopStore$get.operating_day_boundary;
       var timeSlots = getTimeSlicesByResources({
         resourceIds: resourceIds,
         resourcesMap: resourcesMap,
@@ -2338,7 +2340,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       }, {});
 
       // 店铺营业结束时间
-      var operating_day_boundary = (_this$shopStore$get2 = this.shopStore.get('core')) === null || _this$shopStore$get2 === void 0 || (_this$shopStore$get2 = _this$shopStore$get2.core) === null || _this$shopStore$get2 === void 0 || (_this$shopStore$get2 = _this$shopStore$get2.operating_day_boundary) === null || _this$shopStore$get2 === void 0 ? void 0 : _this$shopStore$get2.time;
+      var operating_day_boundary = (_this$shopStore$get2 = this.shopStore.get('core')) === null || _this$shopStore$get2 === void 0 || (_this$shopStore$get2 = _this$shopStore$get2.core) === null || _this$shopStore$get2 === void 0 ? void 0 : _this$shopStore$get2.operating_day_boundary;
 
       // 处理每个账号的商品
       Object.values(itemsByAccount).forEach(function (accountItems) {
@@ -2363,7 +2365,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               var resourcesEndTime = targetResourceTimes.reduce(function (acc, curr) {
                 return dayjs(curr.end_at).isBefore(dayjs(acc.end_at)) ? curr : acc;
               }, targetResourceTimes[0]);
-              var endTime = dayjs(resourcesEndTime.end_at).isBefore(dayjs(operating_day_boundary)) ? resourcesEndTime.end_at : operating_day_boundary;
+
+              // 将 operating_day_boundary 转换为与 resourcesEndTime.end_at 相同日期的完整日期时间
+              var resourceDate = dayjs(resourcesEndTime.end_at).format('YYYY-MM-DD');
+              var operatingBoundaryDateTime = "".concat(resourceDate, " ").concat(operating_day_boundary.type === 'start_time' ? "23:59" : operating_day_boundary.time);
+              var endTime = dayjs(resourcesEndTime.end_at).isBefore(dayjs(operatingBoundaryDateTime)) ? resourcesEndTime.end_at : operatingBoundaryDateTime;
               // 修复：如果 endTime 只是时间格式（如 "17:00"），需要加上日期
               var formattedEndTime;
               if (typeof endTime === 'string' && endTime.includes(':') && !endTime.includes(' ') && !endTime.includes('T')) {
@@ -2626,6 +2632,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             options: targetCartItem._optionsOrigin,
             quantity: (targetCartItem.num || 1) + quantity
           });
+          // 这里需要单独触发一个，购物车商品数量发生改变的 hook
+          this.core.effects.emit("".concat(this.store.cart.name, ":onUpdateCartItemNums"), {});
           return;
         }
       }

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

@@ -97,7 +97,10 @@ export declare const getTimeSlicesByResource: ({ resource, duration, split, curr
         } | undefined;
     } | undefined;
     hasFlexibleDuration?: boolean | undefined;
-    operating_day_boundary?: string | undefined;
+    operating_day_boundary?: {
+        type: string;
+        time: string;
+    } | undefined;
 }) => TimeSliceItem[];
 /**
  * @title: 获取时间切片列表的交集
@@ -154,7 +157,10 @@ export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, dur
         } | undefined;
     } | undefined;
     hasFlexibleDuration?: boolean | undefined;
-    operating_day_boundary?: string | undefined;
+    operating_day_boundary?: {
+        type: string;
+        time: string;
+    } | undefined;
 }) => any[];
 /**
  * @title: 获取其他人的已选资源

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

@@ -463,7 +463,8 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
       }
       if (_status.usable) {
         // 如果有hasFlexibleDuration，且timeSlice.start_at 大于等于operating_day_boundary，则不添加时间切片
-        if (hasFlexibleDuration && operating_day_boundary && timeSlice.start_time >= operating_day_boundary) {
+        var operatingBoundaryDateTime = (operating_day_boundary === null || operating_day_boundary === void 0 ? void 0 : operating_day_boundary.type) === 'start_time' ? "23:59" : operating_day_boundary === null || operating_day_boundary === void 0 ? void 0 : operating_day_boundary.time;
+        if (hasFlexibleDuration && operating_day_boundary && timeSlice.start_time >= (operatingBoundaryDateTime || "23:59")) {
           break;
         }
         // 添加时间切片  09:00 ~ 10:00   09:20 ~ 10:20   09:00 ~ 10:00   09:20 ~ 10:20  11:00 ~ 12:00   11:20 ~ 12:20

package/dist/solution/ShopDiscount/index.js

@@ -434,7 +434,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       productList.forEach(function (item) {
         if (item.booking_id) {
           (item.discount_list || []).forEach(function (discount) {
-            if (discount.id && discount.type === 'good_pass') {
+            if (discount.id && ['good_pass', 'discount_card'].includes(discount.type)) {
               var _discount$discount, _discount$discount2, _discount$discount3;
               editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
                 isEditMode: true,

package/lib/modules/Discount/index.js

@@ -122,7 +122,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     }
     if (discount.appliedProductDetails) {
       return discount.appliedProductDetails.reduce((total, product) => {
-        const price = new import_decimal.default((product == null ? void 0 : product.amount) || 0);
+        const price = new import_decimal.default((product == null ? void 0 : product.amount) || 0).mul((product == null ? void 0 : product.num) || 1);
         return new import_decimal.default(total).plus(price).toNumber();
       }, 0);
     }

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

@@ -27,6 +27,7 @@ interface ApplicableProductDetails {
     resource_id: number;
     title: string;
     original_amount: string;
+    num: number;
 }
 export interface Discount {
     id: number;

package/lib/modules/Rules/index.js

@@ -164,7 +164,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         var _a, _b, _c;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
         const isLimitedProduct = limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id);
-        const isAvailableProduct = !((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 && discount2.type === "good_pass")));
+        const isAvailableProduct = !((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.type))));
         if (isAvailableProduct && isLimitedProduct) {
           (_c = discountApplicability.get(discount.id)) == null ? void 0 : _c.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
@@ -176,7 +176,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               title: discount.format_title,
               original_amount: product.origin_total,
               pre_value: discount.par_value
-            }
+            },
+            num: product.num || 1
           });
           discountApplicableProducts.set(discount.id, applicableProducts);
         }
@@ -185,7 +186,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     sortedProductList.forEach((originProduct) => {
       var _a, _b, _c, _d, _e;
       const product = this.hooks.getProduct(originProduct);
-      if ((product == null ? void 0 : product.booking_id) && ((_a = product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount) => discount.id && discount.type === "good_pass"))) {
+      if ((product == null ? void 0 : product.booking_id) && ((_a = product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount) => discount.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount.type)))) {
         processedProductsMap.set(product._id, originProduct);
         return;
       }
@@ -259,7 +260,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           original_amount: product.price,
           product_id: selectedDiscount.product_id,
           percent: selectedDiscount.par_value
-        }
+        },
+        num: product.num || 1
       };
       appliedProducts.push(discountDetail);
       appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
@@ -291,7 +293,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
             price: new import_decimal.default(targetProductPrice).toNumber(),
-            total: new import_decimal.default(product.origin_total || product.total || 0).minus(new import_decimal.default(product.price || 0)).toNumber(),
+            total: new import_decimal.default(product.origin_total || product.total || 0).minus(new import_decimal.default(product.price || 0).minus(new import_decimal.default(targetProductPrice))).toNumber(),
             origin_total: product.origin_total || product.total
           })
         );

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

@@ -37,6 +37,7 @@ type ProductDetail = {
     options?: any[];
     bundle?: any[];
     original_price?: number | string;
+    num?: number;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

package/lib/solution/BookingByStep/index.js

@@ -359,6 +359,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           },
           quantity: (targetCartItem.num || 1) + quantity
         });
+        this.core.effects.emit(`${this.store.cart.name}:onUpdateCartItemNums`, {});
         return;
       }
     }
@@ -824,7 +825,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     const arr = [];
     cartItems.forEach((cartItem) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h;
+      var _a, _b, _c, _d, _e, _f, _g;
       let selectedResources = [];
       const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
         capacity: (_a = cartItem._productOrigin) == null ? void 0 : _a.capacity,
@@ -904,7 +905,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         });
       } else {
         const hasFlexibleDuration = ((_e = (_d = cartItem._productOrigin) == null ? void 0 : _d.duration) == null ? void 0 : _e.type) === "flexible";
-        const operating_day_boundary = (_h = (_g = (_f = this.shopStore.get("core")) == null ? void 0 : _f.core) == null ? void 0 : _g.operating_day_boundary) == null ? void 0 : _h.time;
+        const operating_day_boundary = (_g = (_f = this.shopStore.get("core")) == null ? void 0 : _f.core) == null ? void 0 : _g.operating_day_boundary;
         productResources.forEach((item) => {
           item.renderList = item.renderList.filter((n) => {
             var _a2, _b2, _c2;
@@ -1479,7 +1480,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 从购物车中获取已经分配好第一步资源的所有时间片
   getTimeSlotByAllResources(resources_code) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     let dateRange = this.store.date.getDateRange();
     const resources = [];
     const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
@@ -1489,7 +1490,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     let maxCutOffTime = void 0;
     let maxCutOffTimeValue = (0, import_dayjs.default)();
     cartItems.forEach((item) => {
-      var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2;
+      var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i;
       (_c2 = (_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c2.forEach((n) => {
         if (n.code === resources_code) {
           resources.push(...n.renderList || []);
@@ -1502,7 +1503,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       resourcesTypeId = (_g2 = (_f2 = (_e2 = (_d2 = item == null ? void 0 : item._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e2.resources) == null ? void 0 : _f2.find(
         (n) => n.code === resources_code
       )) == null ? void 0 : _g2.id;
-      if (((_h2 = item._productOrigin) == null ? void 0 : _h2.cut_off_time) && ((_i2 = item._productOrigin) == null ? void 0 : _i2.cut_off_time.type) === "advance") {
+      if (((_h2 = item._productOrigin) == null ? void 0 : _h2.cut_off_time) && ((_i = item._productOrigin) == null ? void 0 : _i.cut_off_time.type) === "advance") {
         const currentCutOffTime = (0, import_dayjs.default)().add(
           item._productOrigin.cut_off_time.unit,
           item._productOrigin.cut_off_time.unit_type
@@ -1571,7 +1572,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       var _a2, _b2;
       return ((_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.type) === "flexible";
     });
-    const operating_day_boundary = (_i = (_h = (_g = this.shopStore.get("core")) == null ? void 0 : _g.core) == null ? void 0 : _h.operating_day_boundary) == null ? void 0 : _i.time;
+    const operating_day_boundary = (_h = (_g = this.shopStore.get("core")) == null ? void 0 : _g.core) == null ? void 0 : _h.operating_day_boundary;
     const timeSlots = (0, import_resources.getTimeSlicesByResources)({
       resourceIds,
       resourcesMap,
@@ -1587,7 +1588,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 提交时间切片，绑定到对应购物车的商品上，更新购物车---只有 duration 商品
   submitTimeSlot(timeSlots) {
-    var _a, _b, _c;
+    var _a, _b;
     const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     const allResources = this.store.date.getResourcesListByDate(timeSlots.start_at.format("YYYY-MM-DD"));
     const itemsByAccount = cartItems.reduce(
@@ -1601,25 +1602,27 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       },
       {}
     );
-    const operating_day_boundary = (_c = (_b = (_a = this.shopStore.get("core")) == null ? void 0 : _a.core) == null ? void 0 : _b.operating_day_boundary) == null ? void 0 : _c.time;
+    const operating_day_boundary = (_b = (_a = this.shopStore.get("core")) == null ? void 0 : _a.core) == null ? void 0 : _b.operating_day_boundary;
     Object.values(itemsByAccount).forEach((accountItems) => {
       let currentStartTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
       accountItems.forEach((item, index) => {
         var _a2;
         const newResources = (0, import_lodash_es.cloneDeep)(item._origin.resources);
         newResources.forEach((resource) => {
-          var _a3, _b2, _c2, _d, _e;
+          var _a3, _b2, _c, _d, _e;
           if (((_b2 = (_a3 = item._productOrigin) == null ? void 0 : _a3.duration) == null ? void 0 : _b2.type) === "flexible") {
             item.duration = {
               type: "minutes",
               value: 10
             };
             resource.startTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
-            const targetResourceTimes = (_c2 = allResources == null ? void 0 : allResources.find((n) => n.id === resource.id)) == null ? void 0 : _c2.times;
+            const targetResourceTimes = (_c = allResources == null ? void 0 : allResources.find((n) => n.id === resource.id)) == null ? void 0 : _c.times;
             const resourcesEndTime = targetResourceTimes.reduce((acc, curr) => {
               return (0, import_dayjs.default)(curr.end_at).isBefore((0, import_dayjs.default)(acc.end_at)) ? curr : acc;
             }, targetResourceTimes[0]);
-            const endTime = (0, import_dayjs.default)(resourcesEndTime.end_at).isBefore((0, import_dayjs.default)(operating_day_boundary)) ? resourcesEndTime.end_at : operating_day_boundary;
+            const resourceDate = (0, import_dayjs.default)(resourcesEndTime.end_at).format("YYYY-MM-DD");
+            const operatingBoundaryDateTime = `${resourceDate} ${operating_day_boundary.type === "start_time" ? "23:59" : operating_day_boundary.time}`;
+            const endTime = (0, import_dayjs.default)(resourcesEndTime.end_at).isBefore((0, import_dayjs.default)(operatingBoundaryDateTime)) ? resourcesEndTime.end_at : operatingBoundaryDateTime;
             let formattedEndTime;
             if (typeof endTime === "string" && endTime.includes(":") && !endTime.includes(" ") && !endTime.includes("T")) {
               const currentDate = timeSlots.start_at.format("YYYY-MM-DD");
@@ -1827,6 +1830,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           options: targetCartItem._optionsOrigin,
           quantity: (targetCartItem.num || 1) + quantity
         });
+        this.core.effects.emit(`${this.store.cart.name}:onUpdateCartItemNums`, {});
         return;
       }
     }

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

@@ -97,7 +97,10 @@ export declare const getTimeSlicesByResource: ({ resource, duration, split, curr
         } | undefined;
     } | undefined;
     hasFlexibleDuration?: boolean | undefined;
-    operating_day_boundary?: string | undefined;
+    operating_day_boundary?: {
+        type: string;
+        time: string;
+    } | undefined;
 }) => TimeSliceItem[];
 /**
  * @title: 获取时间切片列表的交集
@@ -154,7 +157,10 @@ export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, dur
         } | undefined;
     } | undefined;
     hasFlexibleDuration?: boolean | undefined;
-    operating_day_boundary?: string | undefined;
+    operating_day_boundary?: {
+        type: string;
+        time: string;
+    } | undefined;
 }) => any[];
 /**
  * @title: 获取其他人的已选资源

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

@@ -366,7 +366,8 @@ var getTimeSlicesByResource = ({
         resourcesUseableMap[resource.id] = _status.usable;
       }
       if (_status.usable) {
-        if (hasFlexibleDuration && operating_day_boundary && timeSlice.start_time >= operating_day_boundary) {
+        const operatingBoundaryDateTime = (operating_day_boundary == null ? void 0 : operating_day_boundary.type) === "start_time" ? "23:59" : operating_day_boundary == null ? void 0 : operating_day_boundary.time;
+        if (hasFlexibleDuration && operating_day_boundary && timeSlice.start_time >= (operatingBoundaryDateTime || "23:59")) {
           break;
         }
         timeSlices.push({

package/lib/solution/ShopDiscount/index.js

@@ -271,7 +271,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       if (item.booking_id) {
         (item.discount_list || []).forEach((discount) => {
           var _a2, _b, _c;
-          if (discount.id && discount.type === "good_pass") {
+          if (discount.id && ["good_pass", "discount_card"].includes(discount.type)) {
             editModeDiscountList.push({
               ...discount,
               isEditMode: true,

package/package.json

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