@pisell/pisellos 0.0.137 → 0.0.139

package/dist/solution/BookingByStep/index.js

@@ -559,7 +559,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "storeProduct",
     value: function () {
       var _storeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(productData) {
-        var activeAccount, _ref4, bundle, options, origin, product_variant_id, _ref4$quantity, quantity, rowKey, cartItems, targetCartItem, currentAccount, targetAccount, isSameAccount, product, addCartItem;
+        var activeAccount, _ref4, bundle, options, origin, product_variant_id, _ref4$quantity, quantity, rowKey, cartItems, currentAccount, targetCartItem, targetAccount, isSameAccount, product, addCartItem;
         return _regeneratorRuntime().wrap(function _callee7$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -572,11 +572,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 _context8.next = 12;
                 break;
               }
+              currentAccount = this.store.accountList.getActiveAccount();
               targetCartItem = cartItems.find(function (n) {
                 var _n$_productOrigin;
-                return ((_n$_productOrigin = n._productOrigin) === null || _n$_productOrigin === void 0 ? void 0 : _n$_productOrigin.rowKey) === rowKey;
+                return ((_n$_productOrigin = n._productOrigin) === null || _n$_productOrigin === void 0 ? void 0 : _n$_productOrigin.rowKey) === rowKey && n.holder_id === (currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.getId());
               });
-              currentAccount = this.store.accountList.getActiveAccount();
               targetAccount = targetCartItem === null || targetCartItem === void 0 ? void 0 : targetCartItem.holder_id;
               isSameAccount = (currentAccount === null || currentAccount === void 0 ? void 0 : currentAccount.getId()) === targetAccount;
               if (!(targetCartItem && isNormalProduct(targetCartItem._productOrigin) && isSameAccount)) {

package/dist/solution/ShopDiscount/index.d.ts

@@ -10,6 +10,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private window;
     private store;
     private options;
+    private hooks?;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     destroy(): Promise<void>;

package/dist/solution/ShopDiscount/index.js

@@ -43,6 +43,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "window", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "options", {});
+    _defineProperty(_assertThisInitialized(_this), "hooks", void 0);
     _this.store = {
       customer: null,
       productList: [],
@@ -63,6 +64,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               this.core = core;
               this.options = options;
               this.store = _objectSpread(_objectSpread({}, this.store), options.store || {});
+              this.hooks = options.hooks;
               console.log('[ShopDiscount] 初始化完成');
 
               // 获取依赖的插件
@@ -73,7 +75,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 注册事件监听
               this.registerEventListeners();
-            case 7:
+            case 8:
             case "end":
               return _context.stop();
           }
@@ -428,18 +430,21 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setDiscountList",
     value: function setDiscountList(discountList) {
-      var _this$store$discount5;
+      var _this3 = this,
+        _this$store$discount5;
       var productList = this.store.productList || [];
       var editModeDiscountList = [];
       productList.forEach(function (item) {
         if (item.booking_id) {
+          var _this3$hooks;
+          var product = (_this3$hooks = _this3.hooks) === null || _this3$hooks === void 0 ? void 0 : _this3$hooks.getProduct(item);
           (item.discount_list || []).forEach(function (discount) {
             if (discount.id && ['good_pass', 'discount_card'].includes(discount.type)) {
               var _discount$discount, _discount$discount2, _discount$discount3;
               editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
                 isEditMode: true,
                 limited_relation_product_data: {},
-                savedAmount: discount.amount,
+                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,

package/lib/solution/BookingByStep/index.js

@@ -347,11 +347,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const { bundle, options, origin, product_variant_id, quantity = 1, rowKey } = productData || {};
     const cartItems = this.store.cart.getItems();
     if (rowKey) {
+      const currentAccount = this.store.accountList.getActiveAccount();
       const targetCartItem = cartItems.find((n) => {
         var _a;
-        return ((_a = n._productOrigin) == null ? void 0 : _a.rowKey) === rowKey;
+        return ((_a = n._productOrigin) == null ? void 0 : _a.rowKey) === rowKey && n.holder_id === (currentAccount == null ? void 0 : currentAccount.getId());
       });
-      const currentAccount = this.store.accountList.getActiveAccount();
       const targetAccount = targetCartItem == null ? void 0 : targetCartItem.holder_id;
       const isSameAccount = (currentAccount == null ? void 0 : currentAccount.getId()) === targetAccount;
       if (targetCartItem && (0, import_utils4.isNormalProduct)(targetCartItem._productOrigin) && isSameAccount) {

package/lib/solution/ShopDiscount/index.d.ts

@@ -10,6 +10,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private window;
     private store;
     private options;
+    private hooks?;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     destroy(): Promise<void>;

package/lib/solution/ShopDiscount/index.js

@@ -46,6 +46,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     this.core = core;
     this.options = options;
     this.store = { ...this.store, ...options.store || {} };
+    this.hooks = options.hooks;
     console.log("[ShopDiscount] 初始化完成");
     this.initializePlugins();
     this.registerDependentModules();
@@ -268,17 +269,19 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     const productList = this.store.productList || [];
     const editModeDiscountList = [];
     productList.forEach((item) => {
+      var _a2;
       if (item.booking_id) {
+        const product = (_a2 = this.hooks) == null ? void 0 : _a2.getProduct(item);
         (item.discount_list || []).forEach((discount) => {
-          var _a2, _b, _c;
+          var _a3, _b, _c;
           if (discount.id && ["good_pass", "discount_card"].includes(discount.type)) {
             editModeDiscountList.push({
               ...discount,
               isEditMode: true,
               limited_relation_product_data: {},
-              savedAmount: discount.amount,
+              savedAmount: discount.amount * ((product == null ? void 0 : product.num) || 1),
               isAvailable: true,
-              id: ((_a2 = discount.discount) == null ? void 0 : _a2.resource_id) || discount.id,
+              id: ((_a3 = discount.discount) == null ? void 0 : _a3.resource_id) || discount.id,
               format_title: ((_b = discount.discount) == null ? void 0 : _b.title) || discount.format_title,
               isDisabled: true,
               isSelected: true,

package/package.json

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