@pisell/pisellos 3.0.36 → 3.0.38

package/dist/modules/Discount/index.js

@@ -122,7 +122,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               return this.request.post("/order/prepare/config", params);
             case 2:
               prepareConfig = _context3.sent;
-              goodPassList = this.uniqueByProductId(this.filterEnabledDiscountList((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.good_pass_list) || []) || []) || [];
+              goodPassList = this.filterEnabledDiscountList((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.good_pass_list) || []) || [];
               return _context3.abrupt("return", goodPassList);
             case 5:
             case "end":
@@ -153,7 +153,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 2:
               result = _context4.sent;
-              resultDiscountList = this.uniqueByProductId(this.filterEnabledDiscountList((result === null || result === void 0 ? void 0 : result.data) || []) || []) || [];
+              resultDiscountList = this.filterEnabledDiscountList((result === null || result === void 0 ? void 0 : result.data) || []) || [];
               return _context4.abrupt("return", resultDiscountList);
             case 5:
             case "end":

package/dist/solution/BookingByStep/index.js

@@ -272,8 +272,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadProductByScheduleDate",
     value: function () {
       var _loadProductByScheduleDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
-        var _product_ids;
-        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, _schedule$product_ids, schedule, otherProductsIds, allProductIds;
+        var _schedule$product_ids;
+        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, schedule, otherProductsIds, allProductIds;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -296,29 +296,34 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               //   .filter((n) => n !== null && n !== undefined);
 
               // 如果外面没传 product_ids，尝试从对应 schedule 里拿 product_ids
-              if (!((_product_ids = product_ids) !== null && _product_ids !== void 0 && _product_ids.length)) {
-                schedule = scheduleList.find(function (n) {
-                  return n.date === date;
-                });
-                if (schedule && (_schedule$product_ids = schedule.product_ids) !== null && _schedule$product_ids !== void 0 && _schedule$product_ids.length) {
-                  product_ids = schedule.product_ids;
-                }
+              // if (!product_ids?.length) {
+              //   const schedule = scheduleList.find((n) => n.date === date);
+              //   if (schedule && schedule.product_ids?.length) {
+              //     product_ids = schedule.product_ids;
+              //   }
+              // }
+              // V2接口修改后，只能从schedule 接口里拿数据，不可以从外面拿，外面给的是装修数据
+              schedule = scheduleList.find(function (n) {
+                return n.date === date;
+              });
+              if (schedule && (_schedule$product_ids = schedule.product_ids) !== null && _schedule$product_ids !== void 0 && _schedule$product_ids.length) {
+                product_ids = schedule.product_ids;
               }
               // 尝试去拿schedule 里的 other_product_ids 和 product_ids 拼在一起去重
               otherProductsIds = this.store.schedule.getOtherProductsIds() || [];
               allProductIds = [].concat(_toConsumableArray(product_ids), _toConsumableArray(otherProductsIds)).filter(function (n, index, self) {
                 return self.indexOf(n) === index;
               });
-              _context3.next = 8;
+              _context3.next = 9;
               return this.loadProducts({
                 // schedule_ids: scheduleIds,
                 product_ids: allProductIds,
                 category_ids: category_ids
                 // schedule_date: date,
               });
-            case 8:
-              return _context3.abrupt("return", _context3.sent);
             case 9:
+              return _context3.abrupt("return", _context3.sent);
+            case 10:
             case "end":
               return _context3.stop();
           }
@@ -341,7 +346,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               // 更新完商品数据以后，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
               cartItems = this.store.cart.getItems();
               if (!cartItems.length) {
-                _context5.next = 24;
+                _context5.next = 25;
                 break;
               }
               userPlugin = this.core.getPlugin('user');
@@ -433,6 +438,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               _iterator.f();
               return _context5.finish(21);
             case 24:
+              this.core.effects.emit("".concat(this.store.cart.name, ":onUpdateQuotationPrice"), {});
+            case 25:
             case "end":
               return _context5.stop();
           }
@@ -2460,8 +2467,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           // m.times 需要做个过滤，假设 timeSlice.start_at 是 09:30 timeSlice.end_at 是 11:30
           // time 是 time.start_at = 2025-05-26 10:30, time.end_at = 2025-05-26 12:30
           // 需要判断 time 的开始结束时间 是否包含timeSlice的开始结束时间
+
+          // n.start_at 是 2025-06-30 15:00 end_at 2025-06-30 17:00
+          // item.start 是 2025-06-30 16:00 item.end 是 2025-06-30 19:00
+          // 需要判断 n.start_at 和 n.end_at 是否在 item.start 和 item.end 之间
+          // 如果 n.start_at 和 n.end_at 在 item.start 和 item.end 有交集，则此时间需要计算
           var mTimes = m.times.filter(function (n) {
-            return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute');
+            return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute') || dayjs(n.start_at).isBefore(dayjs(item.end), 'minute') && dayjs(n.end_at).isAfter(dayjs(item.start), 'minute');
           });
           // 如果在这个区间的时间一个都没有，可以直接认为这个资源不可用
           if (mTimes.length === 0) {
@@ -2889,6 +2901,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var params,
           startDate,
           endDate,
+          endDateAfterMonth,
           tempProducts,
           schedule,
           filteredSchedule,
@@ -2913,13 +2926,20 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 startDate = dayjs().format('YYYY-MM-DD');
               }
               // 不管前端传什么 endDate 默认查一个月的，以今天为开始日期。用于找到一个月内最近可用的日期
-              endDate = dayjs().add(1, 'month').format('YYYY-MM-DD');
+              // 优化策略：
+              // 在 endDate 添加完一个月以后，如果 endDate 还小于 startDate + 7 天，则还需要 endDate+7 天
+              endDateAfterMonth = dayjs().add(1, 'month').format('YYYY-MM-DD');
+              if (dayjs(startDate).add(7, 'day').isAfter(dayjs(endDateAfterMonth), 'day')) {
+                endDate = dayjs(startDate).add(7, 'day').format('YYYY-MM-DD');
+              } else {
+                endDate = endDateAfterMonth;
+              }
               // 如果当前打开了某个的商品详情弹窗，则应该默认用这个商品
               tempProducts = (_this$store$currentPr3 = this.store.currentProduct) === null || _this$store$currentPr3 === void 0 ? void 0 : _this$store$currentPr3.getData();
               schedule = (_this$store$currentPr4 = this.store.currentProduct) === null || _this$store$currentPr4 === void 0 ? void 0 : _this$store$currentPr4.getOtherParams()['schedule'];
               filteredSchedule = filterScheduleByDateRange(schedule, startDate || '', endDate || ''); // 1.后端返回的数据，确定资源在每一天的可用和使用情况
               tempResourceIds = getResourcesIdsByProduct(tempProducts);
-              _context32.next = 10;
+              _context32.next = 11;
               return this.store.date.fetchResourceDates({
                 query: {
                   start_date: startDate || '',
@@ -2927,17 +2947,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   resource_ids: tempResourceIds
                 }
               });
-            case 10:
+            case 11:
               res = _context32.sent;
               // 先去读缓存结果，因为正常 UI 调用的是 7 天，而下面我会直接计算 30 天（最少也是 14 天），所以先去读缓存结果，如果缓存结果存在，则直接返回
               // TODO 优化关于为什么要放在接口后，因为在获取时间切片的时候还需要读一次接口数据，其实可以直接从这个结果里拿了，需要优化
               cache = (_this$store$currentPr5 = this.store.currentProduct) === null || _this$store$currentPr5 === void 0 ? void 0 : _this$store$currentPr5.getOtherParams()['timeSlotBySchedule'];
               if (!cache) {
-                _context32.next = 16;
+                _context32.next = 17;
                 break;
               }
               if (!(dayjs(params.startDate).isSameOrAfter(dayjs(cache.startDate), 'day') && dayjs(params.endDate).isSameOrBefore(dayjs(cache.endDate), 'day'))) {
-                _context32.next = 16;
+                _context32.next = 17;
                 break;
               }
               this.store.date.setDateList(cache.dateList);
@@ -2945,7 +2965,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 dateList: cache.dateList,
                 firstAvailableDate: cache.firstAvailableDate
               });
-            case 16:
+            case 17:
               // 2. 商品 schedule 数据，确定日程在每一天的时间片
               // 3. 把后端返回的和 schedule 的数据进行合并，确定每一天的可用和使用情况
               dates = [];
@@ -3072,22 +3092,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   }
                 }, _loop3);
               });
-            case 24:
+            case 25:
               if (!(dayjs(currentDate).isBefore(dayjs(endDate), 'day') || dayjs(currentDate).isSame(dayjs(endDate), 'day'))) {
-                _context32.next = 30;
+                _context32.next = 31;
                 break;
               }
-              return _context32.delegateYield(_loop3(), "t0", 26);
-            case 26:
+              return _context32.delegateYield(_loop3(), "t0", 27);
+            case 27:
               if (!_context32.t0) {
-                _context32.next = 28;
+                _context32.next = 29;
                 break;
               }
-              return _context32.abrupt("break", 30);
-            case 28:
-              _context32.next = 24;
+              return _context32.abrupt("break", 31);
+            case 29:
+              _context32.next = 25;
               break;
-            case 30:
+            case 31:
               // 最终把资源数据也加到日期内
               dates = handleAvailableDateByResource(res.data, dates);
               this.store.date.setDateList(dates);
@@ -3097,13 +3117,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 dateList: dates,
                 firstAvailableDate: firstAvailableDate,
                 startDate: startDate,
-                endDate: endDate
+                endDate: dayjs(currentDate).format('YYYY-MM-DD')
               });
               return _context32.abrupt("return", {
                 dateList: dates,
                 firstAvailableDate: firstAvailableDate
               });
-            case 34:
+            case 35:
             case "end":
               return _context32.stop();
           }

package/dist/solution/ShopDiscount/index.js

@@ -30,7 +30,6 @@ import { BaseModule } from "../../modules/BaseModule";
 import { ShopDiscountHooks } from "./types";
 import { DiscountModule } from "../../modules/Discount";
 import { RulesModule } from "../../modules/Rules";
-import { uniqueById } from "./utils";
 export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(ShopDiscountImpl, _BaseModule);
   var _super = _createSuper(ShopDiscountImpl);
@@ -278,7 +277,9 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
             isManualSelect: !isSelected
           });
         }
-        return discount;
+        return _objectSpread(_objectSpread({}, discount), {}, {
+          isManualSelect: !(discount !== null && discount !== void 0 && discount.isSelected)
+        });
       });
 
       // 更新优惠券列表
@@ -451,9 +452,9 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           });
         }
       });
-      var newDiscountList = uniqueById([].concat(editModeDiscountList, _toConsumableArray(discountList.filter(function (item) {
+      var newDiscountList = [].concat(editModeDiscountList, _toConsumableArray(discountList.filter(function (item) {
         return !item.isDisabled;
-      }))), 'product_id');
+      })));
       (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 || _this$store$discount5.setDiscountList(newDiscountList);
       this.emitDiscountListChange(newDiscountList);
       return newDiscountList;

package/lib/modules/Discount/index.js

@@ -73,10 +73,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       `/order/prepare/config`,
       params
     );
-    const goodPassList = this.uniqueByProductId(
-      this.filterEnabledDiscountList(
-        ((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || []
-      ) || []
+    const goodPassList = this.filterEnabledDiscountList(
+      ((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || []
     ) || [];
     return goodPassList;
   }
@@ -88,9 +86,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       available: 1,
       relation_product: 1
     });
-    const resultDiscountList = this.uniqueByProductId(
-      this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || []
-    ) || [];
+    const resultDiscountList = this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || [];
     return resultDiscountList;
   }
   filterEnabledDiscountList(discountList) {

package/lib/solution/BookingByStep/index.js

@@ -216,11 +216,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       { date, status: "available", week: "", weekNum: 0 },
       { date, status: "available", week: "", weekNum: 0 }
     ]);
-    if (!(product_ids == null ? void 0 : product_ids.length)) {
-      const schedule = scheduleList.find((n) => n.date === date);
-      if (schedule && ((_a = schedule.product_ids) == null ? void 0 : _a.length)) {
-        product_ids = schedule.product_ids;
-      }
+    const schedule = scheduleList.find((n) => n.date === date);
+    if (schedule && ((_a = schedule.product_ids) == null ? void 0 : _a.length)) {
+      product_ids = schedule.product_ids;
     }
     const otherProductsIds = this.store.schedule.getOtherProductsIds() || [];
     const allProductIds = [...product_ids, ...otherProductsIds].filter(
@@ -283,6 +281,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           bundle
         });
       }
+      this.core.effects.emit(`${this.store.cart.name}:onUpdateQuotationPrice`, {});
     }
   }
   // 加载当前店铺下所有 schedule
@@ -1703,7 +1702,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         let currentResourcesCount = 0;
         const currentResourcesTimeSlotCanUsedArr = [];
         const mTimes = m.times.filter((n) => {
-          return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end), "minute");
+          return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end), "minute") || (0, import_dayjs.default)(n.start_at).isBefore((0, import_dayjs.default)(item.end), "minute") && (0, import_dayjs.default)(n.end_at).isAfter((0, import_dayjs.default)(item.start), "minute");
         });
         if (mTimes.length === 0) {
           return;
@@ -2037,7 +2036,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day") && ((0, import_dayjs.default)(endDate).isAfter((0, import_dayjs.default)(), "day") || (0, import_dayjs.default)(endDate).isSame((0, import_dayjs.default)(), "day"))) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
     }
-    endDate = (0, import_dayjs.default)().add(1, "month").format("YYYY-MM-DD");
+    const endDateAfterMonth = (0, import_dayjs.default)().add(1, "month").format("YYYY-MM-DD");
+    if ((0, import_dayjs.default)(startDate).add(7, "day").isAfter((0, import_dayjs.default)(endDateAfterMonth), "day")) {
+      endDate = (0, import_dayjs.default)(startDate).add(7, "day").format("YYYY-MM-DD");
+    } else {
+      endDate = endDateAfterMonth;
+    }
     let tempProducts;
     tempProducts = (_a = this.store.currentProduct) == null ? void 0 : _a.getData();
     const schedule = (_b = this.store.currentProduct) == null ? void 0 : _b.getOtherParams()["schedule"];
@@ -2170,7 +2174,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       dateList: dates,
       firstAvailableDate,
       startDate,
-      endDate
+      endDate: (0, import_dayjs.default)(currentDate).format("YYYY-MM-DD")
     });
     return {
       dateList: dates,

package/lib/solution/ShopDiscount/index.js

@@ -27,7 +27,6 @@ var import_BaseModule = require("../../modules/BaseModule");
 var import_types = require("./types");
 var import_Discount = require("../../modules/Discount");
 var import_Rules = require("../../modules/Rules");
-var import_utils = require("./utils");
 var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -173,7 +172,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
           isManualSelect: !isSelected
         };
       }
-      return discount;
+      return { ...discount, isManualSelect: !(discount == null ? void 0 : discount.isSelected) };
     });
     this.setDiscountList(newDiscountList);
     return this.calcDiscount(this.store.productList || [], {
@@ -288,13 +287,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         });
       }
     });
-    const newDiscountList = (0, import_utils.uniqueById)(
-      [
-        ...editModeDiscountList,
-        ...discountList.filter((item) => !item.isDisabled)
-      ],
-      "product_id"
-    );
+    const newDiscountList = [
+      ...editModeDiscountList,
+      ...discountList.filter((item) => !item.isDisabled)
+    ];
     (_a = this.store.discount) == null ? void 0 : _a.setDiscountList(newDiscountList);
     this.emitDiscountListChange(newDiscountList);
     return newDiscountList;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "3.0.36",
+  "version": "3.0.38",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
     "docs": "typedoc --out docs src/index.ts",
     "sync": "node sync.js",
     "prepublishOnly": "npm run build",
-    "deploy": "yarn run build && yarn run changeset && yarn run version && npm run release"
+    "deploy": "npm run build && npm run changeset && npm run version && npm run release"
   },
   "repository": {
     "type": "git",
@@ -67,4 +67,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}