MAGETWO-70885: [SOAP] The 'incrementId' property of the order with state 'complete' is increased after order status update

- Fixed an issue with increment id change when save order via webapi;

Author: Aliaksei Yakimovich2

app/code/Magento/Sales/Model/OrderRepository.php

@@ -247,8 +247,11 @@ public function deleteById($id)
     /**
      * Perform persist operations for one entity
      *
-     * @param \Magento\Sales\Api\Data\OrderInterface $entity
-     * @return \Magento\Sales\Api\Data\OrderInterface
+     * @param OrderInterface $entity
+     * @return OrderInterface
+     * @throws InputException
+     * @throws NoSuchEntityException
+     * @throws \Magento\Framework\Exception\AlreadyExistsException
      */
     public function save(\Magento\Sales\Api\Data\OrderInterface $entity)
     {
@@ -262,6 +265,18 @@ public function save(\Magento\Sales\Api\Data\OrderInterface $entity)
                 $entity->setShippingMethod($shipping->getMethod());
             }
         }
+
+        $entityId = $entity->getEntityId();
+        if ($entityId && $entity->getIncrementId() == null) {
+            try {
+                $loadedEntity = $this->get($entityId);
+                $entity->setIncrementId($loadedEntity->getIncrementId());
+                // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
+            } catch (NoSuchEntityException $e) {
+                // non-existent entity
+            }
+        }
+
         $this->metadata->getMapper()->save($entity);
         $this->registry[$entity->getEntityId()] = $entity;
         return $this->registry[$entity->getEntityId()];

app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php

@@ -176,6 +176,7 @@ public function testSave()
         $shippingMock->expects($this->once())->method('getAddress');
         $shippingMock->expects($this->once())->method('getMethod');
         $this->metadata->expects($this->once())->method('getMapper')->willReturn($mapperMock);
+        $orderEntity->expects($this->once())->method('getIncrementId')->willReturn('0000000001');
         $mapperMock->expects($this->once())->method('save');
         $orderEntity->expects($this->any())->method('getEntityId')->willReturn(1);
         $this->orderRepository->save($orderEntity);