@pisell/pisellos 2.1.43 → 2.1.45

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

@@ -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/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/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/RegisterAndLogin/config.js

@@ -189,7 +189,8 @@ var onlineStoreConfig = {
       return {
         phone: String(params.phone),
         code: params.code,
-        country_calling_code: String(params.country_calling_code)
+        country_calling_code: String(params.country_calling_code),
+        action: params.action
       };
     }
   },
@@ -511,7 +512,8 @@ var defaultConfig = {
       return {
         phone: String(params.phone),
         code: params.code,
-        country_calling_code: String(params.country_calling_code)
+        country_calling_code: String(params.country_calling_code),
+        action: params.action
       };
     }
   },

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

@@ -328,6 +328,7 @@ export interface CheckMobileCodeParams {
     shop_id: number;
     code: string;
     country_calling_code: string;
+    action: string;
 }
 /**
  * 验证码有效性检查响应接口

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

@@ -103,13 +103,6 @@ var ProductList = class extends import_BaseModule.BaseModule {
       { 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/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/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/RegisterAndLogin/config.js

@@ -157,7 +157,8 @@ var onlineStoreConfig = {
     transformParams: (params) => ({
       phone: String(params.phone),
       code: params.code,
-      country_calling_code: String(params.country_calling_code)
+      country_calling_code: String(params.country_calling_code),
+      action: params.action
     })
   },
   phonePasswordLogin: {
@@ -407,7 +408,8 @@ var defaultConfig = {
     transformParams: (params) => ({
       phone: String(params.phone),
       code: params.code,
-      country_calling_code: String(params.country_calling_code)
+      country_calling_code: String(params.country_calling_code),
+      action: params.action
     })
   },
   phonePasswordLogin: {

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

@@ -328,6 +328,7 @@ export interface CheckMobileCodeParams {
     shop_id: number;
     code: string;
     country_calling_code: string;
+    action: string;
 }
 /**
  * 验证码有效性检查响应接口

package/package.json

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