@pisell/pisellos 0.0.147 → 0.0.149

package/dist/solution/ShopDiscount/index.js

@@ -28,6 +28,7 @@ import { BaseModule } from "../../modules/BaseModule";
 import { ShopDiscountHooks } from "./types";
 import { DiscountModule } from "../../modules/Discount";
 import { RulesModule } from "../../modules/Rules";
+import Decimal from 'decimal.js';
 export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(ShopDiscountImpl, _BaseModule);
   var _super = _createSuper(ShopDiscountImpl);
@@ -442,24 +443,26 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           (item.discount_list || []).forEach(function (discount) {
             if (discount.id && ['good_pass', 'discount_card'].includes(discount.type)) {
               var index = editModeDiscountList.findIndex(function (n) {
-                return n.id === discount.id;
+                var _discount$discount;
+                return n.id === ((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id;
               });
               if (index !== -1) {
                 editModeDiscountList[index] = _objectSpread(_objectSpread({}, editModeDiscountList[index]), {}, {
-                  amount: discount.amount + editModeDiscountList[index].amount
+                  amount: new Decimal(discount.amount || 0).plus(new Decimal(editModeDiscountList[index].amount || 0)).toNumber(),
+                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.num) || 1).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
                 });
               } else {
-                var _discount$discount, _discount$discount2, _discount$discount3;
+                var _discount$discount2, _discount$discount3, _discount$discount4;
                 editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
                   isEditMode: true,
                   limited_relation_product_data: {},
                   savedAmount: discount.amount * ((product === null || product === void 0 ? void 0 : product.num) || 1),
                   isAvailable: true,
-                  id: ((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id,
-                  format_title: ((_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.title) || discount.format_title,
+                  id: ((_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) || discount.id,
+                  format_title: ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.title) || discount.format_title,
                   isDisabled: true,
                   isSelected: true,
-                  product_id: ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.product_id) || discount.product_id
+                  product_id: ((_discount$discount4 = discount.discount) === null || _discount$discount4 === void 0 ? void 0 : _discount$discount4.product_id) || discount.product_id
                 }));
               }
             }

package/lib/solution/ShopDiscount/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/solution/ShopDiscount/index.ts
@@ -27,6 +37,7 @@ var import_BaseModule = require("../../modules/BaseModule");
 var import_types = require("./types");
 var import_Discount = require("../../modules/Discount");
 var import_Rules = require("../../modules/Rules");
+var import_decimal = __toESM(require("decimal.js"));
 var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -276,11 +287,15 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         (item.discount_list || []).forEach((discount) => {
           var _a3, _b, _c;
           if (discount.id && ["good_pass", "discount_card"].includes(discount.type)) {
-            const index = editModeDiscountList.findIndex((n) => n.id === discount.id);
+            const index = editModeDiscountList.findIndex((n) => {
+              var _a4;
+              return n.id === ((_a4 = discount.discount) == null ? void 0 : _a4.resource_id) || discount.id;
+            });
             if (index !== -1) {
               editModeDiscountList[index] = {
                 ...editModeDiscountList[index],
-                amount: discount.amount + editModeDiscountList[index].amount
+                amount: new import_decimal.default(discount.amount || 0).plus(new import_decimal.default(editModeDiscountList[index].amount || 0)).toNumber(),
+                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.num) || 1).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
               };
             } else {
               editModeDiscountList.push({

package/package.json

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