@pisell/pisellos 2.0.38 → 2.0.40

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,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,

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);
@@ -58,8 +69,19 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         productList
       };
     }
+    if (productList.every((item) => {
+      var _a;
+      return item.booking_id && (((_a = item.discount_list) == null ? void 0 : _a.length) || item.price == 0);
+    })) {
+      return {
+        isAvailable: false,
+        discountList: oldDiscountList,
+        productList
+      };
+    }
+    const filteredOldDiscountList = oldDiscountList.filter((discount) => !discount.isEditMode && discount.tag !== "good_pass");
     const mergedDiscountList = (0, import_utils.uniqueById)((0, import_utils.uniqueById)([
-      ...oldDiscountList,
+      ...filteredOldDiscountList,
       ...newDiscountList
     ]), "product_id");
     const result = this.calcDiscount({
@@ -94,6 +116,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     discountList,
     productList
   }, options) {
+    const isEditModeAddNewProduct = productList.find((n) => n.booking_id) && productList.find((n) => !n.booking_id);
     const editModeDiscount = [];
     const addModeDiscount = [];
     discountList.forEach((discount) => {
@@ -107,19 +130,43 @@ 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) => {
+      var _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");
+      if (priceA.toNumber() === priceB.toNumber()) {
+        if (aProduct.quantity === bProduct.quantity) {
+          return ((_a = bProduct.discount_list) == null ? void 0 : _a.length) - ((_b = aProduct.discount_list) == null ? void 0 : _b.length);
+        }
+        return aProduct.quantity - bProduct.quantity;
+      }
+      return priceB.toNumber() - priceA.toNumber();
     });
     const usedDiscounts = /* @__PURE__ */ new Map();
     const discountApplicability = /* @__PURE__ */ new Map();
@@ -136,32 +183,40 @@ 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 || discount2.type))));
         if (isAvailableProduct && isLimitedProduct) {
           (_c = discountApplicability.get(discount.id)) == null ? void 0 : _c.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           applicableProducts.push({
             amount: product.price,
-            type: discount.tag,
+            type: discount.tag || discount.type,
+            tag: discount.tag || discount.type,
             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);
         }
       });
     });
-    sortedProductList.forEach((originProduct) => {
-      var _a, _b, _c, _d, _e;
+    console.log(sortedProductList, "sortedProductListsortedProductList");
+    sortedProductList.forEach((originProduct, i) => {
+      var _a, _b, _c, _d, _e, _f;
       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"))) {
-        processedProductsMap.set(product._id, 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 && ["good_pass", "discount_card", "product_discount_card"].includes(discount.tag || discount.type)))) {
+        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 || discount.type) === "good_pass")
           return false;
         const limitedData = discount.limited_relation_product_data;
         if (limitedData.type === "product_all") {
@@ -173,14 +228,17 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       });
       const selectedDiscount = applicableDiscounts[0];
       let isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : product.total != product.origin_total && (!((_c = product.discount_list) == null ? void 0 : _c.length) || ((_e = (_d = product == null ? void 0 : product.discount_list) == null ? void 0 : _d.every) == null ? void 0 : _e.call(_d, (item) => item.type === "product")));
-      if ((options == null ? void 0 : options.discountId) && (options == null ? void 0 : options.discountId) === (selectedDiscount == null ? void 0 : selectedDiscount.id)) {
+      if ((options == null ? void 0 : options.discountId) && ((_f = product.discount_list) == null ? void 0 : _f.some((item) => {
+        var _a2;
+        return ((_a2 = item.discount) == null ? void 0 : _a2.resource_id) === options.discountId;
+      }))) {
         isManualDiscount = false;
       }
       if (applicableDiscounts.length === 0 || isManualDiscount) {
         if (product.isClient) {
           processedProductsMap.set(
             product._id,
-            this.hooks.setProduct(originProduct, {
+            [this.hooks.setProduct(originProduct, {
               ...isManualDiscount ? {} : {
                 origin_total: (0, import_utils2.getProductOriginTotalPrice)({
                   product: {
@@ -189,6 +247,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   bundle: product.bundle,
                   options: product.options
                 }),
+                variant: originProduct._productInit.variant,
+                original_price: originProduct._productInit.original_price,
                 total: (0, import_utils2.getProductTotalPrice)({
                   product: {
                     price: product.price
@@ -199,45 +259,60 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 price: product.price
               },
               discount_list: []
-            })
+            })]
           );
         } else {
           processedProductsMap.set(
             product._id,
-            this.hooks.setProduct(originProduct, {
+            [this.hooks.setProduct(originProduct, {
               ...isManualDiscount ? {} : {
+                _id: product._id.split("___")[0] + "___" + i,
                 total: product.origin_total || product.total,
                 price: product.price
               },
               discount_list: []
-            })
+            })]
           );
         }
         return;
       }
-      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined" && !(options == null ? void 0 : options.scan)) {
+      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined" && !(options == null ? void 0 : options.scan) && !isEditModeAddNewProduct) {
         return;
       }
-      usedDiscounts.set(selectedDiscount.id, true);
-      const appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
-      const discountDetail = {
-        amount: product.price,
-        type: selectedDiscount.tag,
-        discount: {
-          resource_id: selectedDiscount.id,
-          title: selectedDiscount.format_title,
-          original_amount: product.origin_total,
-          product_id: selectedDiscount.product_id
-        }
-      };
-      appliedProducts.push(discountDetail);
-      appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
-      if (product.isClient) {
-        processedProductsMap.set(
-          product._id,
-          this.hooks.setProduct(originProduct, {
+      const isNeedSplit = (selectedDiscount.tag || selectedDiscount.type) === "good_pass";
+      const splitCount = isNeedSplit ? Math.min(product.quantity || product.num || 1, applicableDiscounts.filter((item) => (item.tag || item.type) === "good_pass").length) : 1;
+      const arr = [];
+      if (splitCount < product.quantity && isNeedSplit) {
+        arr.push(this.hooks.setProduct(originProduct, {
+          discount_list: [],
+          quantity: product.quantity - splitCount,
+          _id: product._id.split("___")[0]
+        }));
+      }
+      for (let i2 = 0; i2 < splitCount; i2++) {
+        const selectedDiscount2 = applicableDiscounts[i2];
+        usedDiscounts.set(selectedDiscount2.id, true);
+        const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
+        const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(product.origin_total || 0).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(product.origin_total || 0)).toNumber();
+        const discountDetail = {
+          amount: new import_decimal.default(product.origin_total || 0).minus(new import_decimal.default(targetProductTotal)).toNumber(),
+          type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
+          discount: {
+            resource_id: selectedDiscount2.id,
+            title: selectedDiscount2.format_title,
+            original_amount: product.origin_total,
+            product_id: originProduct.id,
+            percent: selectedDiscount2.par_value
+          },
+          num: product.num || 1
+        };
+        appliedProducts.push(discountDetail);
+        appliedDiscountProducts.set(selectedDiscount2.id, appliedProducts);
+        if (product.isClient) {
+          arr.push(this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
-            price: 0,
+            price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
+            quantity: isNeedSplit ? 1 : product.quantity,
             origin_total: (0, import_utils2.getProductOriginTotalPrice)({
               product: {
                 original_price: product.original_price
@@ -245,28 +320,26 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               bundle: product.bundle,
               options: product.options
             }),
-            total: (0, import_utils2.getProductTotalPrice)({
-              product: {
-                price: "0"
-              },
-              bundle: product.bundle,
-              options: product.options
-            })
-          })
-        );
-      } else {
-        processedProductsMap.set(
-          product._id,
-          this.hooks.setProduct(originProduct, {
+            variant: originProduct._productInit.variant,
+            original_price: new import_decimal.default(product.price || 0).toNumber(),
+            total: targetProductTotal
+          }));
+        } else {
+          arr.push(this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
-            price: 0,
-            total: (product.origin_total || product.total) - product.price,
+            _id: product._id.split("___")[0] + "___" + selectedDiscount2.id,
+            price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
+            quantity: isNeedSplit ? 1 : product.quantity,
+            total: targetProductTotal,
             origin_total: product.origin_total || product.total
-          })
-        );
+          }));
+        }
       }
+      console.log(arr, "arrarrarr");
+      processedProductsMap.set(product._id, arr);
     });
-    const processedProductList = productList.map((originProduct) => {
+    const processedProductList = [];
+    productList.forEach((originProduct) => {
       const product = this.hooks.getProduct(originProduct);
       const getDefaultProduct = () => {
         if (product.isClient) {
@@ -280,6 +353,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               bundle: product.bundle,
               options: product.options
             }),
+            variant: originProduct._productInit.variant,
+            original_price: originProduct._productInit.original_price,
             total: (0, import_utils2.getProductTotalPrice)({
               product: {
                 price: product.price
@@ -297,7 +372,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           });
         }
       };
-      return processedProductsMap.get(product._id) || getDefaultProduct();
+      const arr = processedProductsMap.get(product._id);
+      (arr == null ? void 0 : arr.length) ? processedProductList.push(...arr) : processedProductList.push(getDefaultProduct());
     });
     const updatedDiscountList = addModeDiscount.map((discount) => {
       const applicableProducts = discountApplicability.get(discount.id) || [];
@@ -321,6 +397,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return {
           ...discount,
           isSelected: true,
+          isManualSelect: (options == null ? void 0 : options.scan) ? false : discount.isManualSelect,
           // 标记为可用，因为它已被应用
           isAvailable: true,
           // 记录适用的商品IDs
@@ -342,6 +419,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         // 如果有适用的商品，标记为可用
         isAvailable,
         isSelected,
+        // 如果是扫码进来的，要手动设置为手动选择：false
+        isManualSelect: (options == null ? void 0 : options.scan) ? false : discount.isManualSelect,
         // 记录适用的商品IDs
         applicableProductIds: applicableProducts,
         // 添加可抵扣的商品详情
@@ -350,6 +429,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         appliedProductDetails: []
       };
     });
+    console.log(processedProductList, "processedProductList");
     return {
       productList: processedProductList,
       discountList: [...editModeDiscount, ...updatedDiscountList]