@pisell/pisellos 0.0.150 → 0.0.152

package/dist/modules/Rules/index.js

@@ -149,6 +149,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var _this3 = this;
       var discountList = _ref2.discountList,
         productList = _ref2.productList;
+      // debugger
+
+      // 识别出来是不是在编辑的界面里又新增了商品
+      // 这种情况下，如果有可用的优惠券，也会自动勾选上
+      var isEditModeAddNewProduct = productList.find(function (n) {
+        return n.booking_id;
+      }) && productList.find(function (n) {
+        return !n.booking_id;
+      });
       var editModeDiscount = [];
       var addModeDiscount = [];
       discountList.forEach(function (discount) {
@@ -262,7 +271,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 编辑的商品 使用了优惠券不可用
           var isAvailableProduct = !(product !== null && product !== void 0 && product.booking_id && product !== null && product !== void 0 && (_product$discount_lis = product.discount_list) !== null && _product$discount_lis !== void 0 && _product$discount_lis.length && product !== null && product !== void 0 && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.every(function (discount) {
-            return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag);
+            return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
           }));
 
           // 判断优惠券是否适用于该商品
@@ -275,7 +284,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var 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,
@@ -296,7 +306,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var _product$discount_lis3, _product$discount_lis4, _product$discount_lis5, _product$discount_lis6, _product$discount_lis7;
         var product = _this3.hooks.getProduct(originProduct);
         if (product !== null && product !== void 0 && product.booking_id && (_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.length && product !== null && product !== void 0 && (_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.every(function (discount) {
-          return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag);
+          return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
         })) {
           processedProductsMap.set(product._id, [originProduct]);
           return;
@@ -308,7 +318,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           if (Number(product.price) === 0 || !product.price) return false;
           // 如果优惠券已被使用，则跳过
           var targetUsedDiscounts = usedDiscounts.get(discount.id);
-          if (targetUsedDiscounts && discount.tag === 'good_pass') return false;
+          if (targetUsedDiscounts && (discount.tag || discount.type) === 'good_pass') return false;
           var limitedData = discount.limited_relation_product_data;
 
           // 判断优惠券是否适用于该商品
@@ -369,15 +379,19 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           return;
         }
-        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan)) {
+        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan) && !isEditModeAddNewProduct) {
           return;
         }
 
+        // 是否需要拆分
+        var isNeedSplit = (selectedDiscount.tag || selectedDiscount.type) === 'good_pass';
+
         // 需要拆分出来的数量
-        var splitCount = Math.min(product.quantity, applicableDiscounts.length);
-        debugger;
+        var splitCount = isNeedSplit ? Math.min(product.quantity, applicableDiscounts.filter(function (item) {
+          return (item.tag || item.type) === 'good_pass';
+        }).length) : 1;
         var arr = [];
-        if (splitCount < product.quantity) {
+        if (splitCount < product.quantity && isNeedSplit) {
           arr.push(_this3.hooks.setProduct(originProduct, {
             discount_list: [],
             quantity: product.quantity - splitCount,
@@ -413,7 +427,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             arr.push(_this3.hooks.setProduct(originProduct, {
               discount_list: [discountDetail],
               price: new Decimal(targetProductPrice).toNumber(),
-              quantity: 1,
+              quantity: isNeedSplit ? 1 : product.quantity,
               origin_total: getProductOriginTotalPrice({
                 product: {
                   original_price: product.original_price
@@ -434,7 +448,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               discount_list: [discountDetail],
               _id: product._id.split('___')[0] + "___" + _selectedDiscount.id,
               price: new Decimal(targetProductPrice).toNumber(),
-              quantity: 1,
+              quantity: isNeedSplit ? 1 : product.quantity,
               total: new Decimal(product.origin_total || product.total || 0).minus(new Decimal(product.price || 0).minus(new Decimal(targetProductPrice))).toNumber(),
               origin_total: product.origin_total || product.total
             }));
@@ -478,7 +492,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
         };
         var arr = processedProductsMap.get(product._id);
-        arr.length ? processedProductList.push.apply(processedProductList, _toConsumableArray(arr)) : processedProductList.push(getDefaultProduct());
+        arr !== null && arr !== void 0 && arr.length ? processedProductList.push.apply(processedProductList, _toConsumableArray(arr)) : processedProductList.push(getDefaultProduct());
       });
 
       // 按原始顺序更新优惠券列表，标记已使用和可用的优惠券

package/dist/solution/BookingByStep/index.js

@@ -2242,7 +2242,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               dateRange = this.store.date.getDateRange(); // 如果不是先选日期的流程 duration 商品就啥也不做
-              if (dateRange.length) {
+              if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
                 _context25.next = 15;
                 break;
               }
@@ -2876,6 +2876,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "isTargetNormalProduct",
     value: function isTargetNormalProduct(product) {
+      if (!product) return false;
       return isNormalProduct(product);
     }
   }, {

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

@@ -38,6 +38,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         isAvailable: boolean;
         productList: Record<string, any>[];
         discountList: Discount[];
+        type: "server" | "clientCalc";
     }>;
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;
     private getCustomer;

package/dist/solution/ShopDiscount/index.js

@@ -327,11 +327,23 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               return _context5.abrupt("return", {
+                type: "clientCalc",
                 isAvailable: false,
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
               });
             case 10:
+              if (resultDiscountList.length) {
+                _context5.next = 12;
+                break;
+              }
+              return _context5.abrupt("return", {
+                type: "server",
+                isAvailable: false,
+                productList: this.store.productList || [],
+                discountList: this.getDiscountList()
+              });
+            case 12:
               withScanList = resultDiscountList.map(function (item) {
                 return _objectSpread(_objectSpread({}, item), {}, {
                   isScan: true
@@ -347,37 +359,39 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList()
               }, newProductList = _ref3.productList, newDiscountList = _ref3.discountList, isAvailable = _ref3.isAvailable;
               if (!isAvailable) {
-                _context5.next = 18;
+                _context5.next = 20;
                 break;
               }
               this.setDiscountList(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 = 18;
+                _context5.next = 20;
                 break;
               }
-              _context5.next = 18;
+              _context5.next = 20;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
-            case 18:
+            case 20:
               return _context5.abrupt("return", {
+                type: "clientCalc",
                 isAvailable: isAvailable || false,
                 productList: newProductList || this.store.productList || [],
                 discountList: newDiscountList || this.getDiscountList()
               });
-            case 21:
-              _context5.prev = 21;
+            case 23:
+              _context5.prev = 23;
               _context5.t1 = _context5["catch"](0);
               console.error('[ShopDiscount] 扫码出错:', _context5.t1);
               return _context5.abrupt("return", {
+                type: "clientCalc",
                 isAvailable: false,
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
               });
-            case 25:
+            case 27:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 21]]);
+        }, _callee5, this, [[0, 23]]);
       }));
       function scanCode(_x4) {
         return _scanCode.apply(this, arguments);
@@ -444,7 +458,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
             if (discount.id && ['good_pass', 'discount_card'].includes(discount.type)) {
               var index = editModeDiscountList.findIndex(function (n) {
                 var _discount$discount;
-                return n.id === ((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id;
+                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]), {}, {

package/lib/modules/Rules/index.js

@@ -105,6 +105,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) => {
@@ -171,13 +172,14 @@ 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 && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.tag))));
+        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,
@@ -195,7 +197,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     sortedProductList.forEach((originProduct, i) => {
       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 && ["good_pass", "discount_card", "product_discount_card"].includes(discount.tag)))) {
+      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;
       }
@@ -203,7 +205,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (Number(product.price) === 0 || !product.price)
           return false;
         const targetUsedDiscounts = usedDiscounts.get(discount.id);
-        if (targetUsedDiscounts && discount.tag === "good_pass")
+        if (targetUsedDiscounts && (discount.tag || discount.type) === "good_pass")
           return false;
         const limitedData = discount.limited_relation_product_data;
         if (limitedData.type === "product_all") {
@@ -261,13 +263,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         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;
       }
-      const splitCount = Math.min(product.quantity, applicableDiscounts.length);
-      debugger;
+      const isNeedSplit = (selectedDiscount.tag || selectedDiscount.type) === "good_pass";
+      const splitCount = isNeedSplit ? Math.min(product.quantity, applicableDiscounts.filter((item) => (item.tag || item.type) === "good_pass").length) : 1;
       const arr = [];
-      if (splitCount < product.quantity) {
+      if (splitCount < product.quantity && isNeedSplit) {
         arr.push(this.hooks.setProduct(originProduct, {
           discount_list: [],
           quantity: product.quantity - splitCount,
@@ -297,7 +299,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           arr.push(this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
             price: new import_decimal.default(targetProductPrice).toNumber(),
-            quantity: 1,
+            quantity: isNeedSplit ? 1 : product.quantity,
             origin_total: (0, import_utils2.getProductOriginTotalPrice)({
               product: {
                 original_price: product.original_price
@@ -318,7 +320,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             discount_list: [discountDetail],
             _id: product._id.split("___")[0] + "___" + selectedDiscount2.id,
             price: new import_decimal.default(targetProductPrice).toNumber(),
-            quantity: 1,
+            quantity: isNeedSplit ? 1 : product.quantity,
             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
           }));
@@ -360,7 +362,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
       };
       const arr = processedProductsMap.get(product._id);
-      arr.length ? processedProductList.push(...arr) : processedProductList.push(getDefaultProduct());
+      (arr == null ? void 0 : arr.length) ? processedProductList.push(...arr) : processedProductList.push(getDefaultProduct());
     });
     const updatedDiscountList = addModeDiscount.map((discount) => {
       const applicableProducts = discountApplicability.get(discount.id) || [];

package/lib/solution/BookingByStep/index.js

@@ -1562,7 +1562,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         targetProduct.setOtherParams("schedule", newScheduleArr);
       } else if (targetProductData.duration) {
         const dateRange = this.store.date.getDateRange();
-        if (!dateRange.length)
+        if (!(dateRange == null ? void 0 : dateRange.length))
           return;
         this.getAvailableDate({
           startDate: dateRange[0].date,
@@ -2034,6 +2034,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     });
   }
   isTargetNormalProduct(product) {
+    if (!product)
+      return false;
     return (0, import_utils4.isNormalProduct)(product);
   }
   isTargetCartIdNormalProduct(id) {

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

@@ -38,6 +38,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         isAvailable: boolean;
         productList: Record<string, any>[];
         discountList: Discount[];
+        type: "server" | "clientCalc";
     }>;
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;
     private getCustomer;

package/lib/solution/ShopDiscount/index.js

@@ -205,6 +205,15 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       const rulesModule = this.store.rules;
       if (!rulesModule) {
         return {
+          type: "clientCalc",
+          isAvailable: false,
+          productList: this.store.productList || [],
+          discountList: this.getDiscountList()
+        };
+      }
+      if (!resultDiscountList.length) {
+        return {
+          type: "server",
           isAvailable: false,
           productList: this.store.productList || [],
           discountList: this.getDiscountList()
@@ -239,6 +248,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         }
       }
       return {
+        type: "clientCalc",
         isAvailable: isAvailable || false,
         productList: newProductList || this.store.productList || [],
         discountList: newDiscountList || this.getDiscountList()
@@ -246,6 +256,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     } catch (error) {
       console.error("[ShopDiscount] 扫码出错:", error);
       return {
+        type: "clientCalc",
         isAvailable: false,
         productList: this.store.productList || [],
         discountList: this.getDiscountList()
@@ -289,7 +300,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
           if (discount.id && ["good_pass", "discount_card"].includes(discount.type)) {
             const index = editModeDiscountList.findIndex((n) => {
               var _a4;
-              return n.id === ((_a4 = discount.discount) == null ? void 0 : _a4.resource_id) || discount.id;
+              return n.id === (((_a4 = discount.discount) == null ? void 0 : _a4.resource_id) || discount.id);
             });
             if (index !== -1) {
               editModeDiscountList[index] = {

package/package.json

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