@pisell/pisellos 1.0.74 → 1.0.76

package/dist/modules/ProductList/index.js

@@ -141,9 +141,16 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
               });
+              if (sortedList.length) {
+                sortedList.forEach(function (n) {
+                  if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {
+                    n.is_eject = 1;
+                  }
+                });
+              }
               this.addProduct(sortedList);
               return _context3.abrupt("return", sortedList);
-            case 10:
+            case 11:
             case "end":
               return _context3.stop();
           }

package/dist/solution/BookingByStep/index.js

@@ -1197,7 +1197,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         date: date
       });
       // 如果 quantity 大于 1，且是预约商品，则进入购物车拆散成多条数据
-      if (addItemParams.quantity > 1 && !isNormalProduct(productData.origin)) {
+      if (addItemParams.quantity > 1 && !isNormalProduct(productData)) {
         for (var i = 0; i < addItemParams.quantity; i++) {
           var newAddItemParams = cloneDeep(addItemParams);
           newAddItemParams.quantity = 1;
@@ -2735,7 +2735,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "checkMaxDurationCapacity",
     value: function checkMaxDurationCapacity() {
       var _this15 = this;
-      var cartItems = cloneDeep(this.store.cart.getItems());
+      var cartItems = this.store.cart.getItems().filter(function (item) {
+        return !isNormalProduct(item._productOrigin);
+      });
       if (cartItems.length === 0) return {
         success: true,
         minAvailableCount: 0

package/dist/solution/ShopDiscount/index.js

@@ -320,7 +320,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "scanCode",
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
-        var _this$store$discount3, resultDiscountList, rulesModule, withScanList, _ref2, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
+        var _this$store$discount3, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -363,7 +363,25 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 return _objectSpread(_objectSpread({}, item), {}, {
                   isScan: true
                 });
+              }); // 如果扫回来的券当前有选中的，则不进行计算
+              currentSelectedDiscountList = this.getDiscountList().filter(function (n) {
+                return n.isSelected;
               });
+              if (!(currentSelectedDiscountList.length && currentSelectedDiscountList.some(function (n) {
+                return withScanList.some(function (m) {
+                  return m.id === n.id;
+                });
+              }))) {
+                _context5.next = 16;
+                break;
+              }
+              return _context5.abrupt("return", {
+                type: "clientCalc",
+                isAvailable: true,
+                productList: this.store.productList || [],
+                discountList: this.getDiscountList()
+              });
+            case 16:
               _ref2 = rulesModule.isDiscountListAvailable({
                 productList: this.store.productList || [],
                 oldDiscountList: this.getDiscountList(),
@@ -374,27 +392,27 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList()
               }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, isAvailable = _ref2.isAvailable;
               if (!isAvailable) {
-                _context5.next = 21;
+                _context5.next = 24;
                 break;
               }
               this.setDiscountList(newDiscountList || []);
               this.store.originalDiscountList = newDiscountList || [];
               this.setProductList(newProductList || []);
               if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop')) {
-                _context5.next = 21;
+                _context5.next = 24;
                 break;
               }
-              _context5.next = 21;
+              _context5.next = 24;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
-            case 21:
+            case 24:
               return _context5.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: isAvailable || false,
                 productList: newProductList || this.store.productList || [],
                 discountList: newDiscountList || this.getDiscountList()
               });
-            case 24:
-              _context5.prev = 24;
+            case 27:
+              _context5.prev = 27;
               _context5.t1 = _context5["catch"](0);
               console.error('[ShopDiscount] 扫码出错:', _context5.t1);
               return _context5.abrupt("return", {
@@ -403,11 +421,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
               });
-            case 28:
+            case 31:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 24]]);
+        }, _callee5, this, [[0, 27]]);
       }));
       function scanCode(_x4, _x5) {
         return _scanCode.apply(this, arguments);

package/lib/modules/ProductList/index.js

@@ -103,6 +103,13 @@ var ProductList = class extends import_BaseModule.BaseModule {
       { useCache: true }
     );
     const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
+    if (sortedList.length) {
+      sortedList.forEach((n) => {
+        if (n.is_eject !== 1 && n["schedule.ids"] && n["schedule.ids"].length) {
+          n.is_eject = 1;
+        }
+      });
+    }
     this.addProduct(sortedList);
     return sortedList;
   }

package/lib/solution/BookingByStep/index.js

@@ -637,7 +637,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       addItemParams.account = account;
     }
     this.addProductCheck({ date });
-    if (addItemParams.quantity > 1 && !(0, import_utils5.isNormalProduct)(productData.origin)) {
+    if (addItemParams.quantity > 1 && !(0, import_utils5.isNormalProduct)(productData)) {
       for (let i = 0; i < addItemParams.quantity; i++) {
         const newAddItemParams = (0, import_lodash_es.cloneDeep)(addItemParams);
         newAddItemParams.quantity = 1;
@@ -1924,7 +1924,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   checkMaxDurationCapacity() {
     var _a, _b;
-    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
+    const cartItems = this.store.cart.getItems().filter((item) => !(0, import_utils5.isNormalProduct)(item._productOrigin));
     if (cartItems.length === 0)
       return { success: true, minAvailableCount: 0 };
     const itemsWithTime = [];

package/lib/solution/ShopDiscount/index.js

@@ -233,6 +233,15 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
           isScan: true
         };
       });
+      const currentSelectedDiscountList = this.getDiscountList().filter((n) => n.isSelected);
+      if (currentSelectedDiscountList.length && currentSelectedDiscountList.some((n) => withScanList.some((m) => m.id === n.id))) {
+        return {
+          type: "clientCalc",
+          isAvailable: true,
+          productList: this.store.productList || [],
+          discountList: this.getDiscountList()
+        };
+      }
       const {
         productList: newProductList,
         discountList: newDiscountList,

package/package.json

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