优化用户下单方法-进行中

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

@@ -11993,18 +11993,18 @@ class StoreOrderRepository extends BaseRepository
             ->setFzonePaytype($storeOrderCreateRequestEntity->getFzonePayType());
 
         // 4、写入数据
-        // Db::startTrans();
+        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']);
-            // }
+            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);
+            $storeCartRepository->updateIsPayByCartIdList($cartIdList);
 
             // 4.3 写入 组合订单 (支付订单)
             /** @var StoreGroupOrderRepository $storeGroupOrderRepository */
@@ -12104,9 +12104,9 @@ class StoreOrderRepository extends BaseRepository
                 }
             }
 
-            // Db::commit();
+            Db::commit();
         } catch (DbException $e) {
-            // Db::rollback();
+            Db::rollback();
         }
         return ['order_id' => $storeGroupOrderEntity->getGroupOrderId(), 'groupOrder' => $storeGroupOrderEntity->toArray()];
 

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

@@ -42,7 +42,7 @@ use think\facade\Request;
  * @author xaboy
  * @day 2020/6/10
  */
-class StoreOrder
+class StoreOrder extends BaseController
 {
     /**
      * @var StoreOrderRepository
@@ -58,7 +58,7 @@ class StoreOrder
      */
     public function __construct(App $app, StoreOrderRepository $repository)
     {
-        // parent::__construct($app);
+        parent::__construct($app);
         $this->repository = $repository;
 
         $this->source = request()->header('source');
@@ -115,13 +115,12 @@ class StoreOrder
      */
     public function createOrder(StoreCartRepository $cartRepository)
     {
-        $uid = 1592;
+        $uid = $this->request->uid();
         if (in_array($uid, [1592, 766])) {
             $request = new Request();
             $storeOrderCreateValidate = new StoreOrderCreateValidate($request);
             return $this->createOrderNew($storeOrderCreateValidate);
         }
-        var_dump(123);
 
         $cartId = (array)$this->request->param('cart_id', []);
 
@@ -730,8 +729,7 @@ class StoreOrder
         }
 
         // 根据用户ID 获取用户实体信息
-        // $uid = $this->request->uid();
-        $uid = 1592;
+        $uid = $this->request->uid();
         // 验证通过，继续处理数据
         /** @var StoreOrderCreateRequestEntity $storeOrderCreateRequestEntity */
         $storeOrderCreateRequestEntity = $storeOrderCreateValidateResult['data'];
@@ -749,7 +747,7 @@ class StoreOrder
 
         // 3、创建订单
         $result = $this->repository->createOrderNew2($storeOrderCreateRequestEntity);
-        return app('json')->success('aaa', $result);
+        return app('json')->success('订单创建成功', $result);
     }
 
     /**