Merge pull request #4588 from belltzel/fix/multiple_shipping_stock

複数配送時に在庫数が減らない不具合を修正
EC-CUBE · Jun 26, 2020 · 9e24a29 · 9e24a29
2 parents 6759a0a + 775577e
commit 9e24a29
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/src/Eccube/Service/PurchaseFlow/Processor/StockReduceProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/StockReduceProcessor.php
@@ -84,9 +84,12 @@ private function eachProductOrderItems(ItemHolderInterface $itemHolder, callable
                 // 在庫チェックあり
                 /* @var ProductStock $productStock */
                 $productStock = $item->getProductClass()->getProductStock();
-                // 在庫に対してロックを実行
-                $this->entityManager->lock($productStock, LockMode::PESSIMISTIC_WRITE);
-                $this->entityManager->refresh($productStock);
+                if ($productStock->getProductClassId() === null) {
+                    // 在庫に対してロックを実行
+                    $this->entityManager->lock($productStock, LockMode::PESSIMISTIC_WRITE);
+                    $this->entityManager->refresh($productStock);
+                    $productStock->setProductClassId($item->getProductClass()->getId());
+                }
                 $ProductClass = $item->getProductClass();
                 $stock = $callback($productStock->getStock(), $item->getQuantity());
                 if ($stock < 0) {

diff --git a/tests/Eccube/Tests/Service/PurchaseFlow/Processor/StockReduceProcessorTest.php b/tests/Eccube/Tests/Service/PurchaseFlow/Processor/StockReduceProcessorTest.php
@@ -77,4 +77,32 @@ public function testRollback()
         $ProductClass = $this->entityManager->find(ProductClass::class, $ProductClass->getId());
         self::assertEquals(10, $ProductClass->getStock());
     }
+
+    public function testMultiShipping()
+    {
+        // 在庫10の商品
+        /* @var ProductClass $ProductClass */
+        $ProductClass = $this->createProduct('test', 1)->getProductClasses()[0];
+        $ProductClass->setStockUnlimited(false);
+        $ProductClass->setStock(10);
+        $ProductClass->getProductStock()->setStock(10);
+
+        // 数量3の受注
+        $Customer = $this->createCustomer();
+        $Order = $this->createOrderWithProductClasses($Customer, [$ProductClass,$ProductClass]);
+        $OrderItem = $Order->getProductOrderItems()[0];
+        $OrderItem->setQuantity(3);
+        // 数量7の受注
+        $OrderItem = $Order->getProductOrderItems()[1];
+        $OrderItem->setQuantity(7);
+
+        $this->entityManager->persist($ProductClass);
+        $this->entityManager->flush();
+
+        $this->processor->prepare($Order, new PurchaseContext());
+
+        // 複数のOrderItemで同じProductClassの場合、合算した在庫数が減っている
+        $ProductClass = $this->entityManager->find(ProductClass::class, $ProductClass->getId());
+        self::assertEquals(0, $ProductClass->getStock());
+    }
 }