@pisell/pisellos 1.0.5 → 1.0.7

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

@@ -1,6 +1,7 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
 import { CartItem, CartModuleAPI, ECartItemCheckType, ECartItemInfoType, IAddItemParams, IUpdateItemParams } from './types';
+import { Account } from '../Account';
 export * from './types';
 /**
  * 购物车模块实现
@@ -67,4 +68,17 @@ export declare class CartModule extends BaseModule implements Module, CartModule
     clear(): void;
     storeChange(): void;
     checkCartItemByType(cartItem: CartItem, type: ECartItemCheckType): boolean;
+    /**
+     * 基于rowkey 合并商品，目前只有普通商品需要合并
+     *
+     * @param {string} rowKey
+     * @param {number} quantity
+     * @return {*}
+     * @memberof CartModule
+     */
+    mergeCartItemByRowKey(params: {
+        rowKey?: string;
+        quantity?: number;
+        account?: Account;
+    }): boolean;
 }

package/lib/modules/Cart/index.js

@@ -27,6 +27,7 @@ var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
 var import_utils = require("./utils");
 var import_lodash_es = require("lodash-es");
+var import_utils2 = require("../Product/utils");
 __reExport(Cart_exports, require("./types"), module.exports);
 var CartModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -310,6 +311,37 @@ var CartModule = class extends import_BaseModule.BaseModule {
     }
     return result;
   }
+  /**
+   * 基于rowkey 合并商品，目前只有普通商品需要合并
+   *
+   * @param {string} rowKey
+   * @param {number} quantity
+   * @return {*} 
+   * @memberof CartModule
+   */
+  mergeCartItemByRowKey(params) {
+    const { rowKey, quantity, account } = params;
+    let flag = false;
+    const cartItems = this.getItems();
+    const targetCartItem = cartItems.find(
+      (n) => {
+        var _a;
+        return ((_a = n._productOrigin) == null ? void 0 : _a.rowKey) === rowKey;
+      }
+    );
+    const isSameAccount = (account == null ? void 0 : account.id) === (targetCartItem == null ? void 0 : targetCartItem.holder_id);
+    if (rowKey && targetCartItem && (0, import_utils2.isNormalProduct)(targetCartItem._productOrigin) && isSameAccount) {
+      this.updateItem({
+        _id: targetCartItem._id,
+        product: {
+          ...targetCartItem._productOrigin,
+          quantity: (targetCartItem.num || 1) + (quantity || 1)
+        }
+      });
+      flag = true;
+    }
+    return flag;
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Cart/utils/cartProduct.js

@@ -194,7 +194,7 @@ var getProductOriginTotalPrice = (params) => {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price * num;
+  return price;
 };
 var formatOptions = (options) => {
   if (!(options == null ? void 0 : options.length))

package/lib/modules/Cart/utils/changePrice.d.ts

@@ -0,0 +1,3 @@
+import { Product } from "../../Product";
+import { CartItem, IUpdateItemParams } from "../types";
+export declare function updateAllCartItemPrice(cartItems: CartItem[], priceData: any, getProduct: (id: number) => Promise<Product | undefined>, updateCart: (item: IUpdateItemParams) => void): Promise<void>;

package/lib/modules/Cart/utils/changePrice.js

@@ -0,0 +1,64 @@
+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);
+
+// src/modules/Cart/utils/changePrice.ts
+var changePrice_exports = {};
+__export(changePrice_exports, {
+  updateAllCartItemPrice: () => updateAllCartItemPrice
+});
+module.exports = __toCommonJS(changePrice_exports);
+async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCart) {
+  for (const item of cartItems) {
+    const targetProduct = priceData.find((n) => n.id === item.id);
+    const cartProduct = await getProduct(
+      item.id
+    );
+    const productInfo = cartProduct == null ? void 0 : cartProduct.getData();
+    let bundle = item._bundleOrigin;
+    productInfo.price = targetProduct == null ? void 0 : targetProduct.price;
+    productInfo.base_price = targetProduct == null ? void 0 : targetProduct.base_price;
+    bundle = bundle == null ? void 0 : bundle.map((n) => {
+      var _a;
+      const targetBundle = (_a = targetProduct == null ? void 0 : targetProduct.bundle_group) == null ? void 0 : _a.find(
+        (m) => m.id === n.group_id
+      );
+      if (targetBundle) {
+        const targetBundleItem = targetBundle.bundle_item.find(
+          (m) => m.id === n.id
+        );
+        if (targetBundleItem) {
+          return {
+            ...n,
+            price: targetBundleItem.price,
+            base_price: targetBundleItem.base_price
+          };
+        }
+      }
+      return n;
+    });
+    updateCart({
+      _id: item._id,
+      product: productInfo,
+      bundle
+    });
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  updateAllCartItemPrice
+});

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,29 +69,70 @@ var DateModule = class extends import_BaseModule.BaseModule {
     return this.store.dateRange;
   }
   async getResourceDates(params) {
+    var _a;
+    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;
+      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));
+          }
+        );
+        currentItem.resource = [
+          ...currentItem.resource || [],
+          ...newResource || []
+        ];
+        currentDateList[currentItemIndex] = currentItem;
+      } else {
+        currentDateList.push(item);
+      }
+    });
+    this.store.dateList = currentDateList;
   }
   async fetchResourceDates(params) {
     const { url, query } = params;
     const fetchUrl = url || "/schedule/resource/list";
     const { start_date, end_date, resource_ids } = query || {};
     try {
-      const res = await this.request.get(fetchUrl, {
-        start_date,
-        end_date,
-        resource_ids,
-        front_end_cache_id: this.cacheId
-      }, {
-        useCache: true
-      });
+      const res = await this.request.get(
+        fetchUrl,
+        {
+          start_date,
+          end_date,
+          resource_ids,
+          front_end_cache_id: this.cacheId
+        },
+        {
+          useCache: true
+        }
+      );
       return res;
     } catch (error) {
       console.error(error);

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,21 +79,22 @@ 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) || []]
     ) || [];
+    this.setDiscountList(goodPassList);
     return goodPassList;
   }
   async batchSearch(code) {
     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 +103,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 +122,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,

package/lib/modules/Rules/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/Rules/index.ts
@@ -26,6 +36,7 @@ var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
 var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
+var import_decimal = __toESM(require("decimal.js"));
 var RulesModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -107,19 +118,36 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       return !discount.isManualSelect;
     });
     const sortedDiscountList = [...filteredDiscountList].sort((a, b) => {
-      if (a.expire_time && b.expire_time) {
-        const timeA = new Date(a.expire_time).getTime();
-        const timeB = new Date(b.expire_time).getTime();
-        return timeA - timeB;
+      if (a.tag === "good_pass" && b.tag !== "good_pass")
+        return -1;
+      if (b.tag === "good_pass" && a.tag !== "good_pass")
+        return 1;
+      if (a.tag === "good_pass" && b.tag === "good_pass") {
+        return compareByExpireTime(a, b);
+      } else if (a.tag === "product_discount_card" && b.tag === "product_discount_card") {
+        if (a.par_value !== b.par_value) {
+          const valueA = new import_decimal.default(100).minus(a.par_value || 0);
+          const valueB = new import_decimal.default(100).minus(b.par_value || 0);
+          return valueA.minus(valueB).toNumber();
+        }
+        return compareByExpireTime(a, b);
+      }
+      return compareByExpireTime(a, b);
+      function compareByExpireTime(itemA, itemB) {
+        if (itemA.expire_time && itemB.expire_time) {
+          const timeA = new Date(itemA.expire_time).getTime();
+          const timeB = new Date(itemB.expire_time).getTime();
+          return timeA - timeB;
+        }
+        return itemA.expire_time ? -1 : itemB.expire_time ? 1 : 0;
       }
-      return a.expire_time ? -1 : b.expire_time ? 1 : 0;
     });
     const sortedProductList = [...productList].sort((a, b) => {
       const aProduct = this.hooks.getProduct(a);
       const bProduct = this.hooks.getProduct(b);
-      const priceA = parseFloat(aProduct.price || "0");
-      const priceB = parseFloat(bProduct.price || "0");
-      return priceB - priceA;
+      const priceA = new import_decimal.default(aProduct.price || "0");
+      const priceB = new import_decimal.default(bProduct.price || "0");
+      return priceB.minus(priceA).toNumber();
     });
     const usedDiscounts = /* @__PURE__ */ new Map();
     const discountApplicability = /* @__PURE__ */ new Map();
@@ -136,7 +164,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         var _a, _b, _c;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
         const isLimitedProduct = limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id);
-        const isAvailableProduct = !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && discount2.type === "good_pass")));
+        const isAvailableProduct = !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.tag))));
         if (isAvailableProduct && isLimitedProduct) {
           (_c = discountApplicability.get(discount.id)) == null ? void 0 : _c.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
@@ -146,8 +174,11 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             discount: {
               resource_id: discount.id,
               title: discount.format_title,
-              original_amount: product.origin_total
-            }
+              original_amount: product.origin_total,
+              pre_value: discount.par_value,
+              product_id: originProduct.id
+            },
+            num: product.num || 1
           });
           discountApplicableProducts.set(discount.id, applicableProducts);
         }
@@ -156,12 +187,15 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     sortedProductList.forEach((originProduct) => {
       var _a, _b, _c, _d, _e;
       const product = this.hooks.getProduct(originProduct);
-      if ((product == null ? void 0 : product.booking_id) && ((_a = product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount) => discount.id && discount.type === "good_pass"))) {
+      if ((product == null ? void 0 : product.booking_id) && ((_a = product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount) => discount.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount.tag)))) {
         processedProductsMap.set(product._id, originProduct);
         return;
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
-        if (usedDiscounts.get(discount.id))
+        if (Number(product.price) === 0 || !product.price)
+          return false;
+        const targetUsedDiscounts = usedDiscounts.get(discount.id);
+        if (targetUsedDiscounts && discount.tag === "good_pass")
           return false;
         const limitedData = discount.limited_relation_product_data;
         if (limitedData.type === "product_all") {
@@ -220,15 +254,18 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       usedDiscounts.set(selectedDiscount.id, true);
       const appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
+      const targetProductPrice = selectedDiscount.tag === "good_pass" ? "0" : new import_decimal.default(100).minus(selectedDiscount.par_value || 0).div(100).mul(new import_decimal.default(product.price || 0)).toFixed(2);
       const discountDetail = {
-        amount: product.price,
-        type: selectedDiscount.tag,
+        amount: selectedDiscount.tag === "product_discount_card" ? new import_decimal.default(product.price || 0).minus(new import_decimal.default(targetProductPrice)).toNumber() : product.price,
+        type: selectedDiscount.tag === "product_discount_card" ? "discount_card" : selectedDiscount.tag,
         discount: {
           resource_id: selectedDiscount.id,
           title: selectedDiscount.format_title,
-          original_amount: product.origin_total,
-          product_id: selectedDiscount.product_id
-        }
+          original_amount: product.price,
+          product_id: originProduct.id,
+          percent: selectedDiscount.par_value
+        },
+        num: product.num || 1
       };
       appliedProducts.push(discountDetail);
       appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
@@ -237,7 +274,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           product._id,
           this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
-            price: 0,
+            price: new import_decimal.default(targetProductPrice).toNumber(),
             origin_total: (0, import_utils2.getProductOriginTotalPrice)({
               product: {
                 original_price: product.original_price
@@ -247,7 +284,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             }),
             total: (0, import_utils2.getProductTotalPrice)({
               product: {
-                price: "0"
+                price: targetProductPrice
               },
               bundle: product.bundle,
               options: product.options
@@ -259,8 +296,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           product._id,
           this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
-            price: 0,
-            total: (product.origin_total || product.total) - product.price,
+            price: new import_decimal.default(targetProductPrice).toNumber(),
+            total: new import_decimal.default(product.origin_total || product.total || 0).minus(new import_decimal.default(product.price || 0).minus(new import_decimal.default(targetProductPrice))).toNumber(),
             origin_total: product.origin_total || product.total
           })
         );

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

@@ -37,6 +37,7 @@ type ProductDetail = {
     options?: any[];
     bundle?: any[];
     original_price?: number | string;
+    num?: number;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

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

@@ -1,16 +1,24 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { ScheduleModuleAPI, ScheduleAvailabilityDateItem, ScheduleItem } from './types';
+import { ScheduleModuleAPI, ScheduleAvailabilityDateItem, ScheduleItem, LoadScheduleAvailableDateParams } from './types';
 export declare class ScheduleModule extends BaseModule implements Module, ScheduleModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
+    private request;
     private store;
     private cacheId;
     private openCache;
     private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /**
+     * 加载当前店铺下所有 schedule
+     *
+     * @memberof ScheduleModule
+     */
+    loadAllSchedule(): Promise<void>;
     setScheduleList(list: ScheduleItem[]): void;
+    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel, }: LoadScheduleAvailableDateParams): Promise<import("../Date/types").ITime[]>;
     getScheduleListByIds(ids: number[]): ScheduleItem[];
     setAvailabilityScheduleDateList(list: ScheduleAvailabilityDateItem[]): void;
     getAvailabilityScheduleDateList(): ScheduleAvailabilityDateItem[];