@pisell/pisellos 2.2.283 → 2.2.285

package/lib/modules/Product/index.js

@@ -1,38 +1,43 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/Product/index.ts
-var Product_exports = {};
-__export(Product_exports, {
-  Product: () => Product
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {
+  Product: true
+};
+exports.Product = void 0;
+var _BaseModule = require("../BaseModule");
+var _types = require("./types");
+Object.keys(_types).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _types[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _types[key];
+    }
+  });
 });
-module.exports = __toCommonJS(Product_exports);
-var import_BaseModule = require("../BaseModule");
-__reExport(Product_exports, require("./types"), module.exports);
-var Product = class extends import_BaseModule.BaseModule {
+/**
+ * 商品详情模块
+ * 除了跟商品列表模块组合外，还会提供单独的商品详情页的一些方法
+ *
+ * @export
+ * @class Product
+ * @extends {BaseModule}
+ * @implements {Module}
+ */
+class Product extends _BaseModule.BaseModule {
+  defaultName = 'product';
+  defaultVersion = '1.0.0';
+  store;
+  otherParams = {
+    scheduler: []
+  };
   constructor(name, version) {
     super(name, version);
-    this.defaultName = "product";
-    this.defaultVersion = "1.0.0";
-    this.otherParams = {
-      scheduler: []
-    };
   }
   async initialize(core, options) {
     this.core = core;
@@ -41,44 +46,49 @@ var Product = class extends import_BaseModule.BaseModule {
   updateData(data) {
     Object.assign(this.store, data);
   }
+
   /**
    * 获取商品数据
    */
   getData() {
     return this.store;
   }
+
   /**
    * 获取商品ID
    */
   getId() {
-    var _a;
-    return ((_a = this.store) == null ? void 0 : _a.id) ?? null;
+    return this.store?.id ?? null;
   }
+
   /**
    * 获取商品标题
    */
   getTitle() {
-    var _a;
-    return ((_a = this.store) == null ? void 0 : _a.title) ?? null;
+    return this.store?.title ?? null;
   }
+
   /**
    * 获取商品捆绑组
    */
   getBundleGroups() {
     return this.store.bundle_groups;
   }
+
   /**
    * 获取商品媒体
    */
   getMedia() {
     return this.store.media;
   }
+
   /**
    * 获取商品标签
    */
   getTags() {
     return this.store.tags;
   }
+
   /**
    * 获取商品分类
    */
@@ -92,18 +102,13 @@ var Product = class extends import_BaseModule.BaseModule {
     return this.otherParams;
   }
   getProductType() {
-    var _a;
     if (this.store.duration) {
-      return "duration";
+      return 'duration';
     }
-    if ((_a = this.store["schedule.ids"]) == null ? void 0 : _a.length) {
-      return "session";
+    if (this.store['schedule.ids']?.length) {
+      return 'session';
     }
-    return "normal";
+    return 'normal';
   }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  Product,
-  ...require("./types")
-});
+}
+exports.Product = Product;

package/lib/modules/Product/types.js

@@ -1,17 +1,5 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/Product/types.ts
-var types_exports = {};
-module.exports = __toCommonJS(types_exports);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/modules/Product/utils.js

@@ -1,46 +1,45 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/Product/utils.ts
-var utils_exports = {};
-__export(utils_exports, {
-  areAllNormalProducts: () => areAllNormalProducts,
-  isNormalProduct: () => isNormalProduct
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(utils_exports);
+exports.areAllNormalProducts = areAllNormalProducts;
+exports.isNormalProduct = isNormalProduct;
+/**
+ * 传入单个商品信息，通过商品上是否有 duration 或者 schedule.ids 来判断是否是普通商品
+ *
+ * @export
+ * @param {ProductData} product
+ * @return {*}  {boolean}
+ */
 function isNormalProduct(product) {
-  var _a;
-  if (product == null ? void 0 : product.duration) {
+  // 如果有 duration 配置，则不是普通商品
+  if (product?.duration) {
     return false;
   }
-  if ((_a = product == null ? void 0 : product["schedule.ids"]) == null ? void 0 : _a.length) {
+
+  // 如果有 schedule.ids 且长度大于0，则不是普通商品
+  if (product?.['schedule.ids']?.length) {
     return false;
   }
+
+  // 既没有 duration 也没有 schedule.ids，则是普通商品
   return true;
 }
+
+/**
+ * 传入多个商品信息，确定这些商品是否都是普通商品
+ *
+ * @export
+ * @param {ProductData[]} products
+ * @return {*}  {boolean}
+ */
 function areAllNormalProducts(products) {
+  // 如果数组为空，返回 true
   if (!products.length) {
     return false;
   }
-  return products.every((product) => isNormalProduct(product));
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  areAllNormalProducts,
-  isNormalProduct
-});
+
+  // 检查所有商品是否都是普通商品
+  return products.every(product => isNormalProduct(product));
+}

package/lib/modules/ProductList/index.js

@@ -1,63 +1,51 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/ProductList/index.ts
-var ProductList_exports = {};
-__export(ProductList_exports, {
-  ProductList: () => ProductList
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {
+  ProductList: true
+};
+exports.ProductList = void 0;
+var _BaseModule = require("../BaseModule");
+var _lodashEs = require("lodash-es");
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _types = require("./types");
+Object.keys(_types).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _types[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _types[key];
+    }
+  });
 });
-module.exports = __toCommonJS(ProductList_exports);
-var import_BaseModule = require("../BaseModule");
-var import_lodash_es = require("lodash-es");
-var import_dayjs = __toESM(require("dayjs"));
-__reExport(ProductList_exports, require("./types"), module.exports);
-var ProductList = class extends import_BaseModule.BaseModule {
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+class ProductList extends _BaseModule.BaseModule {
+  defaultName = 'productList';
+  defaultVersion = '1.0.0';
+  store;
+  request;
+  otherParams = {};
   constructor(name, version) {
     super(name, version);
-    this.defaultName = "productList";
-    this.defaultVersion = "1.0.0";
-    this.otherParams = {};
   }
   async initialize(core, options) {
-    var _a;
     this.core = core;
     this.store = options.store;
     this.otherParams = options.otherParams || {};
-    if (Array.isArray((_a = options.initialState) == null ? void 0 : _a.list)) {
+    if (Array.isArray(options.initialState?.list)) {
       this.store.list = options.initialState.list.slice().sort((a, b) => Number(b.sort) - Number(a.sort));
       this.core.effects.emit(`${this.name}:changed`, this.store.list);
     } else {
       this.store.list = [];
       this.store.selectProducts = [];
     }
-    this.request = core.getPlugin("request");
+    this.request = core.getPlugin('request');
   }
+
   /**
    * 更新运行态参数，供父级解决方案 setOtherParams 后同步查询上下文。
    *
@@ -68,7 +56,9 @@ var ProductList = class extends import_BaseModule.BaseModule {
     this.otherParams = params || {};
   }
   async storeChange(path, value) {
+    // No longer needed - products are stored as plain objects instead of Product instances
   }
+
   /**
    * 获取加时商品列表。
    *
@@ -77,10 +67,10 @@ var ProductList = class extends import_BaseModule.BaseModule {
    */
   async getAddTimeProducts(params = {}) {
     return this.loadProducts({
-      schedule_date: (0, import_dayjs.default)().format("YYYY-MM-DD"),
-      status: "published",
+      schedule_date: (0, _dayjs.default)().format('YYYY-MM-DD'),
+      status: 'published',
       ...params,
-      extension_type: ["product_add_time"]
+      extension_type: ['product_add_time']
     });
   }
   async loadProducts({
@@ -95,55 +85,60 @@ var ProductList = class extends import_BaseModule.BaseModule {
     cacheId,
     with_schedule,
     extension_type,
-    status = "published",
+    status = 'published',
     strategy_context
   } = {}, options) {
-    var _a, _b;
-    let userPlugin = this.core.getPlugin("user");
-    let customer_id = void 0;
+    // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
+    // if (!schedule_ids?.length) {
+    //   const schedule_ids_data = this.store.schedule
+    //     .getScheduleListByIds(schedule_ids)
+    //     .map((n) => n.id);
+    //   if (schedule_ids_data.length) {
+    //     schedule_ids = schedule_ids_data;
+    //   } else if (schedule_date) {
+    //     // 后端说如果 schedule_ids 如果为空，需要给[0]
+    //     schedule_ids = [0];
+    //   }
+    // }
+    let userPlugin = this.core.getPlugin('user');
+    let customer_id = undefined;
     try {
-      customer_id = paramsCustomerId || ((_a = userPlugin == null ? void 0 : userPlugin.get()) == null ? void 0 : _a.id);
+      customer_id = paramsCustomerId || userPlugin?.get()?.id;
     } catch (error) {
       console.error(error);
     }
+    // 如果没传schedule_date，则从
     const channelMap = {
-      online_store: "online-store",
-      scan_to_order: "online-store",
-      "scan-to-order": "online-store",
-      scan_to_order_2: "mobile_order",
-      scan_to_order_3: "scantoorder3"
+      online_store: 'online-store',
+      scan_to_order: 'online-store',
+      'scan-to-order': 'online-store',
+      scan_to_order_2: 'mobile_order',
+      scan_to_order_3: 'scantoorder3'
     };
-    const rawApplicationCode = (_b = this.otherParams) == null ? void 0 : _b.channel;
-    const mappedApplicationCode = typeof rawApplicationCode === "string" ? channelMap[rawApplicationCode] || rawApplicationCode : rawApplicationCode;
+    const rawApplicationCode = this.otherParams?.channel;
+    const mappedApplicationCode = typeof rawApplicationCode === 'string' ? channelMap[rawApplicationCode] || rawApplicationCode : rawApplicationCode;
     const queryPayload = {
       open_quotation: 1,
       open_bundle: 0,
-      exclude_extension_type: [
-        "product_party",
-        "product_event",
-        "product_series_event",
-        "product_package_ticket",
-        "ticket",
-        "event_item"
-      ],
-      with: [
-        "category",
-        "collection",
-        "resourceRelation",
-        "bundleGroup.bundleItem",
-        "optionGroup.optionItem",
-        "variantGroup.variantItem",
-        "dataVariants"
-      ],
+      exclude_extension_type: ['product_party', 'product_event', 'product_series_event', 'product_package_ticket', 'ticket', 'event_item'],
+      with: ['category', 'collection', 'resourceRelation', 'bundleGroup.bundleItem', 'optionGroup.optionItem', 'variantGroup.variantItem', 'dataVariants'],
       status,
       num: 500,
       skip: 1,
       customer_id,
-      ...Array.isArray(category_ids) && category_ids.length ? { category_ids } : {},
-      ...Array.isArray(product_ids) && product_ids.length ? { ids: product_ids } : {},
-      ...Array.isArray(collection) && collection.length ? { collection } : {},
+      ...(Array.isArray(category_ids) && category_ids.length ? {
+        category_ids
+      } : {}),
+      ...(Array.isArray(product_ids) && product_ids.length ? {
+        ids: product_ids
+      } : {}),
+      ...(Array.isArray(collection) && collection.length ? {
+        collection
+      } : {}),
       front_end_cache_id: cacheId,
-      ...Array.isArray(menu_list_ids) && menu_list_ids.length ? { menu_list_ids } : {},
+      ...(Array.isArray(menu_list_ids) && menu_list_ids.length ? {
+        menu_list_ids
+      } : {}),
       with_count,
       // client_schedule_ids: schedule_ids,
       schedule_date,
@@ -154,13 +149,26 @@ var ProductList = class extends import_BaseModule.BaseModule {
       extension_type,
       strategy_context
     };
-    const productsData = await this.request.post(
-      `/product/query`,
-      queryPayload,
-      { osServer: true, callback: options == null ? void 0 : options.callback, subscriberId: options == null ? void 0 : options.subscriberId, customToast: () => {
-      } }
-    );
+    const originalCallback = options?.callback;
+    const subscriptionCallback = originalCallback ? async result => {
+      const products = Array.isArray(result?.data?.list) ? result.data.list : [];
+      await this.addProduct(products);
+      originalCallback(result);
+    } : undefined;
+    const productsData = await this.request.post(`/product/query`, queryPayload, {
+      osServer: true,
+      callback: subscriptionCallback,
+      subscriberId: options?.subscriberId,
+      customToast: () => {}
+    });
     const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
+    // 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 sortedList;
   }
@@ -170,80 +178,68 @@ var ProductList = class extends import_BaseModule.BaseModule {
     schedule_date,
     channel
   }) {
-    const productsData = await this.request.post(
-      `/product/query/price`,
-      {
-        ids,
-        customer_id,
-        schedule_date,
-        channel
-      },
-      { useCache: true }
-    );
+    const productsData = await this.request.post(`/product/query/price`, {
+      ids,
+      customer_id,
+      schedule_date,
+      channel
+    }, {
+      useCache: true
+    });
     return productsData.data;
   }
   async getProducts() {
-    await this.core.effects.emit(
-      `${this.name}:onGetProducts`,
-      this.store.list
-    );
-    return (0, import_lodash_es.cloneDeep)(this.store.list);
+    await this.core.effects.emit(`${this.name}:onGetProducts`, this.store.list);
+    return (0, _lodashEs.cloneDeep)(this.store.list);
   }
   async getProduct(id) {
-    await this.core.effects.emit(
-      `${this.name}:onGetProduct`,
-      this.store.list
-    );
-    const product = this.store.list.find((product2) => product2.id === id);
-    return product ? (0, import_lodash_es.cloneDeep)(product) : void 0;
+    await this.core.effects.emit(`${this.name}:onGetProduct`, this.store.list);
+    const product = this.store.list.find(product => product.id === id);
+    return product ? (0, _lodashEs.cloneDeep)(product) : undefined;
   }
   async getProductByIds(ids) {
-    await this.core.effects.emit(
-      `${this.name}:onGetProductByIds`,
-      this.store.list
-    );
-    const products = this.store.list.filter((product) => ids.includes(product.id));
+    await this.core.effects.emit(`${this.name}:onGetProductByIds`, this.store.list);
+    const products = this.store.list.filter(product => ids.includes(product.id));
     return products;
   }
   async addProduct(products) {
+    // list 需要根据 id 去重
     if (!this.store.list) {
       this.store.list = [];
     }
-    products.forEach((n) => {
-      const index = this.store.list.findIndex((m) => m.id === n.id);
+    products.forEach(n => {
+      const index = this.store.list.findIndex(m => m.id === n.id);
       if (index === -1) {
         this.store.list.push(n);
       } else {
         this.store.list[index] = n;
       }
     });
+    // 根据 sort 值做降序排序（数字越大越靠前）
     this.store.list.sort((a, b) => Number(b.sort) - Number(a.sort));
     this.core.effects.emit(`${this.name}:changed`, this.store.list);
   }
   async selectProducts(products) {
     this.store.selectProducts = products;
   }
+
   /**
    * 根据商品编码或条码搜索商品
    * @param code 商品编码或条码
    * @returns 匹配的商品列表，如果没有匹配则返回空数组
    */
   findProductsByCodeOrBarcode(code) {
-    if (!code || typeof code !== "string") {
+    if (!code || typeof code !== 'string') {
       return [];
     }
     const trimmedCode = code.trim();
     if (!trimmedCode) {
       return [];
     }
-    const matchingProducts = this.store.list.filter((product) => {
+    const matchingProducts = this.store.list.filter(product => {
       return product.code && product.code.trim() === trimmedCode || product.barcode && product.barcode.trim() === trimmedCode;
     });
-    return (0, import_lodash_es.cloneDeep)(matchingProducts);
+    return (0, _lodashEs.cloneDeep)(matchingProducts);
   }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ProductList,
-  ...require("./types")
-});
+}
+exports.ProductList = ProductList;

package/lib/modules/ProductList/types.js

@@ -1,33 +1,11 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/modules/ProductList/types.ts
-var types_exports = {};
-__export(types_exports, {
-  ProductListHooks: () => ProductListHooks
-});
-module.exports = __toCommonJS(types_exports);
-var ProductListHooks = /* @__PURE__ */ ((ProductListHooks2) => {
-  ProductListHooks2["onGetProducts"] = "productList:onGetProducts";
-  ProductListHooks2["onGetProduct"] = "productList:onGetProduct";
-  return ProductListHooks2;
-})(ProductListHooks || {});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ProductListHooks
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
+exports.ProductListHooks = void 0;
+let ProductListHooks = exports.ProductListHooks = /*#__PURE__*/function (ProductListHooks) {
+  ProductListHooks["onGetProducts"] = "productList:onGetProducts";
+  ProductListHooks["onGetProduct"] = "productList:onGetProduct";
+  return ProductListHooks;
+}({});