@pisell/pisellos 2.3.67 → 2.3.68

package/dist/solution/BaseSales/index.js

@@ -669,7 +669,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hydrateLatestLoadedSalesDetail",
     value: function () {
-      var _hydrateLatestLoadedSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(record, loadSequence) {
+      var _hydrateLatestLoadedSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(record, loadSequence, hydrateSource) {
         var _this4 = this;
         var hydratedSales, skippedBeforeHydrate, hydrateTask, queuedTask;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -697,7 +697,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                         throw new Error('order 模块未初始化');
                       case 5:
                         _context4.next = 7;
-                        return _this4.store.order.hydrateTempOrderFromRecord(record, {
+                        return _this4.store.order.hydrateTempOrderFromRecord(record, hydrateSource === 'sessionStorage' ? {
+                          recalcOnHydrate: true,
+                          source: 'sessionStorage'
+                        } : {
                           recalcOnHydrate: false
                         });
                       case 7:
@@ -748,7 +751,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee5, this);
       }));
-      function hydrateLatestLoadedSalesDetail(_x2, _x3) {
+      function hydrateLatestLoadedSalesDetail(_x2, _x3, _x4) {
         return _hydrateLatestLoadedSalesDetail.apply(this, arguments);
       }
       return hydrateLatestLoadedSalesDetail;
@@ -851,7 +854,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee6, this);
       }));
-      function loadQuotationForPriceQuery(_x4) {
+      function loadQuotationForPriceQuery(_x5) {
         return _loadQuotationForPriceQuery.apply(this, arguments);
       }
       return loadQuotationForPriceQuery;
@@ -994,7 +997,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee7, this, [[6, 17]]);
       }));
-      function loadProductsForPriceQuery(_x5) {
+      function loadProductsForPriceQuery(_x6) {
         return _loadProductsForPriceQuery.apply(this, arguments);
       }
       return loadProductsForPriceQuery;
@@ -1032,7 +1035,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee8, this);
       }));
-      function loadProductForPriceQuery(_x6, _x7) {
+      function loadProductForPriceQuery(_x7, _x8) {
         return _loadProductForPriceQuery.apply(this, arguments);
       }
       return loadProductForPriceQuery;
@@ -1170,13 +1173,23 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
      * const params = this.buildSubModuleOtherParams();
      * this.core.registerModule(orderModule, { otherParams: params });
      */
+  }, {
+    key: "isSessionStoragePersistEnabled",
+    value: function isSessionStoragePersistEnabled() {
+      return Boolean(this.cacheId);
+    }
+  }, {
+    key: "shouldUseSessionStorageForSubModule",
+    value: function shouldUseSessionStorageForSubModule(_moduleName) {
+      return this.isSessionStoragePersistEnabled();
+    }
   }, {
     key: "buildSubModuleOtherParams",
-    value: function buildSubModuleOtherParams() {
+    value: function buildSubModuleOtherParams(moduleName) {
       return _objectSpread(_objectSpread({}, this.otherParams), {}, {
         salesSummaryModuleName: "".concat(this.name, "_salesSummary"),
         fatherModule: this.name,
-        openCache: this.cacheId ? true : false,
+        openCache: this.shouldUseSessionStorageForSubModule(moduleName),
         cacheId: this.cacheId
       });
     }
@@ -1195,17 +1208,15 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         var _ref23,
           _ref23$cover,
           cover,
-          nextSubModuleOtherParams,
           _args10 = arguments;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
               _ref23 = _args10.length > 1 && _args10[1] !== undefined ? _args10[1] : {}, _ref23$cover = _ref23.cover, cover = _ref23$cover === void 0 ? false : _ref23$cover;
-              nextSubModuleOtherParams = this.buildSubModuleOtherParams();
-              _context10.next = 4;
+              _context10.next = 3;
               return Promise.all(Object.entries(this.store).map( /*#__PURE__*/function () {
                 var _ref25 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(_ref24) {
-                  var _ref26, moduleName, subModule, targetModule;
+                  var _ref26, moduleName, subModule, targetModule, nextSubModuleOtherParams;
                   return _regeneratorRuntime().wrap(function _callee9$(_context9) {
                     while (1) switch (_context9.prev = _context9.next) {
                       case 0:
@@ -1223,28 +1234,29 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                         }
                         return _context9.abrupt("return");
                       case 6:
-                        _context9.next = 8;
+                        nextSubModuleOtherParams = _this6.buildSubModuleOtherParams(moduleName);
+                        _context9.next = 9;
                         return targetModule.updateOtherParams(nextSubModuleOtherParams, {
                           changedParams: changedParams,
                           cover: cover
                         });
-                      case 8:
+                      case 9:
                       case "end":
                         return _context9.stop();
                     }
                   }, _callee9);
                 }));
-                return function (_x9) {
+                return function (_x10) {
                   return _ref25.apply(this, arguments);
                 };
               }()));
-            case 4:
+            case 3:
             case "end":
               return _context10.stop();
           }
         }, _callee10, this);
       }));
-      function syncOtherParamsToSubModules(_x8) {
+      function syncOtherParamsToSubModules(_x9) {
         return _syncOtherParamsToSubModules.apply(this, arguments);
       }
       return syncOtherParamsToSubModules;
@@ -1257,12 +1269,15 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "readSessionCacheData",
     value: function readSessionCacheData() {
-      if (!this.cacheId || !this.window) return {};
+      var cacheId = this.cacheId;
+      if (!cacheId || !this.isSessionStoragePersistEnabled() || !this.window) {
+        return {};
+      }
       try {
         var sessionData = this.window.sessionStorage.getItem(this.name);
         if (!sessionData) return {};
         var data = JSON.parse(sessionData);
-        return data && data[this.cacheId] || {};
+        return data && data[cacheId] || {};
       } catch (_unused3) {
         return {};
       }
@@ -1398,11 +1413,11 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 var hooks = _this9.getSubModuleHooks(step);
                 _this9.store[step] = targetModule;
                 _this9.core.registerModule(targetModule, _objectSpread(_objectSpread({
-                  initialState: (targetCacheData === null || targetCacheData === void 0 ? void 0 : targetCacheData[targetModule.name]) || {}
+                  initialState: _this9.shouldUseSessionStorageForSubModule(step) ? (targetCacheData === null || targetCacheData === void 0 ? void 0 : targetCacheData[targetModule.name]) || {} : {}
                 }, hooks ? {
                   hooks: hooks
                 } : {}), {}, {
-                  otherParams: _this9.buildSubModuleOtherParams()
+                  otherParams: _this9.buildSubModuleOtherParams(step)
                 }));
               });
               if (!(this.store.schedule && !this.isScheduleListLoaded(this.store.schedule))) {
@@ -1426,7 +1441,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee11, this);
       }));
-      function initialize(_x10) {
+      function initialize(_x11) {
         return _initialize.apply(this, arguments);
       }
       return initialize;
@@ -1484,7 +1499,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadSalesDetail",
     value: (function () {
       var _loadSalesDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderIdOrParams) {
-        var loadSequence, _ref27, _ref28, _ref29, _ref30, _params$orderId, params, externalSaleNumber, preloadedSalesDetail, lookup, loadedRecord, message, remoteRecord, currentTempOrder, mergedRecord, record;
+        var loadSequence, _ref27, _ref28, _ref29, _ref30, _params$orderId, params, externalSaleNumber, preloadedSalesDetail, lookup, loadedRecord, message, loadedSalesDetail, shouldFilterPendingPayments, remoteRecord, currentTempOrder, mergedRecord, record;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -1533,42 +1548,44 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || "\u52A0\u8F7D\u9500\u552E\u8BE6\u60C5\u5931\u8D25: ".concat(lookup);
               throw new Error(message);
             case 22:
-              remoteRecord = filterPendingPaymentsFromLoadedSalesDetail(preloadedSalesDetail !== null && preloadedSalesDetail !== void 0 ? preloadedSalesDetail : loadedRecord.data);
+              loadedSalesDetail = preloadedSalesDetail !== null && preloadedSalesDetail !== void 0 ? preloadedSalesDetail : loadedRecord.data; // payment_pending 只存在于本地；远端详情需过滤，但会话快照必须完整恢复。
+              shouldFilterPendingPayments = params.hydrateSource !== 'sessionStorage';
+              remoteRecord = shouldFilterPendingPayments ? filterPendingPaymentsFromLoadedSalesDetail(loadedSalesDetail) : loadedSalesDetail;
               currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
               mergedRecord = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, remoteRecord, 'preserve-local') : remoteRecord;
-              record = filterPendingPaymentsFromLoadedSalesDetail(mergedRecord);
-              _context13.next = 28;
-              return this.hydrateLatestLoadedSalesDetail(record, loadSequence);
-            case 28:
+              record = shouldFilterPendingPayments ? filterPendingPaymentsFromLoadedSalesDetail(mergedRecord) : mergedRecord;
+              _context13.next = 30;
+              return this.hydrateLatestLoadedSalesDetail(record, loadSequence, params.hydrateSource);
+            case 30:
               return _context13.abrupt("return", _context13.sent);
-            case 29:
-              _context13.prev = 29;
+            case 31:
+              _context13.prev = 31;
               this.salesDetailLoadInFlightCount = Math.max(0, this.salesDetailLoadInFlightCount - 1);
               if (!(this.salesDetailLoadInFlightCount === 0)) {
-                _context13.next = 40;
+                _context13.next = 42;
                 break;
               }
-              _context13.prev = 32;
-              _context13.next = 35;
+              _context13.prev = 34;
+              _context13.next = 37;
               return this.drainQueuedServerOrderChanges();
-            case 35:
-              _context13.next = 40;
-              break;
             case 37:
-              _context13.prev = 37;
-              _context13.t1 = _context13["catch"](32);
+              _context13.next = 42;
+              break;
+            case 39:
+              _context13.prev = 39;
+              _context13.t1 = _context13["catch"](34);
               this.logError('drain queued server order changes failed', {
                 error: _context13.t1 instanceof Error ? _context13.t1.message : String(_context13.t1)
               });
-            case 40:
-              return _context13.finish(29);
-            case 41:
+            case 42:
+              return _context13.finish(31);
+            case 43:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[4,, 29, 41], [32, 37]]);
+        }, _callee13, this, [[4,, 31, 43], [34, 39]]);
       }));
-      function loadSalesDetail(_x11) {
+      function loadSalesDetail(_x12) {
         return _loadSalesDetail.apply(this, arguments);
       }
       return loadSalesDetail;
@@ -1675,7 +1692,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee14, this);
       }));
-      function replaceTempOrder(_x12, _x13) {
+      function replaceTempOrder(_x13, _x14) {
         return _replaceTempOrder.apply(this, arguments);
       }
       return replaceTempOrder;
@@ -2315,7 +2332,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee20, this, [[46, 65, 68, 71]]);
       }));
-      function loadDiscountConfig(_x14) {
+      function loadDiscountConfig(_x15) {
         return _loadDiscountConfig.apply(this, arguments);
       }
       return loadDiscountConfig;
@@ -2413,7 +2430,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee21, this);
       }));
-      function bestDiscount(_x15) {
+      function bestDiscount(_x16) {
         return _bestDiscount.apply(this, arguments);
       }
       return bestDiscount;
@@ -2476,7 +2493,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee22, this);
       }));
-      function replaceDiscountStoreLists(_x16) {
+      function replaceDiscountStoreLists(_x17) {
         return _replaceDiscountStoreLists.apply(this, arguments);
       }
       return replaceDiscountStoreLists;
@@ -2538,7 +2555,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee23, this, [[0, 16]]);
       }));
-      function scanPromotionCode(_x17, _x18) {
+      function scanPromotionCode(_x18, _x19) {
         return _scanPromotionCode.apply(this, arguments);
       }
       return scanPromotionCode;
@@ -2729,7 +2746,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee24, this, [[0, 54], [17, 38, 41, 44]]);
       }));
-      function setDiscountSelected(_x19) {
+      function setDiscountSelected(_x20) {
         return _setDiscountSelected.apply(this, arguments);
       }
       return setDiscountSelected;
@@ -2799,7 +2816,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee25, this, [[0, 21]]);
       }));
-      function applyDiscountCalculationResult(_x20) {
+      function applyDiscountCalculationResult(_x21) {
         return _applyDiscountCalculationResult.apply(this, arguments);
       }
       return applyDiscountCalculationResult;
@@ -2818,7 +2835,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee26, this);
       }));
-      function submitScanOrder(_x21) {
+      function submitScanOrder(_x22) {
         return _submitScanOrder.apply(this, arguments);
       }
       return submitScanOrder;
@@ -2872,7 +2889,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee27, this);
       }));
-      function submitSalesOrder(_x22) {
+      function submitSalesOrder(_x23) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -2906,7 +2923,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee28, this);
       }));
-      function saveSalesOrderDraft(_x23) {
+      function saveSalesOrderDraft(_x24) {
         return _saveSalesOrderDraft.apply(this, arguments);
       }
       return saveSalesOrderDraft;
@@ -2953,7 +2970,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee29, this);
       }));
-      function submitTempOrderAsync(_x24) {
+      function submitTempOrderAsync(_x25) {
         return _submitTempOrderAsync.apply(this, arguments);
       }
       return submitTempOrderAsync;
@@ -3038,7 +3055,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee30, this);
       }));
-      function printLocalOrderReceipt(_x25) {
+      function printLocalOrderReceipt(_x26) {
         return _printLocalOrderReceipt.apply(this, arguments);
       }
       return printLocalOrderReceipt;
@@ -3152,7 +3169,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee31, this, [[12, 29]]);
       }));
-      function syncPaymentsToOrder(_x26) {
+      function syncPaymentsToOrder(_x27) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -3322,7 +3339,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee33, this);
       }));
-      function addOrderPaymentAsync(_x27) {
+      function addOrderPaymentAsync(_x28) {
         return _addOrderPaymentAsync.apply(this, arguments);
       }
       return addOrderPaymentAsync;
@@ -3510,7 +3527,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee34, this, [[17, 23]]);
       }));
-      function updateOrderPayment(_x28, _x29) {
+      function updateOrderPayment(_x29, _x30) {
         return _updateOrderPayment.apply(this, arguments);
       }
       return updateOrderPayment;
@@ -3549,7 +3566,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee35, this);
       }));
-      function updateVoucherOrderPaymentsAsync(_x30, _x31) {
+      function updateVoucherOrderPaymentsAsync(_x31, _x32) {
         return _updateVoucherOrderPaymentsAsync.apply(this, arguments);
       }
       return updateVoucherOrderPaymentsAsync;
@@ -3715,7 +3732,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee36, this);
       }));
-      function initWalletData(_x32) {
+      function initWalletData(_x33) {
         return _initWalletData.apply(this, arguments);
       }
       return initWalletData;
@@ -3782,7 +3799,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee37, this);
       }));
-      function publishWalletAssetsState(_x33) {
+      function publishWalletAssetsState(_x34) {
         return _publishWalletAssetsState.apply(this, arguments);
       }
       return publishWalletAssetsState;
@@ -3863,7 +3880,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee38, this);
       }));
-      function syncSelectedWalletAssets(_x34) {
+      function syncSelectedWalletAssets(_x35) {
         return _syncSelectedWalletAssets.apply(this, arguments);
       }
       return syncSelectedWalletAssets;
@@ -3919,7 +3936,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee39, this);
       }));
-      function importWalletAssetsSnapshot(_x35) {
+      function importWalletAssetsSnapshot(_x36) {
         return _importWalletAssetsSnapshot.apply(this, arguments);
       }
       return importWalletAssetsSnapshot;
@@ -4007,7 +4024,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee40, this);
       }));
-      function refreshWalletAssets(_x36) {
+      function refreshWalletAssets(_x37) {
         return _refreshWalletAssets.apply(this, arguments);
       }
       return refreshWalletAssets;
@@ -4040,7 +4057,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee41, this);
       }));
-      function selectWalletAsset(_x37) {
+      function selectWalletAsset(_x38) {
         return _selectWalletAsset.apply(this, arguments);
       }
       return selectWalletAsset;
@@ -4070,7 +4087,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee42, this);
       }));
-      function updateWalletAssetAmount(_x38) {
+      function updateWalletAssetAmount(_x39) {
         return _updateWalletAssetAmount.apply(this, arguments);
       }
       return updateWalletAssetAmount;
@@ -4115,7 +4132,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee43, this);
       }));
-      function scanWalletAsset(_x39) {
+      function scanWalletAsset(_x40) {
         return _scanWalletAsset.apply(this, arguments);
       }
       return scanWalletAsset;
@@ -4544,7 +4561,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee48, this, [[29, 43]]);
       }));
-      function payCash(_x40) {
+      function payCash(_x41) {
         return _payCash.apply(this, arguments);
       }
       return payCash;
@@ -4706,7 +4723,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee49, this, [[30, 44]]);
       }));
-      function commitPaymentMethodPayment(_x41) {
+      function commitPaymentMethodPayment(_x42) {
         return _commitPaymentMethodPayment.apply(this, arguments);
       }
       return commitPaymentMethodPayment;
@@ -4754,7 +4771,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee50, this);
       }));
-      function roundAmount(_x42) {
+      function roundAmount(_x43) {
         return _roundAmount.apply(this, arguments);
       }
       return roundAmount;
@@ -4811,7 +4828,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee51, this);
       }));
-      function sendCustomerPayLink(_x43) {
+      function sendCustomerPayLink(_x44) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -4856,7 +4873,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee52, this);
       }));
-      function calculateProductBookingPrice(_x44) {
+      function calculateProductBookingPrice(_x45) {
         return _calculateProductBookingPrice.apply(this, arguments);
       }
       return calculateProductBookingPrice;
@@ -4985,7 +5002,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                     }
                   }, _callee53);
                 }));
-                return function (_x46) {
+                return function (_x47) {
                   return _ref40.apply(this, arguments);
                 };
               }()));
@@ -5019,7 +5036,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee54, this);
       }));
-      function calculateProductBookingPrices(_x45) {
+      function calculateProductBookingPrices(_x46) {
         return _calculateProductBookingPrices.apply(this, arguments);
       }
       return calculateProductBookingPrices;
@@ -5054,7 +5071,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee55, this, [[0, 9]]);
       }));
-      function addProductToOrder(_x47, _x48, _x49) {
+      function addProductToOrder(_x48, _x49, _x50) {
         return _addProductToOrder.apply(this, arguments);
       }
       return addProductToOrder;
@@ -5089,7 +5106,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee56, this, [[0, 9]]);
       }));
-      function updateOrderProduct(_x50) {
+      function updateOrderProduct(_x51) {
         return _updateOrderProduct.apply(this, arguments);
       }
       return updateOrderProduct;
@@ -5124,7 +5141,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee57, this, [[0, 9]]);
       }));
-      function updateOrderProducts(_x51) {
+      function updateOrderProducts(_x52) {
         return _updateOrderProducts.apply(this, arguments);
       }
       return updateOrderProducts;
@@ -5159,7 +5176,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee58, this, [[0, 9]]);
       }));
-      function updateOrderProductQuantity(_x52) {
+      function updateOrderProductQuantity(_x53) {
         return _updateOrderProductQuantity.apply(this, arguments);
       }
       return updateOrderProductQuantity;
@@ -5217,7 +5234,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee59, this, [[0, 11]]);
       }));
-      function setOrderProductLineNote(_x53, _x54) {
+      function setOrderProductLineNote(_x54, _x55) {
         return _setOrderProductLineNote.apply(this, arguments);
       }
       return setOrderProductLineNote;
@@ -5257,7 +5274,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee60, this, [[0, 8]]);
       }));
-      function removeProductsFromOrder(_x55, _x56) {
+      function removeProductsFromOrder(_x56, _x57) {
         return _removeProductsFromOrder.apply(this, arguments);
       }
       return removeProductsFromOrder;
@@ -5276,7 +5293,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee61, this);
       }));
-      function removeProductFromOrder(_x57, _x58) {
+      function removeProductFromOrder(_x58, _x59) {
         return _removeProductFromOrder.apply(this, arguments);
       }
       return removeProductFromOrder;
@@ -5439,7 +5456,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee64, this);
       }));
-      function setOtherParams(_x59) {
+      function setOtherParams(_x60) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;

package/dist/solution/BaseSales/utils.js

@@ -37,35 +37,46 @@ export function createEmptySummary() {
  * 数组元素先按主键排序再序列化，避免顺序差异导致误判为不同行。
  */
 export function buildProductLineFingerprint(productOptionItem, productBundle) {
-  var optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
-  var normalizedOpts = optArr.map(function (item) {
-    var _ref, _item$add_price;
-    return {
-      option_group_item_id: Number(item === null || item === void 0 ? void 0 : item.option_group_item_id) || 0,
-      option_group_id: Number(item === null || item === void 0 ? void 0 : item.option_group_id) || 0,
-      num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-      price: String((_ref = (_item$add_price = item === null || item === void 0 ? void 0 : item.add_price) !== null && _item$add_price !== void 0 ? _item$add_price : item === null || item === void 0 ? void 0 : item.price) !== null && _ref !== void 0 ? _ref : '')
-    };
-  }).sort(function (p, q) {
-    if (p.option_group_item_id !== q.option_group_item_id) {
-      return p.option_group_item_id - q.option_group_item_id;
-    }
-    if (p.option_group_id !== q.option_group_id) return p.option_group_id - q.option_group_id;
-    if (p.num !== q.num) return p.num - q.num;
-    return p.price.localeCompare(q.price);
-  });
+  var normalizeOptions = function normalizeOptions(options) {
+    var optionArr = Array.isArray(options) ? options : [];
+    return optionArr.map(function (item) {
+      var _ref, _item$add_price;
+      return {
+        option_group_item_id: Number(item === null || item === void 0 ? void 0 : item.option_group_item_id) || 0,
+        option_group_id: Number(item === null || item === void 0 ? void 0 : item.option_group_id) || 0,
+        num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+        price: String((_ref = (_item$add_price = item === null || item === void 0 ? void 0 : item.add_price) !== null && _item$add_price !== void 0 ? _item$add_price : item === null || item === void 0 ? void 0 : item.price) !== null && _ref !== void 0 ? _ref : '')
+      };
+    }).sort(function (p, q) {
+      if (p.option_group_item_id !== q.option_group_item_id) {
+        return p.option_group_item_id - q.option_group_item_id;
+      }
+      if (p.option_group_id !== q.option_group_id) {
+        return p.option_group_id - q.option_group_id;
+      }
+      if (p.num !== q.num) return p.num - q.num;
+      return p.price.localeCompare(q.price);
+    });
+  };
+  var normalizedOpts = normalizeOptions(productOptionItem);
   var bundleArr = Array.isArray(productBundle) ? productBundle : [];
   var normalizedBundles = bundleArr.map(function (item) {
-    var _ref2, _item$bundle_id;
+    var _ref2, _item$bundle_id, _item$bundle_variant_;
     return {
       bundle_id: Number((_ref2 = (_item$bundle_id = item === null || item === void 0 ? void 0 : item.bundle_id) !== null && _item$bundle_id !== void 0 ? _item$bundle_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref2 !== void 0 ? _ref2 : 0) || 0,
       product_id: Number(item === null || item === void 0 ? void 0 : item.product_id) || 0,
-      num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1
+      product_variant_id: Number((_item$bundle_variant_ = item === null || item === void 0 ? void 0 : item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item === null || item === void 0 ? void 0 : item.product_variant_id) || 0,
+      num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+      option: normalizeOptions(item === null || item === void 0 ? void 0 : item.option)
     };
   }).sort(function (p, q) {
     if (p.bundle_id !== q.bundle_id) return p.bundle_id - q.bundle_id;
     if (p.product_id !== q.product_id) return p.product_id - q.product_id;
-    return p.num - q.num;
+    if (p.product_variant_id !== q.product_variant_id) {
+      return p.product_variant_id - q.product_variant_id;
+    }
+    if (p.num !== q.num) return p.num - q.num;
+    return JSON.stringify(p.option).localeCompare(JSON.stringify(q.option));
   });
   return JSON.stringify([normalizedOpts, normalizedBundles]);
 }