@pisell/pisellos 0.0.337 → 0.0.339

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

@@ -50,8 +50,9 @@ export interface RulesParamsHooks {
         origin_total?: number;
         price?: string | number;
         variant?: any[];
-        original_price?: number;
+        original_price?: number | string;
         quantity?: number;
+        bundle?: any[];
     }) => Record<string, any>;
 }
 export {};

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

@@ -17,6 +17,7 @@ export declare class RegisterAndLoginImpl extends BaseModule implements Module {
     private apiCaller;
     private otherParams;
     private channel;
+    private countriesCache;
     constructor(name?: string, version?: string);
     /**
      * 重新发送邮箱注册链接
@@ -179,5 +180,9 @@ export declare class RegisterAndLoginImpl extends BaseModule implements Module {
      * 获取国家区号列表
      */
     getCountries(): Promise<CountryInfo[]>;
+    /**
+     * 异步更新国家缓存数据
+     */
+    private updateCountriesCache;
     destroy(): Promise<void>;
 }

package/dist/solution/RegisterAndLogin/index.js

@@ -43,6 +43,8 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "apiCaller", void 0);
     _defineProperty(_assertThisInitialized(_this), "otherParams", {});
     _defineProperty(_assertThisInitialized(_this), "channel", 'default');
+    // 内存缓存
+    _defineProperty(_assertThisInitialized(_this), "countriesCache", null);
     return _this;
   }
 
@@ -983,11 +985,11 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
                 this.store.isLoggedIn = true;
 
                 // 保存到本地存储
-                this.window.localStorage.setItem('auth_token', token);
-                this.window.localStorage.setItem('user_info', JSON.stringify(user));
-                if (refreshToken) {
-                  this.window.localStorage.setItem('refresh_token', refreshToken);
-                }
+                // this.window.localStorage.setItem('auth_token', token);
+                // this.window.localStorage.setItem('user_info', JSON.stringify(user));
+                // if (refreshToken) {
+                //   this.window.localStorage.setItem('refresh_token', refreshToken);
+                // }
               }
               _context14.next = 13;
               return this.core.effects.emit(RegisterAndLoginHooks.onRegisterSuccess, response.data);
@@ -1052,7 +1054,7 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
             case 7:
               response = _context15.sent;
               if (!(response.status && response.data)) {
-                _context15.next = 19;
+                _context15.next = 16;
                 break;
               }
               _response$data5 = response.data, user = _response$data5.user, token = _response$data5.token, refreshToken = _response$data5.refreshToken;
@@ -1060,45 +1062,45 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
               this.store.isLoggedIn = true;
 
               // 保存到本地存储
-              this.window.localStorage.setItem('auth_token', token);
-              this.window.localStorage.setItem('user_info', JSON.stringify(user));
-              if (refreshToken) {
-                this.window.localStorage.setItem('refresh_token', refreshToken);
-              }
-              _context15.next = 17;
+              // this.window.localStorage.setItem('auth_token', token);
+              // this.window.localStorage.setItem('user_info', JSON.stringify(user));
+              // if (refreshToken) {
+              //   this.window.localStorage.setItem('refresh_token', refreshToken);
+              // }
+              _context15.next = 14;
               return this.core.effects.emit(RegisterAndLoginHooks.onLoginSuccess, response.data);
-            case 17:
-              _context15.next = 22;
+            case 14:
+              _context15.next = 19;
               break;
-            case 19:
+            case 16:
               this.store.error = response.message || '登录失败';
-              _context15.next = 22;
+              _context15.next = 19;
               return this.core.effects.emit(RegisterAndLoginHooks.onLoginFailed, {
                 error: this.store.error,
                 params: params
               });
-            case 22:
+            case 19:
               return _context15.abrupt("return", response);
-            case 25:
-              _context15.prev = 25;
+            case 22:
+              _context15.prev = 22;
               _context15.t0 = _context15["catch"](0);
               this.store.error = '登录失败';
-              _context15.next = 30;
+              _context15.next = 27;
               return this.core.effects.emit(RegisterAndLoginHooks.onLoginFailed, {
                 error: this.store.error,
                 params: params
               });
-            case 30:
+            case 27:
               throw _context15.t0;
-            case 31:
-              _context15.prev = 31;
+            case 28:
+              _context15.prev = 28;
               this.store.isLoading = false;
-              return _context15.finish(31);
-            case 34:
+              return _context15.finish(28);
+            case 31:
             case "end":
               return _context15.stop();
           }
-        }, _callee15, this, [[0, 25, 31, 34]]);
+        }, _callee15, this, [[0, 22, 28, 31]]);
       }));
       function login(_x14) {
         return _login.apply(this, arguments);
@@ -1128,7 +1130,7 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
             case 7:
               response = _context16.sent;
               if (!(response.status && response.data)) {
-                _context16.next = 19;
+                _context16.next = 16;
                 break;
               }
               _response$data6 = response.data, user = _response$data6.user, token = _response$data6.token, refreshToken = _response$data6.refreshToken;
@@ -1136,45 +1138,45 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
               this.store.isLoggedIn = true;
 
               // 保存到本地存储
-              this.window.localStorage.setItem('auth_token', token);
-              this.window.localStorage.setItem('user_info', JSON.stringify(user));
-              if (refreshToken) {
-                this.window.localStorage.setItem('refresh_token', refreshToken);
-              }
-              _context16.next = 17;
+              // this.window.localStorage.setItem('auth_token', token);
+              // this.window.localStorage.setItem('user_info', JSON.stringify(user));
+              // if (refreshToken) {
+              //   this.window.localStorage.setItem('refresh_token', refreshToken);
+              // }
+              _context16.next = 14;
               return this.core.effects.emit(RegisterAndLoginHooks.onOAuthLoginSuccess, response.data);
-            case 17:
-              _context16.next = 22;
+            case 14:
+              _context16.next = 19;
               break;
-            case 19:
+            case 16:
               this.store.error = response.message || 'OAuth 登录失败';
-              _context16.next = 22;
+              _context16.next = 19;
               return this.core.effects.emit(RegisterAndLoginHooks.onOAuthLoginFailed, {
                 error: this.store.error,
                 params: params
               });
-            case 22:
+            case 19:
               return _context16.abrupt("return", response);
-            case 25:
-              _context16.prev = 25;
+            case 22:
+              _context16.prev = 22;
               _context16.t0 = _context16["catch"](0);
               this.store.error = 'OAuth 登录失败';
-              _context16.next = 30;
+              _context16.next = 27;
               return this.core.effects.emit(RegisterAndLoginHooks.onOAuthLoginFailed, {
                 error: this.store.error,
                 params: params
               });
-            case 30:
+            case 27:
               throw _context16.t0;
-            case 31:
-              _context16.prev = 31;
+            case 28:
+              _context16.prev = 28;
               this.store.isLoading = false;
-              return _context16.finish(31);
-            case 34:
+              return _context16.finish(28);
+            case 31:
             case "end":
               return _context16.stop();
           }
-        }, _callee16, this, [[0, 25, 31, 34]]);
+        }, _callee16, this, [[0, 22, 28, 31]]);
       }));
       function oauthLogin(_x15) {
         return _oauthLogin.apply(this, arguments);
@@ -2418,65 +2420,158 @@ export var RegisterAndLoginImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getCountries",
     value: (function () {
       var _getCountries = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38() {
-        var response;
+        var CACHE_KEY, cachedData, cached, response, countries;
         return _regeneratorRuntime().wrap(function _callee38$(_context38) {
           while (1) switch (_context38.prev = _context38.next) {
             case 0:
-              _context38.prev = 0;
+              CACHE_KEY = 'pisell_countries_cache';
+              _context38.prev = 1;
               this.store.isLoading = true;
               this.store.error = null;
-              _context38.next = 5;
+
+              // 1. 检查内存缓存
+              if (!this.countriesCache) {
+                _context38.next = 7;
+                break;
+              }
+              this.store.isLoading = false;
+              return _context38.abrupt("return", this.countriesCache);
+            case 7:
+              // 2. 检查 localStorage 缓存
+              cachedData = null;
+              try {
+                cached = this.window.localStorage.getItem(CACHE_KEY);
+                if (cached) {
+                  cachedData = JSON.parse(cached);
+                }
+              } catch (error) {
+                console.warn('[RegisterAndLogin] localStorage 缓存解析失败:', error);
+              }
+
+              // 3. 如果有 localStorage 缓存，先返回缓存数据
+              if (!(cachedData && Array.isArray(cachedData) && cachedData.length > 0)) {
+                _context38.next = 14;
+                break;
+              }
+              // 设置内存缓存
+              this.countriesCache = cachedData;
+
+              // 异步请求后端数据进行对比和更新
+              this.updateCountriesCache(CACHE_KEY, cachedData);
+              this.store.isLoading = false;
+              return _context38.abrupt("return", cachedData);
+            case 14:
+              _context38.next = 16;
               return this.apiCaller.call('getCountries');
-            case 5:
+            case 16:
               response = _context38.sent;
               if (!(response.status && response.data)) {
-                _context38.next = 10;
+                _context38.next = 24;
                 break;
               }
-              return _context38.abrupt("return", response.data);
-            case 10:
+              countries = response.data; // 更新内存缓存
+              this.countriesCache = countries;
+
+              // 更新 localStorage 缓存
+              try {
+                localStorage.setItem(CACHE_KEY, JSON.stringify(countries));
+              } catch (error) {
+                console.warn('[RegisterAndLogin] localStorage 存储失败:', error);
+              }
+              return _context38.abrupt("return", countries);
+            case 24:
               this.store.error = response.message || '获取国家区号失败';
               throw new Error(this.store.error);
-            case 12:
-              _context38.next = 19;
+            case 26:
+              _context38.next = 33;
               break;
-            case 14:
-              _context38.prev = 14;
-              _context38.t0 = _context38["catch"](0);
+            case 28:
+              _context38.prev = 28;
+              _context38.t0 = _context38["catch"](1);
               this.store.error = '获取国家区号失败';
               console.error('[RegisterAndLogin] 获取国家区号失败:', _context38.t0);
               throw _context38.t0;
-            case 19:
-              _context38.prev = 19;
+            case 33:
+              _context38.prev = 33;
               this.store.isLoading = false;
-              return _context38.finish(19);
-            case 22:
+              return _context38.finish(33);
+            case 36:
             case "end":
               return _context38.stop();
           }
-        }, _callee38, this, [[0, 14, 19, 22]]);
+        }, _callee38, this, [[1, 28, 33, 36]]);
       }));
       function getCountries() {
         return _getCountries.apply(this, arguments);
       }
       return getCountries;
+    }()
+    /**
+     * 异步更新国家缓存数据
+     */
+    )
+  }, {
+    key: "updateCountriesCache",
+    value: (function () {
+      var _updateCountriesCache = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(cacheKey, cachedData) {
+        var response, newData, hasChanged;
+        return _regeneratorRuntime().wrap(function _callee39$(_context39) {
+          while (1) switch (_context39.prev = _context39.next) {
+            case 0:
+              _context39.prev = 0;
+              _context39.next = 3;
+              return this.apiCaller.call('getCountries');
+            case 3:
+              response = _context39.sent;
+              if (response.status && response.data) {
+                newData = response.data; // 比较数据是否有变化（简单的长度和内容对比）
+                hasChanged = newData.length !== cachedData.length || JSON.stringify(newData) !== JSON.stringify(cachedData);
+                if (hasChanged) {
+                  // 更新内存缓存
+                  this.countriesCache = newData;
+
+                  // 更新 localStorage 缓存
+                  try {
+                    localStorage.setItem(cacheKey, JSON.stringify(newData));
+                  } catch (error) {
+                    console.warn('[RegisterAndLogin] localStorage 更新失败:', error);
+                  }
+                  console.log('[RegisterAndLogin] 国家数据已更新');
+                }
+              }
+              _context39.next = 10;
+              break;
+            case 7:
+              _context39.prev = 7;
+              _context39.t0 = _context39["catch"](0);
+              console.warn('[RegisterAndLogin] 后台更新国家数据失败:', _context39.t0);
+            case 10:
+            case "end":
+              return _context39.stop();
+          }
+        }, _callee39, this, [[0, 7]]);
+      }));
+      function updateCountriesCache(_x34, _x35) {
+        return _updateCountriesCache.apply(this, arguments);
+      }
+      return updateCountriesCache;
     }())
   }, {
     key: "destroy",
     value: function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39() {
-        return _regeneratorRuntime().wrap(function _callee39$(_context39) {
-          while (1) switch (_context39.prev = _context39.next) {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40() {
+        return _regeneratorRuntime().wrap(function _callee40$(_context40) {
+          while (1) switch (_context40.prev = _context40.next) {
             case 0:
-              _context39.next = 2;
+              _context40.next = 2;
               return this.core.effects.emit(RegisterAndLoginHooks.onDestroy, {});
             case 2:
               console.log('[RegisterAndLogin] 已销毁');
             case 3:
             case "end":
-              return _context39.stop();
+              return _context40.stop();
           }
-        }, _callee39, this);
+        }, _callee40, this);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);

package/dist/solution/ShopDiscount/index.js

@@ -561,12 +561,13 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 return n.id === (((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id);
               });
               if (index !== -1) {
+                var _discount$metadata;
                 editModeDiscountList[index] = _objectSpread(_objectSpread({}, editModeDiscountList[index]), {}, {
                   amount: new Decimal(discount.amount || 0).plus(new Decimal(editModeDiscountList[index].amount || 0)).toNumber(),
-                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.num) || 1).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
+                  savedAmount: new Decimal(discount.amount || 0).times((discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.num) || (product === null || product === void 0 ? void 0 : product.num) || 1).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
                 });
               } else {
-                var _discount$discount2, _discount$discount3, _discount$discount4;
+                var _discount$metadata2, _discount$discount2, _discount$discount3, _discount$discount4;
                 if (discount.type && !discount.tag) {
                   discount.tag = discount.type;
                 }
@@ -574,7 +575,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                   name: discount.name || discount.discount.title.auto,
                   isEditMode: true,
                   limited_relation_product_data: {},
-                  savedAmount: discount.amount * ((product === null || product === void 0 ? void 0 : product.num) || 1),
+                  savedAmount: discount.amount * ((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.num) || (product === null || product === void 0 ? void 0 : product.num) || 1),
                   isAvailable: true,
                   id: ((_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.resource_id) || discount.id,
                   format_title: ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.title) || discount.format_title,
@@ -595,6 +596,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         var targetProduct = productList.find(function (n) {
           return n.id === id;
         });
+        if (!targetProduct) return false;
         var product = (_this3$hooks2 = _this3.hooks) === null || _this3$hooks2 === void 0 ? void 0 : _this3$hooks2.getProduct(targetProduct);
         // 如果 product.total 是小于等于0有可能是她已经用过商品券或者折扣卡导致的，或者本身就是负数价格，所以此时还需要判断 origin_total 是否小于等于0
         // 如果 product.vouchersApplicable是布尔值，并且是 false，也当做免费商品处理，此商品不可用优惠券或折扣卡
@@ -602,10 +604,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       };
       var allUsedProductIds = newDiscountList.map(function (n) {
         var _n$appliedProductDeta;
-        return n.isSelected ? (_n$appliedProductDeta = n.appliedProductDetails) === null || _n$appliedProductDeta === void 0 ? void 0 : _n$appliedProductDeta.map(function (n) {
+        return n.isSelected ? ((_n$appliedProductDeta = n.appliedProductDetails) === null || _n$appliedProductDeta === void 0 ? void 0 : _n$appliedProductDeta.map(function (n) {
           var _n$discount;
           return (_n$discount = n.discount) === null || _n$discount === void 0 ? void 0 : _n$discount.product_id;
-        }) : [];
+        })) || n.product_id : [];
       }).flat();
       newDiscountList.forEach(function (item) {
         var _item$applicableProdu;

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

@@ -12,6 +12,13 @@ export declare const isAllNormalProduct: (items: any[]) => boolean;
  * @returns
  */
 export declare const getDiscountAmount: (discount: Discount, total: number, price: number) => number;
+export declare const getDiscountListAmountTotal: (discount: Discount[]) => any;
+/**
+ * 获取折扣金额 计算每个折扣的金额
+ * @param discount
+ * @returns
+ */
+export declare const getDiscountListAmount: (discount: Discount[]) => any;
 export interface ScheduleItem {
     id: number;
     name: string | {

package/dist/solution/ShopDiscount/utils.js

@@ -37,7 +37,7 @@ export var getDiscountAmount = function getDiscountAmount(discount, total, price
   var _discount$metadata;
   // 商品券
   if (discount.tag === 'good_pass') {
-    return new Decimal(total).minus(new Decimal(price || 0)).toNumber();
+    return new Decimal(price).minus(new Decimal(price || 0)).toNumber();
   }
 
   // 判断是否是固定金额
@@ -45,11 +45,27 @@ export var getDiscountAmount = function getDiscountAmount(discount, total, price
 
   // 固定金额 小于0时返回0
   if (isFixedAmount) {
-    return Math.max(new Decimal(total).minus(new Decimal(discount.par_value || 0)).toNumber(), 0);
+    return Math.max(new Decimal(price).minus(new Decimal(discount.par_value || 0)).toNumber(), 0);
   }
 
   // 百分比：根据折扣卡金额计算
-  return new Decimal(100).minus(discount.par_value || 0).div(100).mul(new Decimal(total)).toNumber();
+  return new Decimal(100).minus(discount.par_value || 0).div(100).mul(new Decimal(price)).toNumber();
+};
+export var getDiscountListAmountTotal = function getDiscountListAmountTotal(discount) {
+  return discount.reduce(function (acc, cur) {
+    return new Decimal(acc).plus(new Decimal(cur.num || 1).mul(new Decimal(cur.amount || 0))).toNumber();
+  }, new Decimal(0));
+};
+
+/**
+ * 获取折扣金额 计算每个折扣的金额
+ * @param discount
+ * @returns
+ */
+export var getDiscountListAmount = function getDiscountListAmount(discount) {
+  return discount.reduce(function (acc, cur) {
+    return new Decimal(acc).plus(new Decimal(cur.amount || 0)).toNumber();
+  }, new Decimal(0));
 };
 
 // 日程项接口定义

package/lib/modules/Cart/utils/cartProduct.js

@@ -172,16 +172,6 @@ var formatProductToCartItemOrigin = (params) => {
 var getProductTotalPrice = (params) => {
   const { product, bundle, options, discounts } = params;
   let price = Number(product.price);
-  if (bundle == null ? void 0 : bundle.length) {
-    price = bundle.reduce((accumulator, currentValue) => {
-      return accumulator + Number(currentValue.price) * Number(currentValue.num);
-    }, price);
-  }
-  if (options == null ? void 0 : options.length) {
-    price = options.reduce((accumulator, currentValue) => {
-      return accumulator + Number(currentValue.price) * Number(currentValue.num);
-    }, price);
-  }
   if (discounts == null ? void 0 : discounts.length) {
     discounts.forEach((currentValue) => {
       var _a;
@@ -196,6 +186,16 @@ var getProductTotalPrice = (params) => {
       }
     });
   }
+  if (bundle == null ? void 0 : bundle.length) {
+    price = bundle.reduce((accumulator, currentValue) => {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
+  }
+  if (options == null ? void 0 : options.length) {
+    price = options.reduce((accumulator, currentValue) => {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
+  }
   return price;
 };
 var getProductOriginTotalPrice = (params) => {
@@ -254,9 +254,15 @@ var formatBundle = (bundle) => {
       price: item == null ? void 0 : item.price,
       total: item == null ? void 0 : item.price,
       price_type: item == null ? void 0 : item.price_type,
+      original_price: item == null ? void 0 : item.original_price,
+      original_total: item == null ? void 0 : item.original_total,
+      price_type_ext: item == null ? void 0 : item.price_type_ext,
       bundle_sum_price: item == null ? void 0 : item.bundle_sum_price,
       bundle_sum_type: item == null ? void 0 : item.bundle_sum_type,
-      options: formatOptions(item == null ? void 0 : item.option)
+      options: formatOptions(item == null ? void 0 : item.option),
+      _bundle_product_id: item._bundle_product_id,
+      discount_list: item.discount_list,
+      originBundleItem: item
     };
   });
 };
@@ -264,15 +270,24 @@ var formatBundleToOrigin = (bundle) => {
   if (!(bundle == null ? void 0 : bundle.length))
     return [];
   return bundle.map((d) => {
+    const getBundleValueByKey = (key) => {
+      var _a;
+      return (d == null ? void 0 : d[key]) || ((_a = d == null ? void 0 : d.originBundleItem) == null ? void 0 : _a[key]);
+    };
     return {
-      bundle_group_id: d.group_id,
+      bundle_group_id: getBundleValueByKey("group_id"),
       bundle_id: d.id,
-      bundle_product_id: (d == null ? void 0 : d._bundle_product_id) || (d == null ? void 0 : d.product_id),
-      bundle_variant_id: d.bundle_variant_id,
+      bundle_product_id: getBundleValueByKey("_bundle_product_id") || getBundleValueByKey("product_id"),
+      bundle_variant_id: getBundleValueByKey("bundle_variant_id"),
       num: d.num,
-      extension_id: d.extension_id,
-      extension_type: d.extension_type,
-      option: formatOptionsToOrigin(d.option)
+      extension_id: getBundleValueByKey("extension_id"),
+      extension_type: getBundleValueByKey("extension_type"),
+      option: formatOptionsToOrigin(getBundleValueByKey("option")),
+      discount_list: d.discount_list,
+      "bundle_selling_price": d == null ? void 0 : d.price,
+      metadata: {
+        custom_product_bundle_map_id: d._id
+      }
     };
   });
 };

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

@@ -15,11 +15,19 @@ interface Formattitle {
     'zh-CN'?: any;
     'zh-HK'?: any;
 }
+interface PackageSubItemUsageRules {
+    type: 'universal_discount' | 'package_exclusive' | 'single_item_promo' | 'custom_usage_rules';
+    custom_usage_rules: {
+        types: ("standalone_product" | "package_sub_item")[];
+        package_sub_item_rules: ("original_price" | "markup_price")[];
+    };
+}
 interface Limitedrelationproductdata {
     id: number;
     type: 'product_all' | 'products' | 'product_collection';
     product_ids: number[];
     product_collection_id: number[];
+    package_sub_item_usage_rules?: PackageSubItemUsageRules;
 }
 interface ApplicableProductDetails {
     amount: string;
@@ -73,6 +81,7 @@ export interface Discount {
     metadata?: {
         discount_card_type?: 'fixed_amount' | 'percent';
         validity_type?: "custom_schedule_validity" | "fixed_validity";
+        custom_product_bundle_map_id?: string;
     };
     product: Product;
     type: "product" | 'good_pass';
@@ -102,6 +111,7 @@ export interface Discount {
     custom_schedule_snapshot?: {
         data: any[];
     };
+    num?: number;
 }
 export interface DiscountState {
     discountList: Discount[];

package/lib/modules/Order/index.js

@@ -116,6 +116,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           item._origin.duration = duration;
           item._origin.sub_type = durationType;
         }
+        const discountList = (0, import_utils.getAllDiscountList)(item);
+        item._origin.product.discount_list = discountList;
         if ((0, import_utils2.isNormalProduct)(item._origin)) {
           order.relation_products.push(item._origin.product);
           const relationForms = item._origin.relation_forms || [];

package/lib/modules/Order/utils.d.ts

@@ -20,3 +20,4 @@ export declare const mergeRelationForms: (relationForms: {
     form_id: number;
     form_record_ids: number[];
 }[];
+export declare const getAllDiscountList: (cartItem: CartItem) => any;

package/lib/modules/Order/utils.js

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   generateDuration: () => generateDuration,
+  getAllDiscountList: () => getAllDiscountList,
   mergeRelationForms: () => mergeRelationForms
 });
 module.exports = __toCommonJS(utils_exports);
@@ -55,8 +56,18 @@ var mergeRelationForms = (relationForms) => {
     }, {})
   ).filter((item) => item.form_record_ids.length > 0);
 };
+var getAllDiscountList = (cartItem) => {
+  var _a, _b, _c, _d;
+  let discountList = ((_b = (_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.product) == null ? void 0 : _b.discount_list) || [];
+  (((_d = (_c = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _c.product) == null ? void 0 : _d.product_bundle) || []).forEach((item) => {
+    discountList = [...discountList, ...item.discount_list];
+    item.discount_list = void 0;
+  });
+  return discountList;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   generateDuration,
+  getAllDiscountList,
   mergeRelationForms
 });

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

@@ -30,6 +30,13 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         selectedList?: SetDiscountSelectedParams[];
         scan?: boolean;
     }): DiscountResult;
+    /**
+     * 检查优惠是否符合 PackageSubItemUsageRules 配置
+     * @param discount 优惠券
+     * @param flatItem 扁平化后的商品项（可能是主商品或bundle子商品）
+     * @returns 是否可用
+     */
+    private checkPackageSubItemUsageRules;
     destroy(): Promise<void>;
     clear(): Promise<void>;
 }