@pisell/pisellos 2.0.8 → 2.0.9

package/dist/modules/Date/index.js

@@ -144,6 +144,8 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
                 end_date: end_date,
                 resource_ids: resource_ids,
                 front_end_cache_id: this.cacheId
+              }, {
+                useCache: true
               });
             case 11:
               res = _context3.sent;

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

@@ -50,10 +50,11 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         category_ids?: number[];
     }): Promise<any>;
     loadAllSchedule(): Promise<void>;
-    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, }: {
+    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel }: {
         startDate: string;
         endDate: string;
         custom_page_id?: number;
+        channel?: string;
     }): Promise<ITime[]>;
     storeProduct(productData: ProductData): Promise<void>;
     addAccount(account: Account | IHolder, extra?: {

package/dist/solution/BookingByStep/index.js

@@ -314,11 +314,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadScheduleAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref3) {
         var _res$data$date_list;
-        var startDate, endDate, custom_page_id, dates, res;
+        var startDate, endDate, custom_page_id, channel, dates, res;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              startDate = _ref3.startDate, endDate = _ref3.endDate, custom_page_id = _ref3.custom_page_id;
+              startDate = _ref3.startDate, endDate = _ref3.endDate, custom_page_id = _ref3.custom_page_id, channel = _ref3.channel;
               // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天，需要把 startDate 置为今天
               if (dayjs(startDate).isBefore(dayjs(), 'day')) {
                 startDate = dayjs().format('YYYY-MM-DD');
@@ -337,7 +337,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return this.request.get("/schedule/product/availability", {
                 start_date: startDate,
                 end_date: endDate,
-                custom_page_id: custom_page_id
+                custom_page_id: custom_page_id,
+                channel: channel
               });
             case 8:
               res = _context5.sent;
@@ -350,13 +351,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return _context5.abrupt("return", dates);
             case 12:
               res.data.date_list.forEach(function (n) {
-                if (n.schedule_id && n.schedule_id.length) {
-                  var index = dates.findIndex(function (m) {
-                    return m.date === n.date;
-                  });
-                  if (index !== -1) {
-                    dates[index].status = 'available';
-                  }
+                var index = dates.findIndex(function (m) {
+                  return m.date === n.date;
+                });
+                if (index !== -1) {
+                  dates[index].status = 'available';
                 }
               });
               dates = disableDatesBeforeOneDay(dates);
@@ -1195,7 +1194,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             });
             n.renderList = n.renderList.filter(function (m) {
               var recordCount = capacityMap[m.id] || 0;
-              var canUseTime = m.times.find(function (item) {
+              var canUseArr = m.times.map(function (item) {
                 var res = getIsUsableByTimeItem({
                   timeSlice: {
                     start_time: startTime.format('HH:mm'),
@@ -1213,7 +1212,18 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
                 return res.usable;
               });
-              return canUseTime;
+              // 在已经选定时间的情况下，只要canUseTime 里有一个 false，那就代表不可用
+              return !canUseArr.some(function (n) {
+                return n === false;
+              });
+            });
+          });
+        } else {
+          productResources.forEach(function (item) {
+            // 如果资源的 capacity 已经小于了当前需要的 capacity ，则需要把资源给过滤掉
+            item.renderList = item.renderList.filter(function (n) {
+              var recordCount = n.capacity || 0;
+              return recordCount >= currentCapacity;
             });
           });
         }
@@ -1510,6 +1520,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             _resources.forEach(function (n) {
               var _n$renderList;
               if ((_n$renderList = n.renderList) !== null && _n$renderList !== void 0 && _n$renderList.length) {
+                // 过滤掉 capacity 小于 currentCapacity 的资源
+                n.renderList = n.renderList.filter(function (m) {
+                  var recordCount = m.capacity || 0;
+                  return recordCount >= currentCapacity;
+                });
                 currentResourcesRenderList.push.apply(currentResourcesRenderList, _toConsumableArray(n.renderList || []));
               }
             });
@@ -1568,7 +1583,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeSlotByAllResources",
     value: function getTimeSlotByAllResources(resources_code) {
-      var _this9 = this,
+      var _dateRange,
+        _this9 = this,
         _cartItems$,
         _cartItems$2;
       var dateRange = this.store.date.getDateRange();
@@ -1577,8 +1593,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var cartItems = cloneDeep(this.store.cart.getItems());
       // if (cartItems?.[0].start_date) return [];
       var resourceIds = [];
+      var resourcesTypeId = undefined;
       cartItems.forEach(function (item) {
-        var _item$_productOrigin9;
+        var _item$_productOrigin9, _item$_productOrigin10;
         (_item$_productOrigin9 = item._productOrigin) === null || _item$_productOrigin9 === void 0 || (_item$_productOrigin9 = _item$_productOrigin9.product_resource) === null || _item$_productOrigin9 === void 0 || (_item$_productOrigin9 = _item$_productOrigin9.resources) === null || _item$_productOrigin9 === void 0 || _item$_productOrigin9.forEach(function (n) {
           if (n.code === resources_code) {
             resources.push.apply(resources, _toConsumableArray(n.renderList || []));
@@ -1590,7 +1607,19 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         if (item.resource_id) {
           resourceIds.push(item.resource_id);
         }
+        resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin10 = item._productOrigin) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.product_resource) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.resources) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.find(function (n) {
+          return n.code === resources_code;
+        })) === null || _item$_productOrigin10 === void 0 ? void 0 : _item$_productOrigin10.id;
       });
+      // 保险起见，在这里如果 dateRange 里也有 resources 的话，也 push 进去
+      if ((_dateRange = dateRange) !== null && _dateRange !== void 0 && (_dateRange = _dateRange[0]) !== null && _dateRange !== void 0 && (_dateRange = _dateRange.resource) !== null && _dateRange !== void 0 && _dateRange.length) {
+        // resources.push(...dateRange[0].resource);
+        dateRange[0].resource.forEach(function (n) {
+          if (n.form_id === resourcesTypeId) {
+            resources.push(n);
+          }
+        });
+      }
       var resourcesMap = getResourcesMap(resources);
       var duration = 0;
       // duration = 不同账号的最长时间
@@ -1598,8 +1627,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var checkDuration = function checkDuration(cartItems) {
         var accountDuration = 0;
         cartItems.forEach(function (item) {
-          var _item$_productOrigin$3, _item$_productOrigin10;
-          accountDuration += (_item$_productOrigin$3 = (_item$_productOrigin10 = item._productOrigin) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.duration) === null || _item$_productOrigin10 === void 0 ? void 0 : _item$_productOrigin10.value) !== null && _item$_productOrigin$3 !== void 0 ? _item$_productOrigin$3 : 0;
+          var _item$_productOrigin$3, _item$_productOrigin11;
+          accountDuration += (_item$_productOrigin$3 = (_item$_productOrigin11 = item._productOrigin) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.duration) === null || _item$_productOrigin11 === void 0 ? void 0 : _item$_productOrigin11.value) !== null && _item$_productOrigin$3 !== void 0 ? _item$_productOrigin$3 : 0;
         });
         if (accountDuration > duration) {
           duration = accountDuration;
@@ -1668,9 +1697,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         accountItems.forEach(function (item, index) {
           var newResources = cloneDeep(item._origin.resources);
           newResources.forEach(function (resource) {
-            var _item$_productOrigin$4, _item$_productOrigin11, _ref11, _item$_productOrigin12;
+            var _item$_productOrigin$4, _item$_productOrigin12, _ref11, _item$_productOrigin13;
             resource.startTime = currentStartTime;
-            resource.endTime = dayjs(currentStartTime).add((_item$_productOrigin$4 = (_item$_productOrigin11 = item._productOrigin) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.duration) === null || _item$_productOrigin11 === void 0 ? void 0 : _item$_productOrigin11.value) !== null && _item$_productOrigin$4 !== void 0 ? _item$_productOrigin$4 : 0, (_ref11 = (_item$_productOrigin12 = item._productOrigin) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.duration) === null || _item$_productOrigin12 === void 0 ? void 0 : _item$_productOrigin12.type) !== null && _ref11 !== void 0 ? _ref11 : 'minutes').format('YYYY-MM-DD HH:mm');
+            resource.endTime = dayjs(currentStartTime).add((_item$_productOrigin$4 = (_item$_productOrigin12 = item._productOrigin) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.duration) === null || _item$_productOrigin12 === void 0 ? void 0 : _item$_productOrigin12.value) !== null && _item$_productOrigin$4 !== void 0 ? _item$_productOrigin$4 : 0, (_ref11 = (_item$_productOrigin13 = item._productOrigin) === null || _item$_productOrigin13 === void 0 || (_item$_productOrigin13 = _item$_productOrigin13.duration) === null || _item$_productOrigin13 === void 0 ? void 0 : _item$_productOrigin13.type) !== null && _ref11 !== void 0 ? _ref11 : 'minutes').format('YYYY-MM-DD HH:mm');
             delete resource.times;
           });
           _this10.store.cart.updateItem({
@@ -1814,7 +1843,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false) {
               resourcesUseableMap[m.id] = res.usable;
             }
-            // 如果资源可用，且是独占资源，remainingCapacity 始终为 1
             if (res.usable && res.remainingCapacity >= count) {
               count = res.remainingCapacity;
             }

package/dist/solution/ShopDiscount/index.js

@@ -483,21 +483,26 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 3:
               result = _context7.sent;
-              if (result !== null && result !== void 0 && result.data) {
-                _result$data = result.data, wallet_pass_list = _result$data.wallet_pass_list, customer = _objectWithoutProperties(_result$data, _excluded);
-                this.setCustomer(customer);
+              if (!(result !== null && result !== void 0 && result.data)) {
+                _context7.next = 9;
+                break;
               }
-              _context7.next = 10;
+              _result$data = result.data, wallet_pass_list = _result$data.wallet_pass_list, customer = _objectWithoutProperties(_result$data, _excluded);
+              this.setCustomer(customer);
+              _context7.next = 9;
+              return this.core.effects.emit(ShopDiscountHooks.onScanCustomerChange, customer);
+            case 9:
+              _context7.next = 14;
               break;
-            case 7:
-              _context7.prev = 7;
+            case 11:
+              _context7.prev = 11;
               _context7.t0 = _context7["catch"](0);
               console.error('[ShopDiscount] 获取客户钱包信息出错:', _context7.t0);
-            case 10:
+            case 14:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[0, 7]]);
+        }, _callee7, this, [[0, 11]]);
       }));
       function getCustomerWallet(_x6) {
         return _getCustomerWallet.apply(this, arguments);

package/dist/solution/ShopDiscount/types.d.ts

@@ -5,6 +5,7 @@ export declare enum ShopDiscountHooks {
     onDestroy = "shopDiscount:onDestroy",
     onLoadDiscountList = "shopDiscount:onLoadDiscountList",
     onCustomerChange = "shopDiscount:onCustomerChange",
+    onScanCustomerChange = "shopDiscount:onScanCustomerChange",
     onDiscountListChange = "shopDiscount:onDiscountListChange",
     onRulesListChange = "shopDiscount:onRulesListChange",
     onLoadPrepareCalcResult = "shopDiscount:onLoadPrepareCalcResult"

package/dist/solution/ShopDiscount/types.js

@@ -3,6 +3,7 @@ export var ShopDiscountHooks = /*#__PURE__*/function (ShopDiscountHooks) {
   ShopDiscountHooks["onDestroy"] = "shopDiscount:onDestroy";
   ShopDiscountHooks["onLoadDiscountList"] = "shopDiscount:onLoadDiscountList";
   ShopDiscountHooks["onCustomerChange"] = "shopDiscount:onCustomerChange";
+  ShopDiscountHooks["onScanCustomerChange"] = "shopDiscount:onScanCustomerChange";
   ShopDiscountHooks["onDiscountListChange"] = "shopDiscount:onDiscountListChange";
   ShopDiscountHooks["onRulesListChange"] = "shopDiscount:onRulesListChange";
   ShopDiscountHooks["onLoadPrepareCalcResult"] = "shopDiscount:onLoadPrepareCalcResult";

package/lib/modules/Date/index.js

@@ -83,6 +83,8 @@ var DateModule = class extends import_BaseModule.BaseModule {
         end_date,
         resource_ids,
         front_end_cache_id: this.cacheId
+      }, {
+        useCache: true
       });
       if (!((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.length)) {
         return (0, import_utils.disableAllDates)(dates);

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

@@ -50,10 +50,11 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         category_ids?: number[];
     }): Promise<any>;
     loadAllSchedule(): Promise<void>;
-    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, }: {
+    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel }: {
         startDate: string;
         endDate: string;
         custom_page_id?: number;
+        channel?: string;
     }): Promise<ITime[]>;
     storeProduct(productData: ProductData): Promise<void>;
     addAccount(account: Account | IHolder, extra?: {

package/lib/solution/BookingByStep/index.js

@@ -208,7 +208,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   async loadScheduleAvailableDate({
     startDate,
     endDate,
-    custom_page_id
+    custom_page_id,
+    channel
   }) {
     var _a;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day")) {
@@ -224,7 +225,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       {
         start_date: startDate,
         end_date: endDate,
-        custom_page_id
+        custom_page_id,
+        channel
       }
     );
     this.store.schedule.setAvailabilityScheduleDateList(res.data.date_list);
@@ -232,11 +234,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       return dates;
     }
     res.data.date_list.forEach((n) => {
-      if (n.schedule_id && n.schedule_id.length) {
-        const index = dates.findIndex((m) => m.date === n.date);
-        if (index !== -1) {
-          dates[index].status = "available";
-        }
+      const index = dates.findIndex((m) => m.date === n.date);
+      if (index !== -1) {
+        dates[index].status = "available";
       }
     });
     dates = (0, import_utils3.disableDatesBeforeOneDay)(dates);
@@ -646,7 +646,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           });
           n.renderList = n.renderList.filter((m) => {
             const recordCount = capacityMap[m.id] || 0;
-            const canUseTime = m.times.find((item) => {
+            const canUseArr = m.times.map((item) => {
               const res = (0, import_resources.getIsUsableByTimeItem)({
                 timeSlice: {
                   start_time: startTime.format("HH:mm"),
@@ -664,7 +664,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               }
               return res.usable;
             });
-            return canUseTime;
+            return !canUseArr.some((n2) => n2 === false);
+          });
+        });
+      } else {
+        productResources.forEach((item) => {
+          item.renderList = item.renderList.filter((n) => {
+            const recordCount = n.capacity || 0;
+            return recordCount >= currentCapacity;
           });
         });
       }
@@ -918,6 +925,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           resources2.forEach((n) => {
             var _a3;
             if ((_a3 = n.renderList) == null ? void 0 : _a3.length) {
+              n.renderList = n.renderList.filter((m) => {
+                const recordCount = m.capacity || 0;
+                return recordCount >= currentCapacity;
+              });
               currentResourcesRenderList.push(...n.renderList || []);
             }
           });
@@ -981,13 +992,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 从购物车中获取已经分配好第一步资源的所有时间片
   getTimeSlotByAllResources(resources_code) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     let dateRange = this.store.date.getDateRange();
     const resources = [];
     const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
     const resourceIds = [];
+    let resourcesTypeId = void 0;
     cartItems.forEach((item) => {
-      var _a2, _b2, _c2;
+      var _a2, _b2, _c2, _d2, _e2, _f2, _g;
       (_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 || []);
@@ -996,7 +1008,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       if (item.resource_id) {
         resourceIds.push(item.resource_id);
       }
+      resourcesTypeId = (_g = (_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 : _g.id;
     });
+    if ((_b = (_a = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _a.resource) == null ? void 0 : _b.length) {
+      dateRange[0].resource.forEach((n) => {
+        if (n.form_id === resourcesTypeId) {
+          resources.push(n);
+        }
+      });
+    }
     const resourcesMap = (0, import_utils.getResourcesMap)(resources);
     let duration = 0;
     const accountList = this.store.accountList.getAccounts();
@@ -1018,7 +1038,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     } else {
       checkDuration(cartItems);
     }
-    if (!((_a = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _a.start_date) && !((_b = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _b.resource_id) || !(cartItems == null ? void 0 : cartItems[0].duration)) {
+    if (!((_c = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _c.start_date) && !((_d = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _d.resource_id) || !(cartItems == null ? void 0 : cartItems[0].duration)) {
       return [];
     }
     if ((cartItems == null ? void 0 : cartItems[0].start_date) && !dateRange) {
@@ -1030,7 +1050,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           weekNum: 0
         },
         {
-          date: ((_c = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _c.end_date) || ((_d = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _d.start_date) || "",
+          date: ((_e = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _e.end_date) || ((_f = cartItems == null ? void 0 : cartItems[0]) == null ? void 0 : _f.start_date) || "",
           status: "available",
           week: "",
           weekNum: 0

package/lib/solution/ShopDiscount/index.js

@@ -313,6 +313,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       if (result == null ? void 0 : result.data) {
         const { wallet_pass_list, ...customer } = result.data;
         this.setCustomer(customer);
+        await this.core.effects.emit(
+          import_types.ShopDiscountHooks.onScanCustomerChange,
+          customer
+        );
       }
     } catch (error) {
       console.error("[ShopDiscount] 获取客户钱包信息出错:", error);

package/lib/solution/ShopDiscount/types.d.ts

@@ -5,6 +5,7 @@ export declare enum ShopDiscountHooks {
     onDestroy = "shopDiscount:onDestroy",
     onLoadDiscountList = "shopDiscount:onLoadDiscountList",
     onCustomerChange = "shopDiscount:onCustomerChange",
+    onScanCustomerChange = "shopDiscount:onScanCustomerChange",
     onDiscountListChange = "shopDiscount:onDiscountListChange",
     onRulesListChange = "shopDiscount:onRulesListChange",
     onLoadPrepareCalcResult = "shopDiscount:onLoadPrepareCalcResult"

package/lib/solution/ShopDiscount/types.js

@@ -27,6 +27,7 @@ var ShopDiscountHooks = /* @__PURE__ */ ((ShopDiscountHooks2) => {
   ShopDiscountHooks2["onDestroy"] = "shopDiscount:onDestroy";
   ShopDiscountHooks2["onLoadDiscountList"] = "shopDiscount:onLoadDiscountList";
   ShopDiscountHooks2["onCustomerChange"] = "shopDiscount:onCustomerChange";
+  ShopDiscountHooks2["onScanCustomerChange"] = "shopDiscount:onScanCustomerChange";
   ShopDiscountHooks2["onDiscountListChange"] = "shopDiscount:onDiscountListChange";
   ShopDiscountHooks2["onRulesListChange"] = "shopDiscount:onRulesListChange";
   ShopDiscountHooks2["onLoadPrepareCalcResult"] = "shopDiscount:onLoadPrepareCalcResult";

package/package.json

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