@pisell/pisellos 3.0.41 → 3.0.43

package/lib/modules/Date/index.js

@@ -1,6 +1,8 @@
+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)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+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);
 
 // src/modules/Date/index.ts
@@ -24,6 +34,7 @@ __export(Date_exports, {
 module.exports = __toCommonJS(Date_exports);
 var import_BaseModule = require("../BaseModule");
 var import_utils = require("./utils");
+var import_cloneDeep = __toESM(require("lodash-es/cloneDeep"));
 var DateModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -58,18 +69,64 @@ var DateModule = class extends import_BaseModule.BaseModule {
     return this.store.dateRange;
   }
   async getResourceDates(params) {
+    var _a;
+    if (params.useCache) {
+      const currentDateList = this.getDateList() || [];
+      const currentDateListMap = new Map(
+        currentDateList.map((item) => [item.date, item])
+      );
+      const resourceIds = ((_a = params.query) == null ? void 0 : _a.resource_ids) || [];
+      const hasResource = resourceIds.every((id) => {
+        var _a2;
+        const currentItem = currentDateListMap.get(id.toString());
+        return (_a2 = currentItem == null ? void 0 : currentItem.resource) == null ? void 0 : _a2.some((n) => n.id === id);
+      });
+      if (hasResource) {
+        return currentDateList;
+      }
+    }
     const dates = await this.getResourceAvailableTimeList(params);
-    this.store.dateList = dates;
+    this.setDateList(dates);
     return dates;
   }
   getDateList() {
     return this.store.dateList;
   }
   setDateList(dateList) {
-    this.store.dateList = dateList;
+    const currentDateList = (0, import_cloneDeep.default)(this.store.dateList) || [];
+    dateList.forEach((item) => {
+      var _a, _b;
+      const currentItemIndex = currentDateList.findIndex(
+        (n) => n.date === item.date
+      );
+      if (currentItemIndex !== -1) {
+        const currentItem = currentDateList[currentItemIndex];
+        const newResource = (_a = item.resource) == null ? void 0 : _a.filter(
+          (n) => {
+            var _a2;
+            return !((_a2 = currentItem.resource) == null ? void 0 : _a2.some((m) => m.id === n.id));
+          }
+        );
+        (_b = currentItem.resource) == null ? void 0 : _b.forEach((n) => {
+          var _a2;
+          const newResource2 = (_a2 = item.resource) == null ? void 0 : _a2.find((m) => m.id === n.id);
+          if (newResource2) {
+            n.times = newResource2.times;
+          }
+        });
+        currentItem.resource = [
+          ...currentItem.resource || [],
+          ...newResource || []
+        ];
+        currentDateList[currentItemIndex] = currentItem;
+      } else {
+        currentDateList.push(item);
+      }
+    });
+    this.store.dateList = currentDateList;
   }
   async fetchResourceDates(params) {
-    const { url, query } = params;
+    const { url, query, useCache = true } = params;
     const fetchUrl = url || "/schedule/resource/list";
     const { start_date, end_date, resource_ids } = query || {};
     try {
@@ -77,9 +134,9 @@ var DateModule = class extends import_BaseModule.BaseModule {
         start_date,
         end_date,
         resource_ids,
-        front_end_cache_id: this.cacheId
+        front_end_cache_id: useCache && this.cacheId
       }, {
-        useCache: true
+        useCache
       });
       return res;
     } catch (error) {

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

@@ -43,6 +43,8 @@ export interface DateModuleAPI {
 }
 export interface IGetAvailableTimeListParams {
     url?: string;
+    /** 是否使用缓存 */
+    useCache?: boolean;
     /** 查询参数 */
     query?: {
         /** 开始日期 */

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

@@ -17,6 +17,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     loadPrepareConfig(params: {
         action?: 'create';
         with_good_pass: 0 | 1;
+        with_discount_card: 0 | 1;
         customer_id: number;
     }): Promise<Discount[]>;
     batchSearch(code: string): Promise<Discount[]>;

package/lib/modules/Discount/index.js

@@ -1,6 +1,8 @@
+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)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+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);
 
 // src/modules/Discount/index.ts
@@ -25,6 +35,7 @@ module.exports = __toCommonJS(Discount_exports);
 var import_utils = require("../../solution/ShopDiscount/utils");
 var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
+var import_decimal = __toESM(require("decimal.js"));
 var DiscountModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -68,13 +79,13 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     return this.store.discountList;
   }
   async loadPrepareConfig(params) {
-    var _a;
+    var _a, _b;
     const prepareConfig = await this.request.post(
       `/order/prepare/config`,
       params
     );
     const goodPassList = this.filterEnabledDiscountList(
-      ((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || []
+      [...((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || [], ...((_b = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _b.discount_card_list) || []]
     ) || [];
     return goodPassList;
   }
@@ -82,7 +93,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     const result = await this.request.get(`/machinecode/batch-search`, {
       code,
       translate_flag: 1,
-      tag: "good_pass",
+      tags: ["good_pass", "product_discount_card"],
       available: 1,
       relation_product: 1
     });
@@ -91,7 +102,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
   }
   filterEnabledDiscountList(discountList) {
     return discountList.filter(
-      (discount) => discount.limit_status === "enable" && Number((discount == null ? void 0 : discount.par_value) || 0) - Number((discount == null ? void 0 : discount.used_par_value) || 0) > 0
+      (discount) => discount.limit_status === "enable" && new import_decimal.default((discount == null ? void 0 : discount.par_value) || 0).minus(new import_decimal.default((discount == null ? void 0 : discount.used_par_value) || 0)).greaterThan(0)
     );
   }
   // 根据productIds去重
@@ -110,8 +121,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     }
     if (discount.appliedProductDetails) {
       return discount.appliedProductDetails.reduce((total, product) => {
-        const price = Number(product == null ? void 0 : product.amount) || 0;
-        return total + price;
+        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,14 @@ interface ApplicableProductDetails {
     resource_id: number;
     title: string;
     original_amount: string;
+    num: number;
+    discount?: {
+        product_id?: number;
+        original_amount?: string;
+        percent?: string;
+        resource_id?: number;
+        title?: string;
+    };
 }
 export interface Discount {
     id: number;
@@ -60,6 +68,8 @@ export interface Discount {
     applicableProductIds?: number[];
     applicableProductDetails: ApplicableProductDetails[];
     appliedProductDetails: ApplicableProductDetails[];
+    isDisabledForProductUsed?: boolean;
+    amount?: number;
 }
 export interface DiscountState {
     discountList: Discount[];

package/lib/modules/ProductList/index.d.ts

@@ -11,6 +11,13 @@ export declare class ProductList extends BaseModule implements Module {
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     storeChange(path?: string, value?: any): Promise<void>;
+    loadProducts({ category_ids, product_ids, collection, schedule_date, cacheId }: {
+        category_ids?: number[];
+        product_ids?: number[];
+        collection?: number | string[];
+        schedule_date?: string;
+        cacheId?: string;
+    }): Promise<any>;
     loadProductsPrice({ ids, customer_id, schedule_date, channel, }: {
         ids?: number[];
         customer_id?: number;

package/lib/modules/ProductList/index.js

@@ -64,6 +64,51 @@ var ProductList = class extends import_BaseModule.BaseModule {
       }
     });
   }
+  async loadProducts({
+    category_ids = [],
+    product_ids = [],
+    collection = [],
+    schedule_date,
+    cacheId
+  }) {
+    var _a;
+    let userPlugin = this.core.getPlugin("user");
+    let customer_id = void 0;
+    try {
+      customer_id = (_a = userPlugin == null ? void 0 : userPlugin.get()) == null ? void 0 : _a.id;
+    } catch (error) {
+      console.error(error);
+    }
+    const productsData = await this.request.post(
+      `/product/query`,
+      {
+        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"],
+        status: "published",
+        num: 500,
+        skip: 1,
+        customer_id,
+        category_ids,
+        ids: product_ids,
+        collection,
+        front_end_cache_id: cacheId,
+        // client_schedule_ids: schedule_ids,
+        schedule_date
+      },
+      { useCache: true }
+    );
+    this.addProduct(productsData.data.list);
+    return productsData.data.list;
+  }
   async loadProductsPrice({
     ids = [],
     customer_id,