@pisell/pisellos 2.1.113 → 2.1.115

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

@@ -18,6 +18,14 @@ interface Formattitle {
 interface PackageSubItemUsageRules {
     type: 'universal_discount' | 'package_exclusive' | 'single_item_promo' | 'custom_usage_rules';
     rules: ("original_price" | "markup_price")[];
+    package_scope?: {
+        type: 'all_packages' | 'specific_packages';
+        exclude_bundle_product_ids: number[];
+        include_bundle_product_ids: number[];
+        filter: 0 | 1;
+        rule: any[];
+        rule_type: 'and' | 'or';
+    };
 }
 interface Limitedrelationproductdata {
     id: number;

package/dist/modules/Rules/index.js

@@ -1831,6 +1831,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         return true;
       }
       var ruleType = usageRules.type;
+      // 套餐适用范围配置
+      var packageScope = usageRules === null || usageRules === void 0 ? void 0 : usageRules.package_scope;
+      var _ref9 = packageScope || {},
+        scopeType = _ref9.type,
+        _ref9$exclude_bundle_ = _ref9.exclude_bundle_product_ids,
+        exclude_bundle_product_ids = _ref9$exclude_bundle_ === void 0 ? [] : _ref9$exclude_bundle_,
+        _ref9$include_bundle_ = _ref9.include_bundle_product_ids,
+        include_bundle_product_ids = _ref9$include_bundle_ === void 0 ? [] : _ref9$include_bundle_,
+        _ref9$filter = _ref9.filter,
+        filter = _ref9$filter === void 0 ? 0 : _ref9$filter;
       var isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
 
@@ -1845,10 +1855,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return true; // 单独购买时可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem9, _flatItem$bundleItem10;
+          var _flatItem$bundleItem9, _flatItem$bundleItem10, _flatItem$originProdu, _flatItem$bundleItem11;
           // 套餐中购买时，判断是否为原价
           var priceType = (_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.price_type;
           var priceTypeExt = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type_ext;
+          // 主商品id
+          var mainProductId = (flatItem === null || flatItem === void 0 || (_flatItem$originProdu = flatItem.originProduct) === null || _flatItem$originProdu === void 0 ? void 0 : _flatItem$originProdu.product_id) || (flatItem === null || flatItem === void 0 || (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.product_id) || 0;
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"
           // markup_price 对应：
@@ -1860,16 +1872,43 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 检查 rules
           if (rules.length > 0) {
-            // 检查原价
-            if (isOriginalPrice && rules.includes('original_price')) {
-              return true;
+            var _isOriginalPrice = isOriginalPrice && rules.includes('original_price');
+            var _isMarkupPrice = isMarkupPrice && rules.includes('markup_price');
+            // 价格是否符合规则：原价或加价
+            var isPriceValid = _isOriginalPrice || _isMarkupPrice;
+            // 套餐适用范围校验
+            var isScopeValid = false;
+
+            // 排除套餐判断
+            if (scopeType === 'all_packages') {
+              // 所有套餐可用
+              if (!filter) {
+                isScopeValid = true;
+              } else {
+                isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
+              }
             }
 
-            // 检查加价
-            if (isMarkupPrice && rules.includes('markup_price')) {
+            // 包含套餐判断
+            if (scopeType === 'specific_packages') {
+              isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
+            }
+
+            // 价格和套餐适用范围都符合，则可用
+            if (isPriceValid && isScopeValid) {
               return true;
             }
 
+            // 检查原价
+            // if (isOriginalPrice && rules.includes('original_price')) {
+            //   return true;
+            // }
+
+            // 检查加价
+            // if (isMarkupPrice && rules.includes('markup_price')) {
+            //   return true;
+            // }
+
             // 如果都不匹配，则不可用
             return false;
           }
@@ -1886,29 +1925,29 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false; // 单独购买时不可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem11, _flatItem$bundleItem12;
+          var _flatItem$bundleItem12, _flatItem$bundleItem13;
           // 套餐中购买时，判断是否为原价
-          var _priceType = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type;
-          var _priceTypeExt = (_flatItem$bundleItem12 = flatItem.bundleItem) === null || _flatItem$bundleItem12 === void 0 ? void 0 : _flatItem$bundleItem12.price_type_ext;
+          var _priceType = (_flatItem$bundleItem12 = flatItem.bundleItem) === null || _flatItem$bundleItem12 === void 0 ? void 0 : _flatItem$bundleItem12.price_type;
+          var _priceTypeExt = (_flatItem$bundleItem13 = flatItem.bundleItem) === null || _flatItem$bundleItem13 === void 0 ? void 0 : _flatItem$bundleItem13.price_type_ext;
 
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"
           // markup_price 对应：
           // price_type: "markup" && price_type_ext: ""
           /** 原价 */
-          var _isOriginalPrice = _priceType === 'markup' && _priceTypeExt === 'product_price';
+          var _isOriginalPrice2 = _priceType === 'markup' && _priceTypeExt === 'product_price';
           /** 加价 */
-          var _isMarkupPrice = _priceType === 'markup' && (_priceTypeExt === '' || !_priceTypeExt);
+          var _isMarkupPrice2 = _priceType === 'markup' && (_priceTypeExt === '' || !_priceTypeExt);
 
           // 检查 rules
           if (rules.length > 0) {
             // 检查原价
-            if (_isOriginalPrice && rules.includes('original_price')) {
+            if (_isOriginalPrice2 && rules.includes('original_price')) {
               return true;
             }
 
             // 检查加价
-            if (_isMarkupPrice && rules.includes('markup_price')) {
+            if (_isMarkupPrice2 && rules.includes('markup_price')) {
               return true;
             }
 
@@ -1917,7 +1956,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
 
           // 原价包括：price_type: "markup" && price_type_ext: "product_price"
-          return _isOriginalPrice;
+          return _isOriginalPrice2;
         }
         return false;
       }

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

@@ -115,7 +115,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/BookingTicket/utils/scan/cloudSearch.js

@@ -124,7 +124,7 @@ export var searchProduct = /*#__PURE__*/function () {
             skip: 1,
             num: 20,
             status: 'published',
-            with: ['variantGroup'],
+            with: ['variantGroup.variantItem', 'optionGroup.optionItem'],
             with_count: ['bundleGroup', 'optionGroup'],
             exclude_extension_type: ['product_party', 'product_event', 'product_series_event', 'product_package_ticket', 'ticket', 'event_item']
           };

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

@@ -18,6 +18,14 @@ interface Formattitle {
 interface PackageSubItemUsageRules {
     type: 'universal_discount' | 'package_exclusive' | 'single_item_promo' | 'custom_usage_rules';
     rules: ("original_price" | "markup_price")[];
+    package_scope?: {
+        type: 'all_packages' | 'specific_packages';
+        exclude_bundle_product_ids: number[];
+        include_bundle_product_ids: number[];
+        filter: 0 | 1;
+        rule: any[];
+        rule_type: 'and' | 'or';
+    };
 }
 interface Limitedrelationproductdata {
     id: number;

package/lib/modules/Rules/index.js

@@ -1388,7 +1388,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
    * @returns 是否可用
    */
   checkPackageSubItemUsageRules(discount, flatItem) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const limitedData = discount.limited_relation_product_data;
     const usageRules = limitedData == null ? void 0 : limitedData.package_sub_item_usage_rules;
     const rules = ["original_price", ...(usageRules == null ? void 0 : usageRules.rules) || []];
@@ -1396,6 +1396,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       return true;
     }
     const ruleType = usageRules.type;
+    const packageScope = usageRules == null ? void 0 : usageRules.package_scope;
+    const { type: scopeType, exclude_bundle_product_ids = [], include_bundle_product_ids = [], filter = 0 } = packageScope || {};
     const isMainProduct = flatItem.type === "main";
     const isBundleItem = flatItem.type === "bundle";
     if (isMainProduct) {
@@ -1408,13 +1410,25 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       if (isBundleItem) {
         const priceType = (_a = flatItem.bundleItem) == null ? void 0 : _a.price_type;
         const priceTypeExt = (_b = flatItem.bundleItem) == null ? void 0 : _b.price_type_ext;
+        const mainProductId = ((_c = flatItem == null ? void 0 : flatItem.originProduct) == null ? void 0 : _c.product_id) || ((_d = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _d.product_id) || 0;
         const isOriginalPrice = priceType === "markup" && priceTypeExt === "product_price";
         const isMarkupPrice = priceType === "markup" && (priceTypeExt === "" || !priceTypeExt);
         if (rules.length > 0) {
-          if (isOriginalPrice && rules.includes("original_price")) {
-            return true;
+          const _isOriginalPrice = isOriginalPrice && rules.includes("original_price");
+          const _isMarkupPrice = isMarkupPrice && rules.includes("markup_price");
+          const isPriceValid = _isOriginalPrice || _isMarkupPrice;
+          let isScopeValid = false;
+          if (scopeType === "all_packages") {
+            if (!filter) {
+              isScopeValid = true;
+            } else {
+              isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
+            }
           }
-          if (isMarkupPrice && rules.includes("markup_price")) {
+          if (scopeType === "specific_packages") {
+            isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
+          }
+          if (isPriceValid && isScopeValid) {
             return true;
           }
           return false;
@@ -1428,8 +1442,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return false;
       }
       if (isBundleItem) {
-        const priceType = (_c = flatItem.bundleItem) == null ? void 0 : _c.price_type;
-        const priceTypeExt = (_d = flatItem.bundleItem) == null ? void 0 : _d.price_type_ext;
+        const priceType = (_e = flatItem.bundleItem) == null ? void 0 : _e.price_type;
+        const priceTypeExt = (_f = flatItem.bundleItem) == null ? void 0 : _f.price_type_ext;
         const isOriginalPrice = priceType === "markup" && priceTypeExt === "product_price";
         const isMarkupPrice = priceType === "markup" && (priceTypeExt === "" || !priceTypeExt);
         if (rules.length > 0) {

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

@@ -115,7 +115,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/BookingTicket/utils/scan/cloudSearch.js

@@ -88,7 +88,7 @@ var searchProduct = async (request, code) => {
     skip: 1,
     num: 20,
     status: "published",
-    with: ["variantGroup"],
+    with: ["variantGroup.variantItem", "optionGroup.optionItem"],
     with_count: ["bundleGroup", "optionGroup"],
     exclude_extension_type: [
       "product_party",

package/package.json

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