@pisell/pisellos 2.3.74 → 2.3.76

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

@@ -157,9 +157,7 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
                 app = appPlugin.getApp();
                 this.dbManager = app.sqlite;
                 this.logger = app.logger;
-                if (this.dbManager) {
-                  console.log('[Schedule] SQLite 已初始化');
-                } else {
+                if (this.dbManager) {} else {
                   console.warn('[Schedule] SQLite 未找到');
                 }
               }
@@ -323,7 +321,6 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
       } finally {
         _iterator2.f();
       }
-      console.log("[Schedule] Map \u7F13\u5B58\u5DF2\u540C\u6B65\uFF0C\u5171 ".concat(this.store.map.size, " \u4E2A\u65E5\u7A0B"));
     }
 
     /**
@@ -344,32 +341,31 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
               this.store.map.clear();
               // 同时清空 SQLite 中的数据
               if (!this.dbManager) {
-                _context3.next = 16;
+                _context3.next = 15;
                 break;
               }
               _context3.prev = 4;
               _context3.next = 7;
               return this.dbManager.clear(SCHEDULE_STORE_NAME);
             case 7:
-              console.log('[Schedule] SQLite 缓存已清空');
               this.logInfo('SQLite 缓存已清空');
-              _context3.next = 16;
+              _context3.next = 15;
               break;
-            case 11:
-              _context3.prev = 11;
+            case 10:
+              _context3.prev = 10;
               _context3.t0 = _context3["catch"](4);
               errorMessage = _context3.t0 instanceof Error ? _context3.t0.message : String(_context3.t0);
               console.error('[Schedule] 清空 SQLite 缓存失败:', _context3.t0);
               this.logError('清空 SQLite 缓存失败', {
                 error: errorMessage
               });
-            case 16:
+            case 15:
               this.logInfo('缓存清空完成');
-            case 17:
+            case 16:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[4, 11]]);
+        }, _callee3, this, [[4, 10]]);
       }));
       function clear() {
         return _clear.apply(this, arguments);
@@ -509,14 +505,13 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
                 return _this4.dbManager.add(SCHEDULE_STORE_NAME, schedule);
               }));
             case 20:
-              console.log("[Schedule] \u5DF2\u5C06 ".concat(scheduleList.length, " \u6761\u65E5\u7A0B\u6570\u636E\u4FDD\u5B58\u5230 SQLite"));
               this.logInfo('日程数据已保存到 SQLite', {
                 scheduleCount: scheduleList.length
               });
-              _context5.next = 29;
+              _context5.next = 28;
               break;
-            case 24:
-              _context5.prev = 24;
+            case 23:
+              _context5.prev = 23;
               _context5.t0 = _context5["catch"](4);
               errorMessage = _context5.t0 instanceof Error ? _context5.t0.message : String(_context5.t0);
               console.error('[Schedule] 保存数据到 SQLite 失败:', _context5.t0);
@@ -524,11 +519,11 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
                 scheduleCount: scheduleList.length,
                 error: errorMessage
               });
-            case 29:
+            case 28:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[4, 24]]);
+        }, _callee5, this, [[4, 23]]);
       }));
       function saveScheduleToSQLite(_x3) {
         return _saveScheduleToSQLite.apply(this, arguments);
@@ -548,19 +543,17 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              console.log('[Schedule] 开始预加载数据...');
               startTime = Date.now();
               this.logInfo('开始预加载数据');
-              _context6.prev = 3;
-              _context6.next = 6;
+              _context6.prev = 2;
+              _context6.next = 5;
               return this.loadScheduleFromSQLite();
-            case 6:
+            case 5:
               cachedData = _context6.sent;
               if (!(cachedData && cachedData.length > 0)) {
-                _context6.next = 14;
+                _context6.next = 12;
                 break;
               }
-              console.log("[Schedule] \u4ECE SQLite \u52A0\u8F7D\u4E86 ".concat(cachedData.length, " \u6761\u65E5\u7A0B\u6570\u636E"));
               // 将缓存数据放入 store
               this.store.scheduleList = cloneDeep(cachedData);
               // 同步更新 Map 缓存
@@ -572,23 +565,22 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
                 source: 'SQLite'
               });
               return _context6.abrupt("return");
-            case 14:
-              console.log('[Schedule] SQLite 中没有缓存数据，从服务器加载...');
+            case 12:
               this.logInfo('SQLite 中没有缓存数据，准备从服务器加载');
-              _context6.next = 23;
+              _context6.next = 20;
               break;
-            case 18:
-              _context6.prev = 18;
-              _context6.t0 = _context6["catch"](3);
+            case 15:
+              _context6.prev = 15;
+              _context6.t0 = _context6["catch"](2);
               errorMessage = _context6.t0 instanceof Error ? _context6.t0.message : String(_context6.t0);
               console.warn('[Schedule] 从 SQLite 加载数据失败:', _context6.t0);
               this.logWarning('从 SQLite 加载数据失败，准备从服务器加载', {
                 error: errorMessage
               });
-            case 23:
-              _context6.next = 25;
+            case 20:
+              _context6.next = 22;
               return this.loadAllSchedule();
-            case 25:
+            case 22:
               scheduleList = _context6.sent;
               // 3. 将服务器数据放入 store
               if (scheduleList && scheduleList.length > 0) {
@@ -607,11 +599,11 @@ export var ScheduleModuleEx = /*#__PURE__*/function (_BaseModule) {
                   duration: "".concat(_duration3, "ms")
                 });
               }
-            case 27:
+            case 24:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[3, 18]]);
+        }, _callee6, this, [[2, 15]]);
       }));
       function preload() {
         return _preload.apply(this, arguments);

package/dist/server/utils/product.js

@@ -82,7 +82,6 @@ function buildPriceIndexMap(priceData) {
 export function applyPriceDataToProducts(products, priceData) {
   var t0 = performance.now();
   if (!priceData || priceData.length === 0) {
-    console.log('[applyPriceDataToProducts] 没有价格数据，返回原商品');
     return products;
   }
   var t1 = performance.now();

package/dist/solution/BaseSales/index.js

@@ -370,6 +370,24 @@ function filterPendingPaymentsFromLoadedSalesDetail(sourceRecord) {
   }
   return record;
 }
+
+/**
+ * merge hydrate 不会统一给所有商品补 saved 标记，因此先只标记远端已保存商品。
+ * 当前 tempOrder 中尚未提交的本地商品会在 merge 后继续保持 current item 语义。
+ */
+function markLoadedSalesDetailProductsAsSaved(sourceRecord) {
+  if (!sourceRecord || _typeof(sourceRecord) !== 'object') return sourceRecord;
+  if (!Array.isArray(sourceRecord.products)) return sourceRecord;
+  return _objectSpread(_objectSpread({}, sourceRecord), {}, {
+    products: sourceRecord.products.map(function (product) {
+      return _objectSpread(_objectSpread({}, product || {}), {}, {
+        metadata: _objectSpread(_objectSpread({}, product !== null && product !== void 0 && product.metadata && _typeof(product.metadata) === 'object' ? product.metadata : {}), {}, {
+          is_edit_for_runtime: true
+        })
+      });
+    })
+  });
+}
 export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(BaseSalesImpl, _BaseModule);
   var _super = _createSuper(BaseSalesImpl);
@@ -669,7 +687,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hydrateLatestLoadedSalesDetail",
     value: function () {
-      var _hydrateLatestLoadedSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(record, loadSequence, hydrateSource) {
+      var _hydrateLatestLoadedSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(record, loadSequence, options) {
         var _this4 = this;
         var hydratedSales, skippedBeforeHydrate, hydrateTask, queuedTask;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -679,7 +697,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               skippedBeforeHydrate = false;
               hydrateTask = /*#__PURE__*/function () {
                 var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-                  var sales;
+                  var hydrateOptions, sales;
                   return _regeneratorRuntime().wrap(function _callee4$(_context4) {
                     while (1) switch (_context4.prev = _context4.next) {
                       case 0:
@@ -696,30 +714,39 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                         }
                         throw new Error('order 模块未初始化');
                       case 5:
-                        _context4.next = 7;
-                        return _this4.store.order.hydrateTempOrderFromRecord(record, hydrateSource === 'sessionStorage' ? {
-                          recalcOnHydrate: true,
-                          source: 'sessionStorage'
-                        } : {
+                        hydrateOptions = {
                           recalcOnHydrate: false
-                        });
-                      case 7:
+                        };
+                        if ((options === null || options === void 0 ? void 0 : options.hydrateSource) === 'sessionStorage') {
+                          hydrateOptions = {
+                            recalcOnHydrate: true,
+                            source: 'sessionStorage'
+                          };
+                        } else if (options !== null && options !== void 0 && options.merge) {
+                          hydrateOptions = {
+                            recalcOnHydrate: true,
+                            source: 'mergedSalesDetail'
+                          };
+                        }
+                        _context4.next = 9;
+                        return _this4.store.order.hydrateTempOrderFromRecord(record, hydrateOptions);
+                      case 9:
                         sales = _context4.sent;
                         hydratedSales = sales;
 
                         // hydrate 期间可能又发起了更新请求；后续任务已串行排队，将负责最终状态。
                         if (!(loadSequence !== _this4.salesDetailLoadSequence)) {
-                          _context4.next = 11;
+                          _context4.next = 13;
                           break;
                         }
                         return _context4.abrupt("return");
-                      case 11:
+                      case 13:
                         _this4.currentSalesDetail = sales;
-                        _context4.next = 14;
+                        _context4.next = 16;
                         return _this4.core.effects.emit("".concat(_this4.name, ":onSalesOrderLoaded"), {
                           sales: sales
                         });
-                      case 14:
+                      case 16:
                       case "end":
                         return _context4.stop();
                     }
@@ -1534,7 +1561,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadSalesDetail",
     value: (function () {
       var _loadSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(orderIdOrParams) {
-        var loadSequence, _ref27, _ref28, _ref29, _ref30, _params$orderId, params, externalSaleNumber, preloadedSalesDetail, lookup, loadedRecord, message, loadedSalesDetail, shouldFilterPendingPayments, remoteRecord, currentTempOrder, mergedRecord, record;
+        var loadSequence, _ref27, _ref28, _ref29, _ref30, _params$orderId, params, externalSaleNumber, preloadedSalesDetail, lookup, loadedRecord, message, loadedSalesDetail, shouldFilterPendingPayments, remoteRecord, mergeSourceRecord, currentTempOrder, mergedRecord, record;
         return _regeneratorRuntime().wrap(function _callee14$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
             case 0:
@@ -1586,39 +1613,43 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               loadedSalesDetail = preloadedSalesDetail !== null && preloadedSalesDetail !== void 0 ? preloadedSalesDetail : loadedRecord.data; // payment_pending 只存在于本地；远端详情需过滤，但会话快照必须完整恢复。
               shouldFilterPendingPayments = params.hydrateSource !== 'sessionStorage';
               remoteRecord = shouldFilterPendingPayments ? filterPendingPaymentsFromLoadedSalesDetail(loadedSalesDetail) : loadedSalesDetail;
+              mergeSourceRecord = params.merge ? markLoadedSalesDetailProductsAsSaved(remoteRecord) : remoteRecord;
               currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
-              mergedRecord = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, remoteRecord, 'preserve-local') : remoteRecord;
+              mergedRecord = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, mergeSourceRecord, 'preserve-local') : mergeSourceRecord;
               record = shouldFilterPendingPayments ? filterPendingPaymentsFromLoadedSalesDetail(mergedRecord) : mergedRecord;
-              _context14.next = 30;
-              return this.hydrateLatestLoadedSalesDetail(record, loadSequence, params.hydrateSource);
-            case 30:
-              return _context14.abrupt("return", _context14.sent);
+              _context14.next = 31;
+              return this.hydrateLatestLoadedSalesDetail(record, loadSequence, {
+                hydrateSource: params.hydrateSource,
+                merge: params.merge
+              });
             case 31:
-              _context14.prev = 31;
+              return _context14.abrupt("return", _context14.sent);
+            case 32:
+              _context14.prev = 32;
               this.salesDetailLoadInFlightCount = Math.max(0, this.salesDetailLoadInFlightCount - 1);
               if (!(this.salesDetailLoadInFlightCount === 0)) {
-                _context14.next = 42;
+                _context14.next = 43;
                 break;
               }
-              _context14.prev = 34;
-              _context14.next = 37;
+              _context14.prev = 35;
+              _context14.next = 38;
               return this.drainQueuedServerOrderChanges();
-            case 37:
-              _context14.next = 42;
+            case 38:
+              _context14.next = 43;
               break;
-            case 39:
-              _context14.prev = 39;
-              _context14.t1 = _context14["catch"](34);
+            case 40:
+              _context14.prev = 40;
+              _context14.t1 = _context14["catch"](35);
               this.logError('drain queued server order changes failed', {
                 error: _context14.t1 instanceof Error ? _context14.t1.message : String(_context14.t1)
               });
-            case 42:
-              return _context14.finish(31);
             case 43:
+              return _context14.finish(32);
+            case 44:
             case "end":
               return _context14.stop();
           }
-        }, _callee14, this, [[4,, 31, 43], [34, 39]]);
+        }, _callee14, this, [[4,, 32, 44], [35, 40]]);
       }));
       function loadSalesDetail(_x13) {
         return _loadSalesDetail.apply(this, arguments);
@@ -2272,11 +2303,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 40:
               if (!rulesModule) {
-                _context21.next = 77;
+                _context21.next = 76;
                 break;
               }
               orderTotalAmount = Number(((_orderStore$summary = orderStore.summary) === null || _orderStore$summary === void 0 ? void 0 : _orderStore$summary.total_amount) || 0);
-              console.log('[BaseSales.applyDiscountConfig.calcDiscount]');
               result = rulesModule.calcDiscount({
                 productList: tempOrder.products,
                 discountList: nextDiscountList,
@@ -2293,22 +2323,22 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               _iterator2 = _createForOfIteratorHelper(tempOrder.products || []);
-              _context21.prev = 46;
+              _context21.prev = 45;
               _iterator2.s();
-            case 48:
+            case 47:
               if ((_step2 = _iterator2.n()).done) {
-                _context21.next = 63;
+                _context21.next = 62;
                 break;
               }
               product = _step2.value;
               productUid = (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number;
               runtimeOrigin = productUid ? (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3[productUid]) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.origin : undefined;
               if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || isBaseSalesManualProductDiscountProduct(product))) {
-                _context21.next = 54;
+                _context21.next = 53;
                 break;
               }
-              return _context21.abrupt("continue", 61);
-            case 54:
+              return _context21.abrupt("continue", 60);
+            case 53:
               totalPerUnitDiscount = (product.discount_list || []).reduce(function (sum, pd) {
                 return sum + Number(pd.amount || 0);
               }, 0);
@@ -2324,59 +2354,59 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 mainPrice: newMainSellingPrice,
                 bundle: product.product_bundle
               });
-            case 61:
-              _context21.next = 48;
+            case 60:
+              _context21.next = 47;
               break;
-            case 63:
-              _context21.next = 68;
+            case 62:
+              _context21.next = 67;
               break;
-            case 65:
-              _context21.prev = 65;
-              _context21.t0 = _context21["catch"](46);
+            case 64:
+              _context21.prev = 64;
+              _context21.t0 = _context21["catch"](45);
               _iterator2.e(_context21.t0);
-            case 68:
-              _context21.prev = 68;
+            case 67:
+              _context21.prev = 67;
               _iterator2.f();
-              return _context21.finish(68);
-            case 71:
+              return _context21.finish(67);
+            case 70:
               if (!result.discountList) {
-                _context21.next = 77;
+                _context21.next = 76;
                 break;
               }
               nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context21.next = 76;
+              _context21.next = 75;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 76:
+            case 75:
               tempOrder.discount_list = nextDiscountList.filter(function (discount) {
                 return discount.isSelected;
               });
-            case 77:
-              _context21.next = 79;
+            case 76:
+              _context21.next = 78;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 79:
+            case 78:
               summary = _context21.sent;
               this.store.order.persistTempOrder();
-              _context21.next = 83;
+              _context21.next = 82;
               return this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList,
                 selectedDiscountList: tempOrder.discount_list || [],
                 tempOrder: tempOrder
               });
-            case 83:
+            case 82:
               return _context21.abrupt("return", {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList,
                 availableWalletIds: this.getAvailableWalletIds()
               });
-            case 84:
+            case 83:
             case "end":
               return _context21.stop();
           }
-        }, _callee21, this, [[46, 65, 68, 71]]);
+        }, _callee21, this, [[45, 64, 67, 70]]);
       }));
       function loadDiscountConfig(_x16) {
         return _loadDiscountConfig.apply(this, arguments);
@@ -2420,11 +2450,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
             case 12:
               if (!rulesModule) {
-                _context22.next = 24;
+                _context22.next = 23;
                 break;
               }
               orderTotalAmount = Number(((_orderStore$summary2 = orderStore.summary) === null || _orderStore$summary2 === void 0 ? void 0 : _orderStore$summary2.total_amount) || 0);
-              console.log('[BaseSales.bestDiscount.calcDiscount]');
               result = rulesModule.calcDiscount({
                 productList: tempOrder.products,
                 discountList: nextDiscountList,
@@ -2438,14 +2467,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               if (!result.discountList) {
-                _context22.next = 24;
+                _context22.next = 23;
                 break;
               }
               nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context22.next = 22;
+              _context22.next = 21;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 22:
+            case 21:
               tempOrder.discount_list = nextDiscountList.filter(function (discount) {
                 return discount.isSelected;
               });
@@ -2453,24 +2482,24 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: tempOrder.products,
                 discountList: nextDiscountList
               };
-            case 24:
-              _context22.next = 26;
+            case 23:
+              _context22.next = 25;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 26:
+            case 25:
               this.store.order.persistTempOrder();
-              _context22.next = 29;
+              _context22.next = 28;
               return this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList,
                 selectedDiscountList: tempOrder.discount_list || [],
                 tempOrder: tempOrder
               });
-            case 29:
+            case 28:
               cb === null || cb === void 0 || cb(result);
               return _context22.abrupt("return", result);
-            case 31:
+            case 30:
             case "end":
               return _context22.stop();
           }
@@ -2639,7 +2668,6 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 13:
               if (rulesModule) {
                 orderTotalAmount = Number(((_orderStore$summary3 = orderStore.summary) === null || _orderStore$summary3 === void 0 ? void 0 : _orderStore$summary3.total_amount) || 0);
-                console.log('[BaseSales.setDiscountSelected.calcDiscount]');
                 result = rulesModule.calcDiscount({
                   productList: tempOrder.products,
                   discountList: updated,

package/dist/solution/BaseSales/utils/cartPromotion.d.ts

@@ -1,4 +1,9 @@
 import type { OrderProduct } from '../../../modules/Order/types';
+/**
+ * 运行态商品行标记：该行由“不合并商品”加车策略创建，促销重算时必须保持独立。
+ * `normalizeSubmitProduct` 会按白名单裁剪 metadata，不会把此字段提交到后端。
+ */
+export declare const PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY = "_productLineMergeDisabled";
 /**
  * Cart promotion 工具集（OS 内部纯函数）
  *

package/dist/solution/BaseSales/utils/cartPromotion.js

@@ -23,6 +23,12 @@ import { cloneDeep } from 'lodash-es';
 import { composeLinePrice, createUuidV4, getProductSkuOptions, sumOptionUnitPrice } from "../../../modules/Order/utils";
 import { buildProductLineFingerprint, getSafeProductNum } from "../../ScanOrder/utils";
 
+/**
+ * 运行态商品行标记：该行由“不合并商品”加车策略创建，促销重算时必须保持独立。
+ * `normalizeSubmitProduct` 会按白名单裁剪 metadata，不会把此字段提交到后端。
+ */
+export var PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY = '_productLineMergeDisabled';
+
 /**
  * Cart promotion 工具集（OS 内部纯函数）
  *
@@ -483,10 +489,13 @@ function hasGoodPassDiscount(product) {
 }
 
 /**
- * 商品券、自定义商品、称重行以及编辑订单历史行都有各自的促销合并边界。
+ * 不合并商品、商品券、自定义商品、称重行以及编辑订单历史行都有各自的促销合并边界。
  */
 function getPromotionLineMergeBoundary(product) {
-  var _product$product_sku, _product$metadata3;
+  var _product$metadata3, _product$product_sku, _product$metadata4;
+  if ((product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3[PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY]) === true) {
+    return "separate:".concat(getOrderProductUid(product));
+  }
   if ((product === null || product === void 0 ? void 0 : product.product_id) === undefined || (product === null || product === void 0 ? void 0 : product.product_id) === null) {
     return "custom:".concat(getOrderProductUid(product));
   }
@@ -496,7 +505,7 @@ function getPromotionLineMergeBoundary(product) {
   if (Number((product === null || product === void 0 || (_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.open_sold_weight) || 0) === 1) {
     return "weighing:".concat(getOrderProductUid(product));
   }
-  if ((product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.is_edit_for_runtime) !== true) return '';
+  if ((product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.is_edit_for_runtime) !== true) return '';
   return "edit:".concat(getOrderProductUid(product));
 }
 function isPersistedGeneratedVoucher(product) {
@@ -921,13 +930,13 @@ export function resolveStrategyEligibleProducts(matched) {
 export function calculateUnfulfilledPromotions(processedProducts, applicableStrategiesResult, mainProducts) {
   var unfulfilledMap = new Map();
   var _loop2 = function _loop2() {
-      var _product$metadata4, _ref13, _product$_originalPro, _product$metadata5, _product$num2;
+      var _product$metadata5, _ref13, _product$_originalPro, _product$metadata6, _product$num2;
       var product = processedProducts[i];
-      var promotion = product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4._promotion;
+      var promotion = product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5._promotion;
       if (!promotion || promotion.inPromotion !== false) return 0; // continue
       var strategyId = promotion.strategyId;
       if (!strategyId) return 0; // continue
-      var lookupUid = String((_ref13 = (_product$_originalPro = product === null || product === void 0 ? void 0 : product._originalProductUid) !== null && _product$_originalPro !== void 0 ? _product$_originalPro : product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number) !== null && _ref13 !== void 0 ? _ref13 : '');
+      var lookupUid = String((_ref13 = (_product$_originalPro = product === null || product === void 0 ? void 0 : product._originalProductUid) !== null && _product$_originalPro !== void 0 ? _product$_originalPro : product === null || product === void 0 || (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.unique_identification_number) !== null && _ref13 !== void 0 ? _ref13 : '');
       var originalIndex = mainProducts.findIndex(function (item) {
         return getOrderProductUid(item) === lookupUid;
       });