@pisell/pisellos 2.3.37 → 2.3.38

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

@@ -35,6 +35,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     excludeDiscountListByType(discountList: Discount[], type: string): Discount[];
     /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
     resolveDiscountListForManualOverride(discountList: Discount[]): Discount[];
+    private isItemRewardProductDiscount;
     private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];

package/dist/modules/Rules/index.js

@@ -241,6 +241,17 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     value: function resolveDiscountListForManualOverride(discountList) {
       return this.excludeDiscountListByType(discountList, 'promotion');
     }
+  }, {
+    key: "isItemRewardProductDiscount",
+    value: function isItemRewardProductDiscount(product) {
+      var _product$_promotion;
+      var discountList = Array.isArray(product === null || product === void 0 ? void 0 : product.discount_list) ? product.discount_list : [];
+      return (product === null || product === void 0 || (_product$_promotion = product._promotion) === null || _product$_promotion === void 0 ? void 0 : _product$_promotion.actionType) === 'ITEM_REWARD' && discountList.some(function (item) {
+        var _item$metadata, _item$metadata2;
+        return (item === null || item === void 0 ? void 0 : item.type) === 'product' && (item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.source) === 'promotion' && (item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.actionType) === 'ITEM_REWARD';
+      });
+    }
+
     // 获取券不可用的原因
   }, {
     key: "getUnavailableReason",
@@ -429,6 +440,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 2. 展开 bundle 子商品
           if (product.bundle && Array.isArray(product.bundle) && product.bundle.length > 0) {
             product.bundle.forEach(function (bundleItem, bundleIndex) {
+              var _ref3, _bundleItem$bundle_pr;
               flattened.push({
                 type: 'bundle',
                 originProduct: originProduct,
@@ -437,8 +449,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 bundleIndex: bundleIndex,
                 // 虚拟商品属性
                 price: Number(bundleItem.price || 0),
-                id: bundleItem._bundle_product_id,
-                // 🔥 使用 _bundle_product_id
+                id: (_ref3 = (_bundleItem$bundle_pr = bundleItem.bundle_product_id) !== null && _bundleItem$bundle_pr !== void 0 ? _bundleItem$bundle_pr : bundleItem._bundle_product_id) !== null && _ref3 !== void 0 ? _ref3 : bundleItem.product_id,
                 _id: "".concat(product._id, "_bundle_").concat(bundleIndex),
                 parentId: product._id,
                 num: bundleItem.num || 1,
@@ -587,10 +598,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 对扁平化后的列表按价格降序排序（用于应用优惠券时优先选择高价商品）
       var sortedFlattenedList = flattenedList.sort(function (a, b) {
-        var _ref3, _a$original_price, _ref4, _b$original_price;
+        var _ref4, _a$original_price, _ref5, _b$original_price;
         // 子商品优先使用 original_price，主商品使用 price
-        var priceA = new Decimal(a.type === 'bundle' ? (_ref3 = (_a$original_price = a.original_price) !== null && _a$original_price !== void 0 ? _a$original_price : a.price) !== null && _ref3 !== void 0 ? _ref3 : '0' : a.price || '0');
-        var priceB = new Decimal(b.type === 'bundle' ? (_ref4 = (_b$original_price = b.original_price) !== null && _b$original_price !== void 0 ? _b$original_price : b.price) !== null && _ref4 !== void 0 ? _ref4 : '0' : b.price || '0');
+        var priceA = new Decimal(a.type === 'bundle' ? (_ref4 = (_a$original_price = a.original_price) !== null && _a$original_price !== void 0 ? _a$original_price : a.price) !== null && _ref4 !== void 0 ? _ref4 : '0' : a.price || '0');
+        var priceB = new Decimal(b.type === 'bundle' ? (_ref5 = (_b$original_price = b.original_price) !== null && _b$original_price !== void 0 ? _b$original_price : b.price) !== null && _ref5 !== void 0 ? _ref5 : '0' : b.price || '0');
         if (priceA.equals(priceB)) {
           // 价格相同时，主商品优先
           if (a.type !== b.type) {
@@ -729,6 +740,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             startDate: (_flatItem$parentProdu = flatItem.parentProduct) === null || _flatItem$parentProdu === void 0 ? void 0 : _flatItem$parentProdu.startDate
           };
         }
+        if (_this3.isItemRewardProductDiscount(product)) {
+          return false;
+        }
 
         // 编辑的商品使用了优惠券不可用
         var isAvailableProduct = flatItem.type === 'main' ? !((_product2 = product) !== null && _product2 !== void 0 && _product2.booking_id && (_product3 = product) !== null && _product3 !== void 0 && (_product3 = _product3.discount_list) !== null && _product3 !== void 0 && _product3.length && (_product4 = product) !== null && _product4 !== void 0 && (_product4 = _product4.discount_list) !== null && _product4 !== void 0 && _product4.every(function (d) {
@@ -832,7 +846,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 收集该折扣卡适用的商品（排除被其他专属折扣卡占用的商品）
         var applicableProducts = [];
         sortedFlattenedList.forEach(function (flatItem) {
-          var _flatItem$parentProdu2, _flatItem$parentProdu3, _product$price, _ref5, _flatItem$original_pr;
+          var _flatItem$parentProdu2, _flatItem$parentProdu3, _product$price, _ref6, _flatItem$original_pr;
           // 🔥 检查该商品是否被其他专属折扣卡占用
           var occupyingDiscountId = occupiedItems.get(flatItem._id);
           if (occupyingDiscountId !== undefined && occupyingDiscountId !== discount.id) {
@@ -860,7 +874,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 对于主商品：使用 price
           // 对于子商品：优先使用 flatItem.original_price，否则使用 flatItem.price
-          var originalAmount = flatItem.type === 'main' ? Number((_product$price = product.price) !== null && _product$price !== void 0 ? _product$price : 0) : Number((_ref5 = (_flatItem$original_pr = flatItem.original_price) !== null && _flatItem$original_pr !== void 0 ? _flatItem$original_pr : flatItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
+          var originalAmount = flatItem.type === 'main' ? Number((_product$price = product.price) !== null && _product$price !== void 0 ? _product$price : 0) : Number((_ref6 = (_flatItem$original_pr = flatItem.original_price) !== null && _flatItem$original_pr !== void 0 ? _flatItem$original_pr : flatItem.price) !== null && _ref6 !== void 0 ? _ref6 : 0);
 
           // 传递 parentQuantity 用于差值处理时判断是否是真正的"数量为1"
           var productData = {
@@ -915,6 +929,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           };
           originProduct = flatItem.originProduct;
         }
+        var isItemRewardProductDiscount = _this3.isItemRewardProductDiscount(product);
         addModeDiscount.forEach(function (discount) {
           var _product6, _product7, _product8, _product9, _flatItem$bundleItem3, _flatItem$bundleItem4, _discount$config;
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
@@ -940,7 +955,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
+          if (isAvailableProduct && !isItemRewardProductDiscount && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
             var _discountApplicabilit, _discount$metadata4, _discount$metadata5;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -988,13 +1003,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         };
         var optionDiscountAmount = 0;
         var discountedOptions = options.map(function (option) {
-          var _ref6, _ref7, _option$_original_pri, _ref8, _option$num, _rest$price, _option$_original_pri2;
+          var _ref7, _ref8, _option$_original_pri, _ref9, _option$num, _rest$price, _option$_original_pri2;
           // 折前单价：优先 price，缺失再 add_price；已写回折后价时用 _original_price（或旧字段 _original_add_price）
-          var rawUnit = (_ref6 = (_ref7 = (_option$_original_pri = option._original_price) !== null && _option$_original_pri !== void 0 ? _option$_original_pri : option._original_add_price) !== null && _ref7 !== void 0 ? _ref7 : option.price) !== null && _ref6 !== void 0 ? _ref6 : option.add_price;
+          var rawUnit = (_ref7 = (_ref8 = (_option$_original_pri = option._original_price) !== null && _option$_original_pri !== void 0 ? _option$_original_pri : option._original_add_price) !== null && _ref8 !== void 0 ? _ref8 : option.price) !== null && _ref7 !== void 0 ? _ref7 : option.add_price;
           var baseUnitNum = Number(rawUnit !== null && rawUnit !== void 0 ? rawUnit : 0);
           if (baseUnitNum <= 0) return option;
           var discountedPrice = getDiscountAmount(discount, baseUnitNum, baseUnitNum);
-          var optQty = Number((_ref8 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref8 !== void 0 ? _ref8 : 1);
+          var optQty = Number((_ref9 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref9 !== void 0 ? _ref9 : 1);
           optionDiscountAmount = new Decimal(optionDiscountAmount).plus(new Decimal(baseUnitNum).minus(discountedPrice).mul(optQty)).toNumber();
           var _original_add_price = option._original_add_price,
             rest = _objectWithoutProperties(option, _excluded);
@@ -1028,9 +1043,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var getOptionTotal = function getOptionTotal(options) {
         if (!(options !== null && options !== void 0 && options.length)) return 0;
         return options.reduce(function (sum, opt) {
-          var _ref9, _opt$price, _ref10, _opt$num;
-          var unit = Number((_ref9 = (_opt$price = opt.price) !== null && _opt$price !== void 0 ? _opt$price : opt.add_price) !== null && _ref9 !== void 0 ? _ref9 : 0);
-          var n = Number((_ref10 = (_opt$num = opt.num) !== null && _opt$num !== void 0 ? _opt$num : opt.quantity) !== null && _ref10 !== void 0 ? _ref10 : 1);
+          var _ref10, _opt$price, _ref11, _opt$num;
+          var unit = Number((_ref10 = (_opt$price = opt.price) !== null && _opt$price !== void 0 ? _opt$price : opt.add_price) !== null && _ref10 !== void 0 ? _ref10 : 0);
+          var n = Number((_ref11 = (_opt$num = opt.num) !== null && _opt$num !== void 0 ? _opt$num : opt.quantity) !== null && _ref11 !== void 0 ? _ref11 : 1);
           return new Decimal(sum).plus(new Decimal(unit).mul(n)).toNumber();
         }, 0);
       };
@@ -1085,6 +1100,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
           var _product$discount_lis3, _product$discount_lis4;
+          if (_this3.isItemRewardProductDiscount(product)) return false;
           // 🔥 检查策略可用性（针对 good_pass 和折扣卡）
           var discountType = discount.tag || discount.type;
           var currentOriginUid = getOriginProductUid(originProduct);
@@ -1162,28 +1178,36 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false;
         });
 
-        // 选择第一个适用的优惠券（已经按过期时间排序）
-        // 如果有 isScan 且 isSelected 的折扣卡，则优先选中，否则再选择第一个
-        // 用于处理：先手动扫描了一张折扣卡，扫描完以后带入客户信息，但是之前那张折扣卡不是最优惠的情况
-        var selectedDiscountCard = applicableDiscounts.find(function (n) {
+        // 用户显式点击某张折扣卡时，本次选择优先于自动排序和扫码默认选择。
+        // 目标仍必须在当前商品的 applicableDiscounts 中，因此不会绕过 Holder、时间或商品范围校验。
+        var explicitlySelectedDiscountCard = (options === null || options === void 0 ? void 0 : options.isSelected) === true && options.discountId !== undefined ? applicableDiscounts.find(function (discount) {
+          var discountType = discount.tag || discount.type;
+          return String(discount.id) === String(options.discountId) && ['discount_card', 'product_discount_card'].includes(discountType);
+        }) : undefined;
+
+        // 没有显式选择时保持现有行为：扫码且已选中的折扣卡优先，否则使用自动排序第一项。
+        var scannedSelectedDiscountCard = applicableDiscounts.find(function (n) {
           return n.isScan && n.isSelected && (n.tag || n.type) !== 'good_pass';
         });
+        var selectedDiscountCard = explicitlySelectedDiscountCard || scannedSelectedDiscountCard;
         var selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
 
         // 如果是手动折扣，则不适用优惠券
         var isManualDiscount = false;
+        var isItemRewardProductDiscount = false;
         if (flatItem.type === 'main') {
           var _product$discount_lis5, _product$discount_lis6, _product12, _product12$every;
           // 主商品：判断自身是否手动折扣
           isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : ((_product$discount_lis5 = product.discount_list) === null || _product$discount_lis5 === void 0 ? void 0 : _product$discount_lis5.some(function (item) {
             return item.type === 'product';
           })) || product.total != product.origin_total && (product.bundle || []).every(function (item) {
-            var _ref11;
-            return !((_ref11 = item.discount_list || []) !== null && _ref11 !== void 0 && _ref11.length);
+            var _ref12;
+            return !((_ref12 = item.discount_list || []) !== null && _ref12 !== void 0 && _ref12.length);
           }) && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || ((_product12 = product) === null || _product12 === void 0 || (_product12 = _product12.discount_list) === null || _product12 === void 0 || (_product12$every = _product12.every) === null || _product12$every === void 0 ? void 0 : _product12$every.call(_product12, function (item) {
             return item.type === 'product';
           })));
-          if (product.inPromotion) {
+          isItemRewardProductDiscount = _this3.isItemRewardProductDiscount(product);
+          if (product.inPromotion && !isItemRewardProductDiscount) {
             isManualDiscount = false;
           }
         } else {
@@ -1194,8 +1218,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             isManualDiscount = typeof parentProduct.isManualDiscount === 'boolean' ? parentProduct.isManualDiscount : ((_parentProduct$discou = parentProduct.discount_list) === null || _parentProduct$discou === void 0 ? void 0 : _parentProduct$discou.some(function (item) {
               return item.type === 'product';
             })) || parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(function (item) {
-              var _ref12;
-              return !((_ref12 = item.discount_list || []) !== null && _ref12 !== void 0 && _ref12.length);
+              var _ref13;
+              return !((_ref13 = item.discount_list || []) !== null && _ref13 !== void 0 && _ref13.length);
             }) && (!((_parentProduct$discou2 = parentProduct.discount_list) !== null && _parentProduct$discou2 !== void 0 && _parentProduct$discou2.length) || (parentProduct === null || parentProduct === void 0 || (_parentProduct$discou3 = parentProduct.discount_list) === null || _parentProduct$discou3 === void 0 || (_parentProduct$discou4 = _parentProduct$discou3.every) === null || _parentProduct$discou4 === void 0 ? void 0 : _parentProduct$discou4.call(_parentProduct$discou3, function (item) {
               return item.type === 'product';
             })));
@@ -1288,20 +1312,22 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(product.discount_list) : _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
-              var _ref13, _product$_promotion$f, _product13, _product$origin_total;
-              var total = product.inPromotion ? (_ref13 = (_product$_promotion$f = (_product13 = product) === null || _product13 === void 0 || (_product13 = _product13._promotion) === null || _product13 === void 0 ? void 0 : _product13.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref13 !== void 0 ? _ref13 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
+              var _ref14, _product$_promotion$f, _product13, _product$origin_total;
+              var total = product.inPromotion ? (_ref14 = (_product$_promotion$f = (_product13 = product) === null || _product13 === void 0 || (_product13 = _product13._promotion) === null || _product13 === void 0 ? void 0 : _product13.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref14 !== void 0 ? _ref14 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
               var main_product_selling_price = product.price;
               if ((product.discount_list || []).some(function (item) {
                 return item.type === 'promotion';
-              }) || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
+              }) || isItemRewardProductDiscount || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
                 var _product$total, _product$main_product;
                 total = (_product$total = product.total) !== null && _product$total !== void 0 ? _product$total : product.origin_total;
                 main_product_selling_price = (_product$main_product = product.main_product_selling_price) !== null && _product$main_product !== void 0 ? _product$main_product : main_product_selling_price;
               }
-              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
+              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? _objectSpread({
                 price: product.price,
-                main_product_selling_price: product.price
-              } : {
+                main_product_selling_price: isItemRewardProductDiscount ? main_product_selling_price : product.price
+              }, isItemRewardProductDiscount ? {
+                total: total
+              } : {}) : {
                 _id: product._id.split('___')[0] + '___' + index,
                 total: total,
                 price: product.price,
@@ -1750,11 +1776,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   processedItems.forEach(function (item) {
                     // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                     var updatedDiscountList = (item.discount_list || []).map(function (discount) {
-                      var _item$metadata;
+                      var _item$metadata3;
                       return _objectSpread(_objectSpread({}, discount), {}, {
                         metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                           num: item.num,
-                          custom_product_bundle_map_id: (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.custom_product_bundle_map_id
+                          custom_product_bundle_map_id: (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.custom_product_bundle_map_id
                         })
                         // num: item.num, // 使用拆分后的 num
                       });
@@ -1773,11 +1799,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   if (item.processed) {
                     // 🔥 同样需要更新 discount_list 中的 num
                     var _updatedDiscountList = (item.discount_list || []).map(function (discount) {
-                      var _item$metadata2;
+                      var _item$metadata4;
                       return _objectSpread(_objectSpread({}, discount), {}, {
                         metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                           num: item.num,
-                          custom_product_bundle_map_id: (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.custom_product_bundle_map_id
+                          custom_product_bundle_map_id: (_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.custom_product_bundle_map_id
                         })
                         // num: item.num, // 使用当前的 num
                       });
@@ -1818,8 +1844,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
               // 🔥 使用更新后的列表计算折扣金额
               var mainDiscountList = updatedMainDiscountList.filter(function (item) {
-                var _item$metadata3;
-                return !(item !== null && item !== void 0 && (_item$metadata3 = item.metadata) !== null && _item$metadata3 !== void 0 && _item$metadata3.custom_product_bundle_map_id);
+                var _item$metadata5;
+                return !(item !== null && item !== void 0 && (_item$metadata5 = item.metadata) !== null && _item$metadata5 !== void 0 && _item$metadata5.custom_product_bundle_map_id);
               });
               if (mainDiscountList && mainDiscountList.length > 0) {
                 var _Decimal$minus$toNumb, _mainProductData$orig;
@@ -1892,8 +1918,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 🔥 使用更新后的列表计算折扣金额
                 var mainDiscountListOriginal = updatedMainDiscountListOriginal.filter(function (item) {
-                  var _item$metadata4;
-                  return !(item !== null && item !== void 0 && (_item$metadata4 = item.metadata) !== null && _item$metadata4 !== void 0 && _item$metadata4.custom_product_bundle_map_id);
+                  var _item$metadata6;
+                  return !(item !== null && item !== void 0 && (_item$metadata6 = item.metadata) !== null && _item$metadata6 !== void 0 && _item$metadata6.custom_product_bundle_map_id);
                 });
                 if (mainDiscountListOriginal && mainDiscountListOriginal.length > 0) {
                   var _Decimal$minus$toNumb2, _mainProductData$orig2;
@@ -1934,7 +1960,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             } else {
               // 🔥 没有子商品被拆分，使用原有逻辑
               mainProductArr.forEach(function (mainProduct) {
-                var _ref15, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
+                var _ref16, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
                 var mainProductData = _this3.hooks.getProduct(mainProduct);
 
                 // 重组bundle
@@ -1949,9 +1975,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     } else {
                       // 🔥 关键：拆分后的bundle item
                       processedBundleItems.forEach(function (item) {
-                        var _item$price, _ref14, _item$bundle_selling_;
+                        var _item$price, _ref15, _item$bundle_selling_;
                         var nextBundlePrice = (_item$price = item.price) !== null && _item$price !== void 0 ? _item$price : bundleItem.price;
-                        var nextBundleSellingPrice = (_ref14 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref14 !== void 0 ? _ref14 : bundleItem.bundle_selling_price;
+                        var nextBundleSellingPrice = (_ref15 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref15 !== void 0 ? _ref15 : bundleItem.bundle_selling_price;
                         // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                         var updatedDiscountList = (item.discount_list || []).map(function (discount) {
                           var _discount$metadata10;
@@ -1978,7 +2004,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 主商品已经在前面的 setProduct 中应用过折扣；这里只替换 bundle，
                 // 避免把主商品 discount_list 再扣一次。
-                var mainSellingPrice = (_ref15 = (_mainProductData$main = mainProductData.main_product_selling_price) !== null && _mainProductData$main !== void 0 ? _mainProductData$main : mainProductData.price) !== null && _ref15 !== void 0 ? _ref15 : 0;
+                var mainSellingPrice = (_ref16 = (_mainProductData$main = mainProductData.main_product_selling_price) !== null && _mainProductData$main !== void 0 ? _mainProductData$main : mainProductData.price) !== null && _ref16 !== void 0 ? _ref16 : 0;
                 var newTotal = Number(mainSellingPrice || 0);
                 var newOriginTotal = Number(mainProductData.original_price || mainProductData.price || 0);
 
@@ -2126,14 +2152,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var ruleType = usageRules.type;
       // 套餐适用范围配置
       var packageScope = usageRules === null || usageRules === void 0 ? void 0 : usageRules.package_scope;
-      var _ref16 = packageScope || {},
-        scopeType = _ref16.type,
-        _ref16$exclude_bundle = _ref16.exclude_bundle_product_ids,
-        exclude_bundle_product_ids = _ref16$exclude_bundle === void 0 ? [] : _ref16$exclude_bundle,
-        _ref16$include_bundle = _ref16.include_bundle_product_ids,
-        include_bundle_product_ids = _ref16$include_bundle === void 0 ? [] : _ref16$include_bundle,
-        _ref16$filter = _ref16.filter,
-        filter = _ref16$filter === void 0 ? 0 : _ref16$filter;
+      var _ref17 = packageScope || {},
+        scopeType = _ref17.type,
+        _ref17$exclude_bundle = _ref17.exclude_bundle_product_ids,
+        exclude_bundle_product_ids = _ref17$exclude_bundle === void 0 ? [] : _ref17$exclude_bundle,
+        _ref17$include_bundle = _ref17.include_bundle_product_ids,
+        include_bundle_product_ids = _ref17$include_bundle === void 0 ? [] : _ref17$include_bundle,
+        _ref17$filter = _ref17.filter,
+        filter = _ref17$filter === void 0 ? 0 : _ref17$filter;
       var isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
 

package/dist/server/index.js

@@ -5716,7 +5716,7 @@ var Server = /*#__PURE__*/function () {
     key: "handleOrderCheckoutSubmit",
     value: function () {
       var _handleOrderCheckoutSubmit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee58(params) {
-        var backendPath, data, title, normalizedData, checkoutData, pendingResult, pendingOrder;
+        var backendPath, data, title, normalizedData, checkoutData, pendingResult, _this$core$context2, pendingOrder, platform, isAndroid;
         return _regeneratorRuntime().wrap(function _callee58$(_context58) {
           while (1) switch (_context58.prev = _context58.next) {
             case 0:
@@ -5755,34 +5755,35 @@ var Server = /*#__PURE__*/function () {
             case 12:
               pendingResult = _context58.sent;
               if (!((pendingResult === null || pendingResult === void 0 ? void 0 : pendingResult.status) === true)) {
-                _context58.next = 20;
+                _context58.next = 22;
                 break;
               }
               pendingOrder = pendingResult.data;
-              if (!(pendingOrder && this.shouldBuildSmallTicketData(checkoutData) && this.isSalesOrderFullyPaid(pendingOrder) &&
-              // TODO 这里先加个兼容，只有 type 为 virtual 才走打印
-              // 后期需要迁移到 picoding ，根据工作流配置
-              checkoutData.type === 'virtual')) {
-                _context58.next = 18;
+              platform = (_this$core$context2 = this.core.context) === null || _this$core$context2 === void 0 ? void 0 : _this$core$context2.getPlatform();
+              isAndroid = platform === 'android';
+              if (!(pendingOrder && this.shouldBuildSmallTicketData(checkoutData) && this.isSalesOrderFullyPaid(pendingOrder) && (
+              // TODO 这里先加个兼容，如果是安卓，则需要 type=virtual 才走打印，如果是苹果则无限制
+              isAndroid ? checkoutData.type === 'virtual' : true))) {
+                _context58.next = 20;
                 break;
               }
-              _context58.next = 18;
+              _context58.next = 20;
               return this.dispatchLocalReceiptPrint({
                 checkoutData: checkoutData,
                 order: pendingOrder,
                 response: pendingResult,
                 requireFullyPaid: true
               });
-            case 18:
-              _context58.next = 20;
+            case 20:
+              _context58.next = 22;
               return this.dispatchCheckoutSyncTask({
                 backendPath: backendPath,
                 data: checkoutData,
                 title: title
               });
-            case 20:
+            case 22:
               if (pendingResult.data.order_id) {
-                _context58.next = 22;
+                _context58.next = 24;
                 break;
               }
               return _context58.abrupt("return", _objectSpread(_objectSpread({}, pendingResult), {}, {
@@ -5790,9 +5791,9 @@ var Server = /*#__PURE__*/function () {
                   order_id: pendingResult.data.external_sale_number
                 })
               }));
-            case 22:
+            case 24:
               return _context58.abrupt("return", pendingResult);
-            case 23:
+            case 25:
             case "end":
               return _context58.stop();
           }
@@ -6457,9 +6458,9 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "getProductTitleSnapshotCurrentLocale",
     value: function getProductTitleSnapshotCurrentLocale() {
-      var _this$core$context2, _this$core$context3;
+      var _this$core$context3, _this$core$context4;
       var shopInfo = this.getSmallTicketShopInfo();
-      var rawLocale = shopInfo.primary_locale || this.getAppData('locale') || this.getAppData('language') || ((_this$core$context2 = this.core.context) === null || _this$core$context2 === void 0 ? void 0 : _this$core$context2.locale) || ((_this$core$context3 = this.core.context) === null || _this$core$context3 === void 0 ? void 0 : _this$core$context3.language);
+      var rawLocale = shopInfo.primary_locale || this.getAppData('locale') || this.getAppData('language') || ((_this$core$context3 = this.core.context) === null || _this$core$context3 === void 0 ? void 0 : _this$core$context3.locale) || ((_this$core$context4 = this.core.context) === null || _this$core$context4 === void 0 ? void 0 : _this$core$context4.language);
       return this.normalizeProductTitleSnapshotLocale(rawLocale);
     }
   }, {
@@ -7834,7 +7835,7 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "buildProductFormatterContext",
     value: function buildProductFormatterContext(context) {
-      var _this$menu, _this$menu$getMenuLis, _scheduleModule$getSc, _this$core$context4;
+      var _this$menu, _this$menu$getMenuLis, _scheduleModule$getSc, _this$core$context5;
       var scheduleModule = this.getSchedule();
       return {
         scheduleModule: scheduleModule,
@@ -7843,7 +7844,7 @@ var Server = /*#__PURE__*/function () {
         strategy_context: context.strategy_context,
         menuList: ((_this$menu = this.menu) === null || _this$menu === void 0 || (_this$menu$getMenuLis = _this$menu.getMenuList) === null || _this$menu$getMenuLis === void 0 ? void 0 : _this$menu$getMenuLis.call(_this$menu)) || [],
         scheduleList: (scheduleModule === null || scheduleModule === void 0 || (_scheduleModule$getSc = scheduleModule.getScheduleList) === null || _scheduleModule$getSc === void 0 ? void 0 : _scheduleModule$getSc.call(scheduleModule)) || [],
-        dataVariantEvaluator: (_this$core$context4 = this.core.context) === null || _this$core$context4 === void 0 ? void 0 : _this$core$context4.dataVariantEvaluator
+        dataVariantEvaluator: (_this$core$context5 = this.core.context) === null || _this$core$context5 === void 0 ? void 0 : _this$core$context5.dataVariantEvaluator
       };
     }
 

package/dist/server/modules/order/index.d.ts

@@ -167,6 +167,11 @@ export declare class OrderModule extends BaseModule implements Module {
     private syncOrdersMap;
     private getOrderMapKey;
     private isBlankIdentityValue;
+    /**
+     * `/sales/draft` 的旧调用方可能把未设置的 business_code 传成空串。
+     * 对同一真实订单，空值不能覆盖已有的分类，否则 booking 查询会把该订单从 Party 列表过滤掉。
+     */
+    private preserveExistingBusinessCodeForDraft;
     private getOrderIdentityEntries;
     private getOrderIdentityKeys;
     private getOrderDateKey;

package/dist/server/modules/order/index.js

@@ -1572,7 +1572,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _upsertLocalDraftOrders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(draftOrders) {
         var _this10 = this;
-        var draftMap, memoryDraftMap, _iterator8, _step8, order, draftOrder, storageKey, memoryDraftOrder, patchedOrders, mergeActions, updatedList, identityKeyToIndex, index, _iterator9, _step9, key, _iterator10, _step10, _step10$value, _storageKey2, _draftOrder, matchIndex, mergedOrder, nextOrder, insertIndex, previousList, removedLegacyMemoryDraft;
+        var draftMap, memoryDraftMap, _iterator8, _step8, order, draftOrder, storageKey, memoryDraftOrder, mergeActions, updatedList, identityKeyToIndex, index, _iterator9, _step9, key, _iterator10, _step10, _step10$value, _storageKey2, _draftOrder, matchIndex, existingOrder, reconciledDraftOrder, mergedOrder, nextOrder, insertIndex, patchedOrders, previousList, removedLegacyMemoryDraft;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -1639,7 +1639,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 memoryDraftCount: memoryDraftMap.size,
                 sqliteOnlyDraftCount: draftMap.size - memoryDraftMap.size
               });
-              patchedOrders = _toConsumableArray(draftMap.values());
               mergeActions = {};
               updatedList = this.store.list.filter(function (order) {
                 return _this10.shouldKeepOrderInMemory(order);
@@ -1659,66 +1658,71 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               _iterator10 = _createForOfIteratorHelper(memoryDraftMap.entries());
-              _context13.prev = 37;
+              _context13.prev = 36;
               _iterator10.s();
-            case 39:
+            case 38:
               if ((_step10 = _iterator10.n()).done) {
-                _context13.next = 55;
+                _context13.next = 57;
                 break;
               }
               _step10$value = _slicedToArray(_step10.value, 2), _storageKey2 = _step10$value[0], _draftOrder = _step10$value[1];
               matchIndex = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, this.getOrderIdentityMatchKeys(_draftOrder));
               if (!(matchIndex >= 0)) {
-                _context13.next = 49;
+                _context13.next = 51;
                 break;
               }
-              mergedOrder = this.mergeOrderRecords(updatedList[matchIndex], _draftOrder);
+              existingOrder = updatedList[matchIndex];
+              reconciledDraftOrder = this.preserveExistingBusinessCodeForDraft(existingOrder, _draftOrder);
+              mergedOrder = this.mergeOrderRecords(existingOrder, reconciledDraftOrder);
               nextOrder = _objectSpread(_objectSpread({}, mergedOrder), {}, {
                 need_sync: 0,
                 is_draft_order: 1
               });
               updatedList[matchIndex] = nextOrder;
+              // SQLite 必须与内存中的草稿保持同一份 business_code，避免下次 hydrate 再次丢失分类。
+              draftMap.set(_storageKey2, reconciledDraftOrder);
               this.registerOrderIdentityKeys(identityKeyToIndex, nextOrder, matchIndex);
               mergeActions[_storageKey2] = 'update';
-              return _context13.abrupt("continue", 53);
-            case 49:
+              return _context13.abrupt("continue", 55);
+            case 51:
               insertIndex = updatedList.length;
               updatedList.push(_draftOrder);
               this.registerOrderIdentityKeys(identityKeyToIndex, _draftOrder, insertIndex);
               mergeActions[_storageKey2] = 'insert';
-            case 53:
-              _context13.next = 39;
-              break;
             case 55:
-              _context13.next = 60;
+              _context13.next = 38;
               break;
             case 57:
-              _context13.prev = 57;
-              _context13.t1 = _context13["catch"](37);
+              _context13.next = 62;
+              break;
+            case 59:
+              _context13.prev = 59;
+              _context13.t1 = _context13["catch"](36);
               _iterator10.e(_context13.t1);
-            case 60:
-              _context13.prev = 60;
+            case 62:
+              _context13.prev = 62;
               _iterator10.f();
-              return _context13.finish(60);
-            case 63:
+              return _context13.finish(62);
+            case 65:
+              patchedOrders = _toConsumableArray(draftMap.values());
               previousList = this.store.list;
               this.store.list = this.runOrderStoreSelfCheck(updatedList, 'upsertLocalDraftOrders.store');
               this.syncOrdersMap();
-              _context13.prev = 66;
-              _context13.next = 69;
+              _context13.prev = 69;
+              _context13.next = 72;
               return this.patchOrdersInSQLite(patchedOrders, 'upsertLocalDraftOrders', mergeActions, {
                 throwOnError: true
               });
-            case 69:
-              _context13.next = 76;
+            case 72:
+              _context13.next = 79;
               break;
-            case 71:
-              _context13.prev = 71;
-              _context13.t2 = _context13["catch"](66);
+            case 74:
+              _context13.prev = 74;
+              _context13.t2 = _context13["catch"](69);
               this.store.list = previousList;
               this.syncOrdersMap();
               throw _context13.t2;
-            case 76:
+            case 79:
               this.logInfo('upsertLocalDraftOrders-结束', {
                 count: patchedOrders.length,
                 storeOrderCountAfter: this.store.list.length
@@ -1727,18 +1731,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 return !_this10.shouldKeepOrderInMemory(order);
               });
               if (!(memoryDraftMap.size > 0 || removedLegacyMemoryDraft)) {
-                _context13.next = 81;
+                _context13.next = 84;
                 break;
               }
-              _context13.next = 81;
+              _context13.next = 84;
               return this.emitOrdersChanged(patchedOrders.filter(function (order) {
                 return _this10.shouldKeepOrderInMemory(order);
               }), 'upsertLocalDraftOrders');
-            case 81:
+            case 84:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[6, 21, 24, 27], [37, 57, 60, 63], [66, 71]]);
+        }, _callee13, this, [[6, 21, 24, 27], [36, 59, 62, 65], [69, 74]]);
       }));
       function upsertLocalDraftOrders(_x10) {
         return _upsertLocalDraftOrders.apply(this, arguments);
@@ -1853,6 +1857,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function isBlankIdentityValue(value) {
       return value === undefined || value === null || value === '';
     }
+
+    /**
+     * `/sales/draft` 的旧调用方可能把未设置的 business_code 传成空串。
+     * 对同一真实订单，空值不能覆盖已有的分类，否则 booking 查询会把该订单从 Party 列表过滤掉。
+     */
+  }, {
+    key: "preserveExistingBusinessCodeForDraft",
+    value: function preserveExistingBusinessCodeForDraft(existingOrder, draftOrder) {
+      var existingBusinessCode = existingOrder.business_code;
+      var draftBusinessCode = draftOrder.business_code;
+      var hasExistingBusinessCode = typeof existingBusinessCode === 'string' && existingBusinessCode.trim() !== '';
+      var hasDraftBusinessCode = typeof draftBusinessCode === 'string' && draftBusinessCode.trim() !== '';
+      if (!hasExistingBusinessCode || hasDraftBusinessCode) return draftOrder;
+      return _objectSpread(_objectSpread({}, draftOrder), {}, {
+        business_code: existingBusinessCode
+      });
+    }
   }, {
     key: "getOrderIdentityEntries",
     value: function getOrderIdentityEntries(order) {