@pisell/pisellos 1.0.9 → 1.0.11

package/dist/modules/Rules/index.js

@@ -107,6 +107,18 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         };
       }
 
+      // 编辑商品已有商品券
+      if (productList.every(function (item) {
+        var _item$discount_list;
+        return item.booking_id && (((_item$discount_list = item.discount_list) === null || _item$discount_list === void 0 ? void 0 : _item$discount_list.length) || item.price == 0);
+      })) {
+        return {
+          isAvailable: false,
+          discountList: oldDiscountList,
+          productList: productList
+        };
+      }
+
       // 合并新旧折扣列表，并计算折扣结果
       var mergedDiscountList = uniqueById(uniqueById([].concat(_toConsumableArray(oldDiscountList), _toConsumableArray(newDiscountList))), 'product_id');
       var result = this.calcDiscount({
@@ -149,6 +161,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) {
@@ -242,7 +263,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);
           }));
 
           // 判断优惠券是否适用于该商品
@@ -255,7 +276,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,
@@ -275,7 +297,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;
@@ -287,7 +309,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;
 
           // 判断优惠券是否适用于该商品
@@ -323,6 +345,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 bundle: product.bundle,
                 options: product.options
               }),
+              variant: originProduct._productInit.variant,
+              original_price: originProduct._productInit.original_price,
               total: getProductTotalPrice({
                 product: {
                   price: product.price
@@ -344,7 +368,7 @@ 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;
         }
 
@@ -355,12 +379,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
         var targetProductPrice = selectedDiscount.tag === 'good_pass' ? '0' : new Decimal(100).minus(selectedDiscount.par_value || 0).div(100).mul(new Decimal(product.price || 0)).toFixed(2);
         var discountDetail = {
-          amount: selectedDiscount.tag === 'product_discount_card' ? new Decimal(product.price || 0).minus(new Decimal(targetProductPrice)).toNumber() : product.price,
+          amount: selectedDiscount.tag === 'good_pass' ? product.price : new Decimal(product.price || 0).minus(new Decimal(targetProductPrice)).toNumber(),
           type: selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : selectedDiscount.tag,
           discount: {
             resource_id: selectedDiscount.id,
             title: selectedDiscount.format_title,
-            original_amount: product.price,
+            original_amount: product.origin_total || product.price,
             product_id: originProduct.id,
             percent: selectedDiscount.par_value
           },
@@ -372,6 +396,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 记录应用了优惠券的商品
         // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
         if (product.isClient) {
+          var _originProduct$_produ;
+          var variant = (_originProduct$_produ = originProduct._productOrigin.variant) === null || _originProduct$_produ === void 0 ? void 0 : _originProduct$_produ.map(function (n) {
+            if (n.id === originProduct._productOrigin.product_variant_id) {
+              n.original_price = n.price;
+              var _targetProductPrice = selectedDiscount.tag === 'good_pass' ? '0' : new Decimal(100).minus(selectedDiscount.par_value || 0).div(100).mul(new Decimal(n.price || 0)).toFixed(2);
+              n.price = _targetProductPrice;
+            }
+            return n;
+          });
           processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
             price: new Decimal(targetProductPrice).toNumber(),
@@ -382,6 +415,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               bundle: product.bundle,
               options: product.options
             }),
+            variant: variant,
+            original_price: new Decimal(product.price).toNumber(),
             total: getProductTotalPrice({
               product: {
                 price: targetProductPrice
@@ -415,6 +450,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 bundle: product.bundle,
                 options: product.options
               }),
+              variant: originProduct._productInit.variant,
+              original_price: originProduct._productInit.original_price,
               total: getProductTotalPrice({
                 product: {
                   price: product.price

package/dist/modules/Rules/types.d.ts

@@ -46,6 +46,8 @@ export interface RulesParamsHooks {
         discount_list: any[];
         origin_total?: number;
         price?: number;
+        variant?: any[];
+        original_price?: number;
     }) => Record<string, any>;
 }
 export {};

package/dist/modules/Schedule/index.js

@@ -232,7 +232,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
           cacheId: this.cacheId,
           fatherModule: this.fatherModule,
           store: store,
-          cacheKey: ['scheduleList', 'availabilityDateList']
+          cacheKey: ['scheduleList', 'availabilityDateList', 'otherProductsIds']
         });
       }
     }

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);
@@ -484,10 +498,18 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       }).flat();
       newDiscountList.forEach(function (item) {
         var _item$applicableProdu;
-        var isAllProductUsed = (_item$applicableProdu = item.applicableProductIds) === null || _item$applicableProdu === void 0 ? void 0 : _item$applicableProdu.every(function (id) {
-          return allUsedProductIds === null || allUsedProductIds === void 0 ? void 0 : allUsedProductIds.includes(id);
+        var isProductFree = function isProductFree(id) {
+          var _this3$hooks2;
+          var targetProduct = productList.find(function (n) {
+            return n.id === id;
+          });
+          var product = (_this3$hooks2 = _this3.hooks) === null || _this3$hooks2 === void 0 ? void 0 : _this3$hooks2.getProduct(targetProduct);
+          return Number(product === null || product === void 0 ? void 0 : product.price) === 0;
+        };
+        var isAllProductUsedOrFree = (_item$applicableProdu = item.applicableProductIds) === null || _item$applicableProdu === void 0 ? void 0 : _item$applicableProdu.every(function (id) {
+          return (allUsedProductIds === null || allUsedProductIds === void 0 ? void 0 : allUsedProductIds.includes(id)) || isProductFree(id);
         });
-        if (!item.isSelected && isAllProductUsed) {
+        if (!item.isSelected && isAllProductUsedOrFree) {
           item.isDisabledForProductUsed = true;
         } else {
           item.isDisabledForProductUsed = false;

package/lib/modules/Rules/index.js

@@ -69,6 +69,16 @@ 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 mergedDiscountList = (0, import_utils.uniqueById)((0, import_utils.uniqueById)([
       ...oldDiscountList,
       ...newDiscountList
@@ -105,6 +115,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) => {
@@ -164,13 +175,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,
@@ -185,9 +197,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       });
     });
     sortedProductList.forEach((originProduct) => {
-      var _a, _b, _c, _d, _e;
+      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 && ["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;
       }
@@ -195,7 +207,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") {
@@ -223,6 +235,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
@@ -249,19 +263,19 @@ 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;
       }
       usedDiscounts.set(selectedDiscount.id, true);
       const appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
       const targetProductPrice = selectedDiscount.tag === "good_pass" ? "0" : new import_decimal.default(100).minus(selectedDiscount.par_value || 0).div(100).mul(new import_decimal.default(product.price || 0)).toFixed(2);
       const discountDetail = {
-        amount: selectedDiscount.tag === "product_discount_card" ? new import_decimal.default(product.price || 0).minus(new import_decimal.default(targetProductPrice)).toNumber() : product.price,
+        amount: selectedDiscount.tag === "good_pass" ? product.price : new import_decimal.default(product.price || 0).minus(new import_decimal.default(targetProductPrice)).toNumber(),
         type: selectedDiscount.tag === "product_discount_card" ? "discount_card" : selectedDiscount.tag,
         discount: {
           resource_id: selectedDiscount.id,
           title: selectedDiscount.format_title,
-          original_amount: product.price,
+          original_amount: product.origin_total || product.price,
           product_id: originProduct.id,
           percent: selectedDiscount.par_value
         },
@@ -270,6 +284,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       appliedProducts.push(discountDetail);
       appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
       if (product.isClient) {
+        const variant = (_f = originProduct._productOrigin.variant) == null ? void 0 : _f.map((n) => {
+          if (n.id === originProduct._productOrigin.product_variant_id) {
+            n.original_price = n.price;
+            const targetProductPrice2 = selectedDiscount.tag === "good_pass" ? "0" : new import_decimal.default(100).minus(selectedDiscount.par_value || 0).div(100).mul(new import_decimal.default(n.price || 0)).toFixed(2);
+            n.price = targetProductPrice2;
+          }
+          return n;
+        });
         processedProductsMap.set(
           product._id,
           this.hooks.setProduct(originProduct, {
@@ -282,6 +304,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               bundle: product.bundle,
               options: product.options
             }),
+            variant,
+            original_price: new import_decimal.default(product.price).toNumber(),
             total: (0, import_utils2.getProductTotalPrice)({
               product: {
                 price: targetProductPrice
@@ -317,6 +341,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

package/lib/modules/Rules/types.d.ts

@@ -46,6 +46,8 @@ export interface RulesParamsHooks {
         discount_list: any[];
         origin_total?: number;
         price?: number;
+        variant?: any[];
+        original_price?: number;
     }) => Record<string, any>;
 }
 export {};

package/lib/modules/Schedule/index.js

@@ -154,7 +154,7 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
         cacheId: this.cacheId,
         fatherModule: this.fatherModule,
         store,
-        cacheKey: ["scheduleList", "availabilityDateList"]
+        cacheKey: ["scheduleList", "availabilityDateList", "otherProductsIds"]
       });
     }
   }

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()
@@ -331,10 +342,16 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     }).flat();
     newDiscountList.forEach((item) => {
       var _a2;
-      const isAllProductUsed = (_a2 = item.applicableProductIds) == null ? void 0 : _a2.every((id) => {
-        return allUsedProductIds == null ? void 0 : allUsedProductIds.includes(id);
+      const isProductFree = (id) => {
+        var _a3;
+        const targetProduct = productList.find((n) => n.id === id);
+        const product = (_a3 = this.hooks) == null ? void 0 : _a3.getProduct(targetProduct);
+        return Number(product == null ? void 0 : product.price) === 0;
+      };
+      const isAllProductUsedOrFree = (_a2 = item.applicableProductIds) == null ? void 0 : _a2.every((id) => {
+        return (allUsedProductIds == null ? void 0 : allUsedProductIds.includes(id)) || isProductFree(id);
       });
-      if (!item.isSelected && isAllProductUsed) {
+      if (!item.isSelected && isAllProductUsedOrFree) {
         item.isDisabledForProductUsed = true;
       } else {
         item.isDisabledForProductUsed = false;

package/package.json

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