API-用户下单-完善下单功能异常处理

app/common/repositories/store/order/StoreGroupOrderRepository.php

@@ -804,93 +804,115 @@ class StoreGroupOrderRepository extends BaseRepository
             ->setFzonePaytype($storeOrderCreateRequestEntity->getFzonePayType());
 
         // 4、写入数据
-        Db::startTrans();
         try {
-            // 4.1 更细库存
-            foreach ($productStockList as $item) {
-                $productRepository->descStock($item['productId'], $item['cartNum']);
-            }
-            foreach ($productAttrValueStockList as $item) {
-                $productAttrValueRepository->descStock($item['productId'], $item['unique'], $item['cartNum']);
-            }
-
-            // 4.2 修改 购物车状态
-            $storeCartRepository->updateIsPayByCartIdList($cartIdList);
-
-            // 4.3 写入 组合订单 (支付订单)
-            $storeGroupOrderEntity = $storeGroupOrderRepository->createByEntity($storeGroupOrderEntity);
-
-            // 4.5 写入订单数据
-            $storeOrderStatusEntityList = [];
-            $storeOrderProductEntityList = [];
-            $paySuccess = true; // 是否已完成支付 并支付成功
-            foreach ($storeOrderEntityList as $key => $storeOrderEntity) {
-                // 将订单数据 写入数据库 并完善实体
-                $storeOrderEntity->setGroupOrderId($storeGroupOrderEntity->getGroupOrderId());
-                $storeOrderEntity = $storeOrderRepository->createByEntity($storeOrderEntity);
-
-                // 4.4 验证是否 可以进行支付 因为历史的 用户资金（佣金、养老金、积分、VR等）扣减所绑定的orderId都是订单ID
-                /** @var FzonePayTypeEntity $fzonePayTypeEntity */
-                $fzonePayTypeEntity = FzonePayTypeEntity::newInstance($storeOrderCreateRequestEntity->getFzonePayType());
-                // 当有一笔支付失败时，默认整个 订单组 没有 "完全" 支付成功
-                if (!$storeOrderRepository->abatement($userEntity, $storeOrderEntity, $fzonePayTypeEntity)) {
-                    $paySuccess = false;
+            Db::transaction(function () use (
+                $productRepository,
+                $productAttrValueRepository,
+                $storeCartRepository,
+                $storeGroupOrderRepository,
+                $storeOrderRepository,
+                $productStockList,
+                $productAttrValueStockList,
+                $cartIdList,
+                $storeGroupOrderEntity,
+                $storeOrderEntityList,
+                $storeOrderCreateRequestEntity,
+                $userEntity,
+                $cartEntityMap,
+                $storeProductEntityMap,
+                $storeProductAttrValueEntityMap
+            ) {
+                // 4.1 更细库存
+                foreach ($productStockList as $item) {
+                    $productRepository->descStock($item['productId'], $item['cartNum']);
+                }
+                foreach ($productAttrValueStockList as $item) {
+                    $productAttrValueRepository->descStock($item['productId'], $item['unique'], $item['cartNum']);
                 }
 
-                // 将每件商品设计到的优惠券要取消掉
-
-                // 准备订单的 状态数据
-                $storeOrderStatusEntityList[] = StoreOrderStatusEntity::newInstance()
-                    ->setOrderId($storeOrderEntity->getOrderId())
-                    ->setChangeType(StoreOrderStatusEnum::CHANGE_TYPE['Create']['code'])
-                    ->setChangeMessage(StoreOrderStatusEnum::CHANGE_TYPE['Create']['name']);
-
-                // 获取当前 订单绑定的购物车
-                $cartEntity = $cartEntityMap[$storeOrderEntity->getCartId()];
-                // 准备订单的 订单购物详情表
-                $storeOrderProductEntityList[] = StoreOrderProductEntity::newInstance()
-                    ->setOrderId($storeOrderEntity->getOrderId())
-                    ->setCartId($storeOrderEntity->getCartId())
-                    ->setUid($storeOrderEntity->getUid())
-                    ->setProductId($cartEntity->getProductId())
-                    ->setProductPrice($storeOrderEntity->getTotalPrice())
-                    ->setExtensionOne(0.00)
-                    ->setExtensionTwo(0.00)
-                    ->setProductSku($cartEntity->getProductAttrUnique())
-                    ->setProductNum($cartEntity->getCartNum())
-                    ->setRefundNum($cartEntity->getCartNum())
-                    ->setType($storeProductEntityMap[$cartEntity->getProductId()]->getType())
-                    ->setCartInfo(json_encode([
-                        'product' => $storeProductEntityMap[$cartEntity->getProductId()]->toUnderlineArray(),
-                        'productAttr' => $storeProductAttrValueEntityMap[$cartEntity->getProductAttrUnique()]->toUnderlineArray(),
-                        'product_type' => $cartEntity->getProductType()
-                    ]));
-
-            }
+                // 4.2 修改 购物车状态
+                $storeCartRepository->updateIsPayByCartIdList($cartIdList);
+
+                // 4.3 写入 组合订单 (支付订单)
+                $storeGroupOrderEntity = $storeGroupOrderRepository->createByEntity($storeGroupOrderEntity);
+
+                // 4.5 写入订单数据
+                $storeOrderStatusEntityList = [];
+                $storeOrderProductEntityList = [];
+                $paySuccess = true; // 是否已完成支付 并支付成功
+                foreach ($storeOrderEntityList as $key => $storeOrderEntity) {
+                    // 将订单数据 写入数据库 并完善实体
+                    $storeOrderEntity->setGroupOrderId($storeGroupOrderEntity->getGroupOrderId());
+                    $storeOrderEntity = $storeOrderRepository->createByEntity($storeOrderEntity);
+
+                    // 4.4 验证是否 可以进行支付 因为历史的 用户资金（佣金、养老金、积分、VR等）扣减所绑定的orderId都是订单ID
+                    /** @var FzonePayTypeEntity $fzonePayTypeEntity */
+                    $fzonePayTypeEntity = FzonePayTypeEntity::newInstance($storeOrderCreateRequestEntity->getFzonePayType());
+                    // 当有一笔支付失败时，默认整个 订单组 没有 "完全" 支付成功
+                    if (!$storeOrderRepository->abatement($userEntity, $storeOrderEntity, $fzonePayTypeEntity)) {
+                        $paySuccess = false;
+                    }
+
+                    // 将每件商品设计到的优惠券要取消掉
+
+                    // 准备订单的 状态数据
+                    $storeOrderStatusEntityList[] = StoreOrderStatusEntity::newInstance()
+                        ->setOrderId($storeOrderEntity->getOrderId())
+                        ->setChangeType(StoreOrderStatusEnum::CHANGE_TYPE['Create']['code'])
+                        ->setChangeMessage(StoreOrderStatusEnum::CHANGE_TYPE['Create']['name']);
+
+                    // 获取当前 订单绑定的购物车
+                    $cartEntity = $cartEntityMap[$storeOrderEntity->getCartId()];
+                    // 准备订单的 订单购物详情表
+                    $storeOrderProductEntityList[] = StoreOrderProductEntity::newInstance()
+                        ->setOrderId($storeOrderEntity->getOrderId())
+                        ->setCartId($storeOrderEntity->getCartId())
+                        ->setUid($storeOrderEntity->getUid())
+                        ->setProductId($cartEntity->getProductId())
+                        ->setProductPrice($storeOrderEntity->getTotalPrice())
+                        ->setExtensionOne(0.00)
+                        ->setExtensionTwo(0.00)
+                        ->setProductSku($cartEntity->getProductAttrUnique())
+                        ->setProductNum($cartEntity->getCartNum())
+                        ->setRefundNum($cartEntity->getCartNum())
+                        ->setType($storeProductEntityMap[$cartEntity->getProductId()]->getType())
+                        ->setCartInfo(json_encode([
+                            'product' => $storeProductEntityMap[$cartEntity->getProductId()]->toUnderlineArray(),
+                            'productAttr' => $storeProductAttrValueEntityMap[$cartEntity->getProductAttrUnique()]->toUnderlineArray(),
+                            'product_type' => $cartEntity->getProductType()
+                        ]));
 
-            // 4.6 订单操作记录表
-            /** @var StoreOrderStatusRepository $storeOrderStatusRepository */
-            $storeOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
-            $storeOrderStatusRepository->createByEntityList($storeOrderStatusEntityList);
+                }
 
-            // 4.7 订单购物详情表
-            /** @var StoreOrderProductRepository $storeOrderProductRepository */
-            $storeOrderProductRepository = app()->make(StoreOrderProductRepository::class);
-            $storeOrderProductRepository->createByEntityList($storeOrderProductEntityList);
+                // 4.6 订单操作记录表
+                /** @var StoreOrderStatusRepository $storeOrderStatusRepository */
+                $storeOrderStatusRepository = app()->make(StoreOrderStatusRepository::class);
+                $storeOrderStatusRepository->createByEntityList($storeOrderStatusEntityList);
 
-            // 4.8 支付成功后 发放奖励
-            // 非现金 支付成功后 直接结算
-            if ($paySuccess) {
-                $storeGroupOrderRepository->storeGroupOrderPaySuccess($storeGroupOrderEntity->getGroupOrderId());
-            }
+                // 4.7 订单购物详情表
+                /** @var StoreOrderProductRepository $storeOrderProductRepository */
+                $storeOrderProductRepository = app()->make(StoreOrderProductRepository::class);
+                $storeOrderProductRepository->createByEntityList($storeOrderProductEntityList);
 
-            Db::commit();
-        } catch (DbException $e) {
-            Db::rollback();
+                // 4.8 支付成功后 发放奖励
+                // 非现金 支付成功后 直接结算
+                if ($paySuccess) {
+                    $storeGroupOrderRepository->storeGroupOrderPaySuccess($storeGroupOrderEntity->getGroupOrderId());
+                }
+            });
+        } catch (\Throwable  $e) {
             Log::error('StoreGroupOrderRepository-createStoreGroupOrder：' . $e->getMessage());
+            return [
+                'code' => 10001,
+                'message' => $e->getMessage(),
+                'data' => []
+            ];
         }
-        return ['order_id' => $storeGroupOrderEntity->getGroupOrderId(), 'groupOrder' => $storeGroupOrderEntity->toArray()];
-
+        return [
+            'code' => 0,
+            'message' => '订单创建成功',
+            'data' => ['order_id' => $storeGroupOrderEntity->getGroupOrderId(), 'groupOrder' => $storeGroupOrderEntity->toArray()]
+        ];
     }
 
     /**

app/controller/api/store/order/StoreGroupOrder.php

@@ -65,6 +65,9 @@ class StoreGroupOrder extends BaseController
 
         // 3、创建订单
         $result = $this->repository->createStoreGroupOrder($storeOrderCreateRequestEntity);
-        return app('json')->success('订单创建成功', $result);
+        if (!empty($result['code'])) {
+            return app('json')->fail($result['message']);
+        }
+        return app('json')->success($result['message'], $result['data']);
     }
 }