@pisell/pisellos 2.2.233 → 2.2.235

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

@@ -192,6 +192,8 @@ export declare class OrderModule extends BaseModule implements Module {
     private findOrderIndexByIdentity;
     private getOrderCompletenessScore;
     private pickPreferredOrder;
+    private getProductMergeKey;
+    private mergeOrderProductLists;
     private mergeOrderRecords;
     private summarizeDuplicateOrders;
     private logDuplicateOrders;

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

@@ -1884,6 +1884,59 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (rightScore >= leftScore) return right;
       return left;
     }
+  }, {
+    key: "getProductMergeKey",
+    value: function getProductMergeKey(product) {
+      var _record$metadata;
+      var record = product;
+      if (!record) return '';
+      var metadataUid = (_record$metadata = record.metadata) === null || _record$metadata === void 0 ? void 0 : _record$metadata.unique_identification_number;
+      if (!this.isBlankIdentityValue(metadataUid)) return "uid:".concat(String(metadataUid));
+      var topLevelUid = record.unique_identification_number;
+      if (!this.isBlankIdentityValue(topLevelUid)) return "uid:".concat(String(topLevelUid));
+      var bookingUid = record.booking_uid;
+      if (!this.isBlankIdentityValue(bookingUid)) return "booking:".concat(String(bookingUid));
+      return '';
+    }
+  }, {
+    key: "mergeOrderProductLists",
+    value: function mergeOrderProductLists(preferred, secondary) {
+      var preferredList = Array.isArray(preferred) ? preferred : [];
+      var secondaryList = Array.isArray(secondary) ? secondary : [];
+      if (secondaryList.length === 0) return preferredList;
+      if (preferredList.length === 0) return secondaryList;
+      var seenKeys = new Set();
+      var _iterator13 = _createForOfIteratorHelper(preferredList),
+        _step13;
+      try {
+        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+          var item = _step13.value;
+          var key = this.getProductMergeKey(item);
+          if (key) seenKeys.add(key);
+        }
+      } catch (err) {
+        _iterator13.e(err);
+      } finally {
+        _iterator13.f();
+      }
+      var result = _toConsumableArray(preferredList);
+      var _iterator14 = _createForOfIteratorHelper(secondaryList),
+        _step14;
+      try {
+        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+          var _item = _step14.value;
+          var _key = this.getProductMergeKey(_item);
+          if (!_key || seenKeys.has(_key)) continue;
+          seenKeys.add(_key);
+          result.push(cloneDeep(_item));
+        }
+      } catch (err) {
+        _iterator14.e(err);
+      } finally {
+        _iterator14.f();
+      }
+      return result;
+    }
   }, {
     key: "mergeOrderRecords",
     value: function mergeOrderRecords(existing, incoming) {
@@ -1891,7 +1944,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var secondary = preferred === existing ? incoming : existing;
       var merged = _objectSpread(_objectSpread({}, secondary), preferred);
       var fieldsToPreserve = ['order_id', 'external_sale_number', 'order_number', 'shop_order_number', 'shop_full_order_number'];
-      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'summary', 'payments'];
+      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'summary', 'payments', 'products', 'bookings'];
       var mergedRecord = merged;
       var preferredRecord = preferred;
       var secondaryRecord = secondary;
@@ -1913,6 +1966,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         if (typeof incomingRecord[_field] === 'string' && incomingRecord[_field] === '') continue;
         mergedRecord[_field] = cloneDeep(incomingRecord[_field]);
       }
+      mergedRecord.products = this.mergeOrderProductLists(preferredRecord.products, secondaryRecord.products);
       if (!this.isPendingSyncOrder(preferred) || !this.isPendingSyncOrder(secondary)) {
         merged.need_sync = 0;
       }
@@ -1922,30 +1976,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "summarizeDuplicateOrders",
     value: function summarizeDuplicateOrders(orders) {
       var groups = new Map();
-      var _iterator13 = _createForOfIteratorHelper(orders),
-        _step13;
+      var _iterator15 = _createForOfIteratorHelper(orders),
+        _step15;
       try {
-        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-          var order = _step13.value;
-          var _iterator14 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
-            _step14;
+        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+          var order = _step15.value;
+          var _iterator16 = _createForOfIteratorHelper(this.getOrderIdentityMatchKeys(order)),
+            _step16;
           try {
-            for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-              var key = _step14.value;
+            for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+              var key = _step16.value;
               var group = groups.get(key) || [];
               group.push(order);
               groups.set(key, group);
             }
           } catch (err) {
-            _iterator14.e(err);
+            _iterator16.e(err);
           } finally {
-            _iterator14.f();
+            _iterator16.f();
           }
         }
       } catch (err) {
-        _iterator13.e(err);
+        _iterator15.e(err);
       } finally {
-        _iterator13.f();
+        _iterator15.f();
       }
       return _toConsumableArray(groups.entries()).filter(function (_ref2) {
         var _ref3 = _slicedToArray(_ref2, 2),
@@ -1987,11 +2041,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function compactOrderListByIdentity(orders, source) {
       var list = [];
       var removedCount = 0;
-      var _iterator15 = _createForOfIteratorHelper(orders),
-        _step15;
+      var _iterator17 = _createForOfIteratorHelper(orders),
+        _step17;
       try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-          var order = _step15.value;
+        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+          var order = _step17.value;
           var matchIndex = this.findOrderIndexByIdentity(list, order);
           if (matchIndex < 0) {
             list.push(order);
@@ -2001,9 +2055,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           removedCount += 1;
         }
       } catch (err) {
-        _iterator15.e(err);
+        _iterator17.e(err);
       } finally {
-        _iterator15.f();
+        _iterator17.f();
       }
       if (removedCount > 0) {
         this.logWarning('订单列表重复项已压缩', {
@@ -2153,11 +2207,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var merged = remoteOrders.map(function (order) {
         return _this18.normalizeRemoteSyncedOrder(order);
       });
-      var _iterator16 = _createForOfIteratorHelper(existingOrders),
-        _step16;
+      var _iterator18 = _createForOfIteratorHelper(existingOrders),
+        _step18;
       try {
-        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-          var order = _step16.value;
+        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+          var order = _step18.value;
           if (!this.isPendingSyncOrder(order)) continue;
           var matchIndex = this.findOrderIndexByIdentity(merged, order);
           if (matchIndex >= 0) {
@@ -2168,9 +2222,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           merged.push(order);
         }
       } catch (err) {
-        _iterator16.e(err);
+        _iterator18.e(err);
       } finally {
-        _iterator16.f();
+        _iterator18.f();
       }
       return this.compactOrderListByIdentity(merged, 'mergeRemoteSnapshotWithPendingOrders').list;
     }
@@ -2264,7 +2318,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _context20.prev = 12;
               _context20.next = 15;
               return this.runInOrderSQLiteSaveQueue( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
-                var writeMethod, _iterator17, _step17, order;
+                var writeMethod, _iterator19, _step19, order;
                 return _regeneratorRuntime().wrap(function _callee19$(_context19) {
                   while (1) switch (_context19.prev = _context19.next) {
                     case 0:
@@ -2301,15 +2355,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                         break;
                       }
                       writeMethod = 'update';
-                      _iterator17 = _createForOfIteratorHelper(compactedToWrite);
+                      _iterator19 = _createForOfIteratorHelper(compactedToWrite);
                       _context19.prev = 17;
-                      _iterator17.s();
+                      _iterator19.s();
                     case 19:
-                      if ((_step17 = _iterator17.n()).done) {
+                      if ((_step19 = _iterator19.n()).done) {
                         _context19.next = 25;
                         break;
                       }
-                      order = _step17.value;
+                      order = _step19.value;
                       _context19.next = 23;
                       return _this19.dbManager.update(INDEXDB_STORE_NAME, order);
                     case 23:
@@ -2321,10 +2375,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     case 27:
                       _context19.prev = 27;
                       _context19.t0 = _context19["catch"](17);
-                      _iterator17.e(_context19.t0);
+                      _iterator19.e(_context19.t0);
                     case 30:
                       _context19.prev = 30;
-                      _iterator17.f();
+                      _iterator19.f();
                       return _context19.finish(30);
                     case 33:
                       _this19.recordRecentSqliteWrite(source, compactedToWrite);

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

@@ -203,6 +203,12 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         smallTicketDataFlag?: number;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
+    submitTempOrderAsync<T = any>(params?: {
+        payments?: OrderPaymentSource[];
+        paymentStatus?: BaseSalesPaymentStatus;
+        smallTicketDataFlag?: number;
+        enhancePayload?: SubmitPayloadEnhancer;
+    }): Promise<T>;
     printLocalOrderReceipt<T = any>(lookup?: BaseSalesPrintLocalOrderReceiptParams): Promise<T>;
     private getSubmitPaymentStatus;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;