@pisell/pisellos 0.0.450 → 0.0.452

package/dist/model/strategy/adapter/walletPass/evaluator.js

@@ -11,7 +11,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { StrategyEngine } from "../../index";
-import { processVouchers as _processVouchers, recalculateVouchers as _recalculateVouchers, getApplicableProductIds, getMainProductPrice, getBundleItemPrice, getProductQuantity, getBundleItemIsOriginalPrice } from "./utils";
+import { processVouchers as _processVouchers, recalculateVouchers as _recalculateVouchers, getApplicableProductIds, getMainProductPrice, getBundleItemPrice, getProductQuantity, getBundleItemIsOriginalPrice, getTaxAndFeeRoundingRemainder, getBundleItemTaxAndFeeRoundingRemainder, getProductDiscountDifference, getBundleItemDiscountDifference } from "./utils";
 import { locales } from "./locales";
 import Decimal from 'decimal.js';
 var defaultStrategyMetadataCustom = {
@@ -465,8 +465,8 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
         // 检查主商品是否适用
         var isMainProductApplicable = applicableProductIds === null || applicableProductIds.includes(product.product_id);
         if (isMainProductApplicable) {
-          // 计算主商品价格（包含加减价子商品）
-          total += getMainProductPrice(product, deductTaxAndFee) * productQuantity;
+          // 计算主商品价格（包含加减价子商品）= 单价 * 数量 + 舍入余数 - 商品差额
+          total += getMainProductPrice(product, deductTaxAndFee) * productQuantity + getTaxAndFeeRoundingRemainder(product, deductTaxAndFee) - getProductDiscountDifference(product);
           count += productQuantity;
         }
 
@@ -478,9 +478,9 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
               // 检查子商品是否适用
               var isBundleItemApplicable = applicableProductIds === null || applicableProductIds.includes(bundleItem.bundle_product_id);
               if (isBundleItemApplicable) {
-                // 计算原价子商品价格
+                // 计算原价子商品价格 = 总价 + 舍入余数 - 商品差额
                 var bundleItemQuantity = bundleItem.num * productQuantity;
-                total += getBundleItemPrice(bundleItem, productQuantity, deductTaxAndFee);
+                total += getBundleItemPrice(bundleItem, productQuantity, deductTaxAndFee) + getBundleItemTaxAndFeeRoundingRemainder(bundleItem, deductTaxAndFee) - getBundleItemDiscountDifference(bundleItem);
                 count += bundleItemQuantity;
               }
             }

package/dist/model/strategy/adapter/walletPass/index.js

@@ -5,7 +5,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { getApplicableProductIds, getMainProductPrice, getBundleItemPrice, getProductQuantity, getBundleItemIsOriginalPrice } from "./utils";
+import { getApplicableProductIds, getMainProductPrice, getBundleItemPrice, getProductQuantity, getBundleItemIsOriginalPrice, getTaxAndFeeRoundingRemainder, getBundleItemTaxAndFeeRoundingRemainder, getProductDiscountDifference, getBundleItemDiscountDifference } from "./utils";
 
 /**
  * Wallet Pass 适配器
@@ -149,8 +149,8 @@ var WalletPassAdapter = /*#__PURE__*/function () {
         // 检查主商品是否适用
         var isMainProductApplicable = applicableProductIds === null || applicableProductIds.includes(product.product_id);
         if (isMainProductApplicable) {
-          // 计算主商品价格（包含加减价子商品）
-          total += getMainProductPrice(product, deductTaxAndFee) * productQuantity;
+          // 计算主商品价格（包含加减价子商品）= 单价 * 数量 + 舍入余数 - 商品差额
+          total += getMainProductPrice(product, deductTaxAndFee) * productQuantity + getTaxAndFeeRoundingRemainder(product, deductTaxAndFee) - getProductDiscountDifference(product);
           count += productQuantity;
         }
 
@@ -162,9 +162,9 @@ var WalletPassAdapter = /*#__PURE__*/function () {
               // 检查子商品是否适用
               var isBundleItemApplicable = applicableProductIds === null || applicableProductIds.includes(bundleItem.bundle_product_id);
               if (isBundleItemApplicable) {
-                // 计算原价子商品价格
+                // 计算原价子商品价格 = 总价 + 舍入余数 - 商品差额
                 var bundleItemQuantity = bundleItem.num * productQuantity;
-                total += getBundleItemPrice(bundleItem, productQuantity, deductTaxAndFee);
+                total += getBundleItemPrice(bundleItem, productQuantity, deductTaxAndFee) + getBundleItemTaxAndFeeRoundingRemainder(bundleItem, deductTaxAndFee) - getBundleItemDiscountDifference(bundleItem);
                 count += bundleItemQuantity;
               }
             }

package/dist/model/strategy/adapter/walletPass/type.d.ts

@@ -64,6 +64,8 @@ export interface Product {
         surcharge_rounding_remainder?: number;
         tax_fee_rounding_remainder?: number;
         main_product_selling_price: number;
+        /** 商品折扣差额 */
+        product_discount_difference?: number;
     };
     is_price_include_tax: 0 | 1;
     product_bundle: {
@@ -81,6 +83,7 @@ export interface Product {
             surcharge_fee: number;
             surcharge_rounding_remainder?: number;
             tax_fee_rounding_remainder?: number;
+            product_discount_difference?: number;
         };
     }[];
 }

package/dist/model/strategy/adapter/walletPass/utils.d.ts

@@ -24,18 +24,44 @@ export declare function recalculateVouchers(allVouchers: any[], selectedVouchers
     selectedWithDetails: any[];
 };
 /**
- * 获取主商品价格
+ * 获取税费和附加费的舍入余数
  * @param product 商品
  * @param isDeductTaxAndFee 是否抵扣税费与附加费
- * @returns 商品价格
+ * @returns 舍入余数（税费 + 附加费的舍入余数）
+ */
+export declare const getTaxAndFeeRoundingRemainder: (product: Product, isDeductTaxAndFee: boolean) => number;
+/**
+ * 获取主商品的商品差额
+ * @param product 商品
+ * @returns 商品差额（与数量无关，计算总价时需要减去）
+ */
+export declare const getProductDiscountDifference: (product: Product) => number;
+/**
+ * 获取主商品价格（单价，不含舍入余数）
+ * @param product 商品
+ * @param isDeductTaxAndFee 是否抵扣税费与附加费
+ * @returns 商品单价
  */
 export declare const getMainProductPrice: (product: Product, isDeductTaxAndFee: boolean) => number;
 /**
- * 获取套餐子商品价格
+ * 获取套餐子商品税费和附加费的舍入余数
+ * @param bundleItem 套餐子商品
+ * @param isDeductTaxAndFee 是否抵扣税费与附加费
+ * @returns 舍入余数（税费 + 附加费的舍入余数）
+ */
+export declare const getBundleItemTaxAndFeeRoundingRemainder: (bundleItem: any, isDeductTaxAndFee: boolean) => number;
+/**
+ * 获取套餐子商品的商品差额
+ * @param bundleItem 套餐子商品
+ * @returns 商品差额（与数量无关，计算总价时需要减去）
+ */
+export declare const getBundleItemDiscountDifference: (bundleItem: any) => number;
+/**
+ * 获取套餐子商品价格（不含舍入余数）
  * @param bundleItem 套餐子商品
  * @param parentQuantity 父商品数量
  * @param isDeductTaxAndFee 是否抵扣税费与附加费
- * @returns 子商品总价格
+ * @returns 子商品总价格（不含舍入余数）
  */
 export declare const getBundleItemPrice: (bundleItem: any, parentQuantity: number, isDeductTaxAndFee: boolean) => number;
 /**

package/dist/model/strategy/adapter/walletPass/utils.js

@@ -798,14 +798,48 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
 }
 
 /**
- * 获取主商品价格
+ * 获取税费和附加费的舍入余数
  * @param product 商品
  * @param isDeductTaxAndFee 是否抵扣税费与附加费
- * @returns 商品价格
+ * @returns 舍入余数（税费 + 附加费的舍入余数）
+ */
+export var getTaxAndFeeRoundingRemainder = function getTaxAndFeeRoundingRemainder(product, isDeductTaxAndFee) {
+  var _product$metadata2;
+  if (!isDeductTaxAndFee) {
+    return 0;
+  }
+
+  // 税费舍入余数（如果价格包含税则为0）
+  var taxFeeRoundingRemainder = new Decimal(0);
+  if (product.is_price_include_tax !== 1) {
+    var _product$metadata;
+    taxFeeRoundingRemainder = new Decimal((product === null || product === void 0 || (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.tax_fee_rounding_remainder) || 0);
+  }
+
+  // 附加费舍入余数
+  var surchargeFeeRoundingRemainder = new Decimal((product === null || product === void 0 || (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.surcharge_rounding_remainder) || 0);
+  return taxFeeRoundingRemainder.add(surchargeFeeRoundingRemainder).toNumber();
+};
+
+/**
+ * 获取主商品的商品差额
+ * @param product 商品
+ * @returns 商品差额（与数量无关，计算总价时需要减去）
+ */
+export var getProductDiscountDifference = function getProductDiscountDifference(product) {
+  var _product$metadata3;
+  return new Decimal((product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.product_discount_difference) || 0).toNumber();
+};
+
+/**
+ * 获取主商品价格（单价，不含舍入余数）
+ * @param product 商品
+ * @param isDeductTaxAndFee 是否抵扣税费与附加费
+ * @returns 商品单价
  */
 export var getMainProductPrice = function getMainProductPrice(product, isDeductTaxAndFee) {
-  var _product$metadata, _product$metadata2, _product$metadata3, _product$metadata4, _product$metadata5;
-  var mainProductPrice = new Decimal((product === null || product === void 0 ? void 0 : product.main_product_selling_price) || ((_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.main_product_selling_price) || 0);
+  var _product$metadata4, _product$metadata5, _product$metadata6;
+  var mainProductPrice = new Decimal((product === null || product === void 0 ? void 0 : product.main_product_selling_price) || ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_selling_price) || 0);
   var _iterator6 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
     _step6;
   try {
@@ -824,14 +858,14 @@ export var getMainProductPrice = function getMainProductPrice(product, isDeductT
   } finally {
     _iterator6.f();
   }
-  var taxFee = new Decimal((product === null || product === void 0 ? void 0 : product.tax_fee) || (product === null || product === void 0 || (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.main_product_attached_bundle_tax_fee) || 0).add((product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.tax_fee_rounding_remainder) || 0);
+  var taxFee = new Decimal((product === null || product === void 0 ? void 0 : product.tax_fee) || (product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.main_product_attached_bundle_tax_fee) || 0);
   if (product.is_price_include_tax === 1) {
     taxFee = new Decimal(0);
   }
 
   // 税费
   // 附加费
-  var surchargeFee = new Decimal((product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_attached_bundle_surcharge_fee) || 0).add((product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.surcharge_rounding_remainder) || 0);
+  var surchargeFee = new Decimal((product === null || product === void 0 || (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.main_product_attached_bundle_surcharge_fee) || 0);
 
   // 税费附加费总额
   var taxAndFeeTotal = taxFee.add(surchargeFee);
@@ -844,11 +878,45 @@ export var getMainProductPrice = function getMainProductPrice(product, isDeductT
 };
 
 /**
- * 获取套餐子商品价格
+ * 获取套餐子商品税费和附加费的舍入余数
+ * @param bundleItem 套餐子商品
+ * @param isDeductTaxAndFee 是否抵扣税费与附加费
+ * @returns 舍入余数（税费 + 附加费的舍入余数）
+ */
+export var getBundleItemTaxAndFeeRoundingRemainder = function getBundleItemTaxAndFeeRoundingRemainder(bundleItem, isDeductTaxAndFee) {
+  var _bundleItem$metadata2;
+  if (!isDeductTaxAndFee) {
+    return 0;
+  }
+
+  // 税费舍入余数（如果价格包含税则为0）
+  var taxFeeRoundingRemainder = new Decimal(0);
+  if (bundleItem.is_price_include_tax !== 1) {
+    var _bundleItem$metadata;
+    taxFeeRoundingRemainder = new Decimal(((_bundleItem$metadata = bundleItem.metadata) === null || _bundleItem$metadata === void 0 ? void 0 : _bundleItem$metadata.tax_fee_rounding_remainder) || 0);
+  }
+
+  // 附加费舍入余数
+  var surchargeFeeRoundingRemainder = new Decimal(((_bundleItem$metadata2 = bundleItem.metadata) === null || _bundleItem$metadata2 === void 0 ? void 0 : _bundleItem$metadata2.surcharge_rounding_remainder) || 0);
+  return taxFeeRoundingRemainder.add(surchargeFeeRoundingRemainder).toNumber();
+};
+
+/**
+ * 获取套餐子商品的商品差额
+ * @param bundleItem 套餐子商品
+ * @returns 商品差额（与数量无关，计算总价时需要减去）
+ */
+export var getBundleItemDiscountDifference = function getBundleItemDiscountDifference(bundleItem) {
+  var _bundleItem$metadata3;
+  return new Decimal(((_bundleItem$metadata3 = bundleItem.metadata) === null || _bundleItem$metadata3 === void 0 ? void 0 : _bundleItem$metadata3.product_discount_difference) || 0).toNumber();
+};
+
+/**
+ * 获取套餐子商品价格（不含舍入余数）
  * @param bundleItem 套餐子商品
  * @param parentQuantity 父商品数量
  * @param isDeductTaxAndFee 是否抵扣税费与附加费
- * @returns 子商品总价格
+ * @returns 子商品总价格（不含舍入余数）
  */
 export var getBundleItemPrice = function getBundleItemPrice(bundleItem, parentQuantity, isDeductTaxAndFee) {
   var _bundleItem$bundle_se2;
@@ -858,14 +926,14 @@ export var getBundleItemPrice = function getBundleItemPrice(bundleItem, parentQu
 
   // 根据 deductTaxAndFee 配置决定是否加上税费和附加费
   if (isDeductTaxAndFee) {
-    var _bundleItem$tax_fee, _bundleItem$metadata$, _bundleItem$metadata;
+    var _bundleItem$tax_fee, _bundleItem$metadata$, _bundleItem$metadata4;
     // 税费
     var taxFee = new Decimal((_bundleItem$tax_fee = bundleItem.tax_fee) !== null && _bundleItem$tax_fee !== void 0 ? _bundleItem$tax_fee : 0).times(totalQuantity);
     if (bundleItem.is_price_include_tax === 1) {
       taxFee = new Decimal(0);
     }
     // 附加费
-    var surchargeFee = new Decimal((_bundleItem$metadata$ = (_bundleItem$metadata = bundleItem.metadata) === null || _bundleItem$metadata === void 0 ? void 0 : _bundleItem$metadata.surcharge_fee) !== null && _bundleItem$metadata$ !== void 0 ? _bundleItem$metadata$ : 0).times(totalQuantity);
+    var surchargeFee = new Decimal((_bundleItem$metadata$ = (_bundleItem$metadata4 = bundleItem.metadata) === null || _bundleItem$metadata4 === void 0 ? void 0 : _bundleItem$metadata4.surcharge_fee) !== null && _bundleItem$metadata$ !== void 0 ? _bundleItem$metadata$ : 0).times(totalQuantity);
     bundleItemPrice = bundleItemPrice.add(taxFee).add(surchargeFee);
   }
   return bundleItemPrice.toNumber();
@@ -886,6 +954,11 @@ var expandProductsWithBundleItems = function expandProductsWithBundleItems(produ
     var unitPriceWithTax = getMainProductPrice(product, true);
     var unitPricePure = getMainProductPrice(product, false);
 
+    // 获取舍入余数（与数量无关，只加一次）
+    var roundingRemainderWithTax = getTaxAndFeeRoundingRemainder(product, true);
+    // 获取商品差额（与数量无关，计算总价时需要减去）
+    var discountDifference = getProductDiscountDifference(product);
+
     // 1. 添加主商品（同时计算含税和不含税两个金额，以及单价和剩余数量）
     expandedProducts.push(_objectSpread(_objectSpread({}, product), {}, {
       is_bundle_item: false,
@@ -895,10 +968,10 @@ var expandProductsWithBundleItems = function expandProductsWithBundleItems(produ
       unitPricePure: new Decimal(unitPricePure),
       // 剩余可抵扣数量
       remainingQuantity: productQuantity,
-      // 含税费的剩余金额
-      remainingAmountWithTax: new Decimal(unitPriceWithTax).times(productQuantity),
-      // 纯商品金额（不含税费）
-      remainingAmountPure: new Decimal(unitPricePure).times(productQuantity)
+      // 含税费的剩余金额（单价 * 数量 + 舍入余数 - 商品差额）
+      remainingAmountWithTax: new Decimal(unitPriceWithTax).times(productQuantity).add(roundingRemainderWithTax).sub(discountDifference),
+      // 纯商品金额（不含税费，也需要减去商品差额）
+      remainingAmountPure: new Decimal(unitPricePure).times(productQuantity).sub(discountDifference)
     }));
 
     // 2. 添加原价子商品（作为独立商品项）
@@ -910,6 +983,11 @@ var expandProductsWithBundleItems = function expandProductsWithBundleItems(produ
           var bundleUnitPriceWithTax = new Decimal(getBundleItemPrice(bundleItem, 1, true)).dividedBy(bundleItem.num);
           var bundleUnitPricePure = new Decimal(getBundleItemPrice(bundleItem, 1, false)).dividedBy(bundleItem.num);
 
+          // 获取子商品舍入余数（与数量无关，只加一次）
+          var bundleRoundingRemainder = getBundleItemTaxAndFeeRoundingRemainder(bundleItem, true);
+          // 获取子商品差额（与数量无关，计算总价时需要减去）
+          var bundleDiscountDifference = getBundleItemDiscountDifference(bundleItem);
+
           // 原价子商品作为独立商品
           expandedProducts.push(_objectSpread(_objectSpread({}, bundleItem), {}, {
             product_id: bundleItem.bundle_product_id,
@@ -923,10 +1001,10 @@ var expandProductsWithBundleItems = function expandProductsWithBundleItems(produ
             unitPricePure: bundleUnitPricePure,
             // 剩余可抵扣数量
             remainingQuantity: bundleQuantity,
-            // 含税费的剩余金额
-            remainingAmountWithTax: new Decimal(getBundleItemPrice(bundleItem, productQuantity, true)),
-            // 纯商品金额（不含税费）
-            remainingAmountPure: new Decimal(getBundleItemPrice(bundleItem, productQuantity, false))
+            // 含税费的剩余金额（总价 + 舍入余数 - 商品差额）
+            remainingAmountWithTax: new Decimal(getBundleItemPrice(bundleItem, productQuantity, true)).add(bundleRoundingRemainder).sub(bundleDiscountDifference),
+            // 纯商品金额（不含税费，也需要减去商品差额）
+            remainingAmountPure: new Decimal(getBundleItemPrice(bundleItem, productQuantity, false)).sub(bundleDiscountDifference)
           }));
         }
       });

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

@@ -25,6 +25,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         request_timezone: string;
     }): Promise<Discount[]>;
     batchSearch(code: string, customerId?: number): Promise<Discount[]>;
+    batchSearchByProductIds(productIds: number[]): Promise<any>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
     private checkUsageCreditsLimit;
     uniqueByProductId(discountList: Discount[]): Discount[];

package/dist/modules/Discount/index.js

@@ -208,6 +208,35 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
       }
       return batchSearch;
     }()
+  }, {
+    key: "batchSearchByProductIds",
+    value: function () {
+      var _batchSearchByProductIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(productIds) {
+        var result;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              _context6.next = 2;
+              return this.request.get("/machinecode/batch-search", {
+                ids: productIds,
+                translate_flag: 1,
+                tags: ['good_pass', 'product_discount_card'],
+                relation_product: 1
+              });
+            case 2:
+              result = _context6.sent;
+              return _context6.abrupt("return", (result === null || result === void 0 ? void 0 : result.data) || []);
+            case 4:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6, this);
+      }));
+      function batchSearchByProductIds(_x8) {
+        return _batchSearchByProductIds.apply(this, arguments);
+      }
+      return batchSearchByProductIds;
+    }()
   }, {
     key: "filterEnabledDiscountList",
     value: function filterEnabledDiscountList(discountList) {
@@ -309,21 +338,21 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "destroy",
     value: function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               this.store.discountList = [];
               this.core.effects.offByModuleDestroy(this.name);
-              _context6.next = 4;
+              _context7.next = 4;
               return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
             case 4:
               console.log('[Discount] 已销毁');
             case 5:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);
@@ -333,18 +362,18 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clear",
     value: function () {
-      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               this.store.discountList = [];
               this.store.originalDiscountList = [];
               console.log('[Discount] clear');
             case 3:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
       function clear() {
         return _clear.apply(this, arguments);

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

@@ -137,6 +137,7 @@ export interface Discount {
     num?: number;
     start_date?: string;
     start_time?: string;
+    discount_rule_uncheck_flag?: boolean;
 }
 export interface DiscountState {
     discountList: Discount[];

package/dist/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/modules/Rules/index.js

@@ -295,13 +295,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         orderTotalAmount = _ref2.orderTotalAmount,
         holders = _ref2.holders,
         isFormSubject = _ref2.isFormSubject;
-      // 识别出来是不是在编辑的界面里又新增了商品
-      // 这种情况下，如果有可用的优惠券，也会自动勾选上
-      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) {
@@ -352,7 +345,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             _id: product._id,
             parentId: product._id,
             quantity: product.quantity,
-            num: product.num
+            num: product.num,
+            booking_id: product.booking_id
           });
 
           // 2. 展开 bundle 子商品
@@ -376,7 +370,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 origin_total: new Decimal(bundleItem.price || 0).mul(bundleItem.num || 1).toNumber(),
                 original_price: bundleItem.original_price,
                 // 继承主商品属性
-                booking_id: product.booking_id,
+                booking_id: bundleItem.booking_id,
                 discount_list: bundleItem.discount_list || []
               });
             });
@@ -514,6 +508,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 🔥 扁平化商品列表（包含主商品和bundle子商品）
       var flattenedList = flattenProductsWithBundle(productList);
 
+      // 识别出来是不是在编辑的界面里又新增了商品
+      // 这种情况下，如果有可用的优惠券，也会自动勾选上
+      var isEditModeAddNewProduct = flattenedList.find(function (n) {
+        return n.booking_id;
+      }) && flattenedList.find(function (n) {
+        return !n.booking_id;
+      });
+
       // 对扁平化后的列表按价格降序排序（用于应用优惠券时优先选择高价商品）
       var sortedFlattenedList = flattenedList.sort(function (a, b) {
         var _ref3, _a$original_price, _ref4, _b$original_price;
@@ -896,7 +898,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_product_id: discount.product_id
               },
               metadata: {
-                num: num
+                num: num,
+                discount_rule_uncheck_flag: discount === null || discount === void 0 ? void 0 : discount.discount_rule_uncheck_flag
               }
             };
             applicableProducts.push(productData);
@@ -1259,10 +1262,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               // 前端使用的num数量，为了计算优惠金额
               _num: isGoodPass ? 1 : product.num,
               config: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.config,
-              metadata: _objectSpread({
+              metadata: _objectSpread(_objectSpread({
                 num: 1
               }, productDiscountDifference !== undefined && {
                 product_discount_difference: productDiscountDifference
+              }), {}, {
+                discount_rule_uncheck_flag: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.discount_rule_uncheck_flag
               })
             };
             appliedProducts.push(discountDetail);
@@ -1348,6 +1353,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 metadata: {
                   // 🔥 使用拆分后的唯一 _id
                   custom_product_bundle_map_id: uniqueId,
+                  discount_rule_uncheck_flag: _selectedDiscount2 === null || _selectedDiscount2 === void 0 ? void 0 : _selectedDiscount2.discount_rule_uncheck_flag,
                   num: 1
                 },
                 _num: 1,
@@ -1432,6 +1438,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               metadata: _objectSpread({
                 // 🔥 使用唯一的 _id
                 custom_product_bundle_map_id: _uniqueId,
+                discount_rule_uncheck_flag: _selectedDiscount3 === null || _selectedDiscount3 === void 0 ? void 0 : _selectedDiscount3.discount_rule_uncheck_flag,
                 num: product.num || 1
               }, _productDiscountDifference !== undefined && {
                 product_discount_difference: _productDiscountDifference

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -123,7 +123,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/ShopDiscount/index.d.ts

@@ -39,6 +39,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         discountList: Discount[];
     };
     setProductList(productList: Record<string, any>[]): void;
+    batchSearchByProductIds(productIds: number[]): Promise<Discount[]>;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         productList: Record<string, any>[];