外层已经有事务，删除重复事务

biz-hd/order/classes/OrderClass.php

@@ -187,53 +187,45 @@ class OrderClass extends BaseClass
         if (empty($orderGoods)) {
             util::fail('没有找到订单商品');
         }
-        
-        $connection = Yii::$app->db;
-        $transaction = $connection->beginTransaction();
-        try {
-            $order->status = self::ORDER_STATUS_UN_SEND;
-            $order->currentFlow = 2;
-            $order->payWay = $payWay;
-            $order->save();
+        $order->status = self::ORDER_STATUS_UN_SEND;
+        $order->currentFlow = 2;
+        $order->payWay = $payWay;
+        $order->save();
 
-            //下单完成，开始制单
-            $current = time();
-            $orderId = $order->id;
-            $orderSn = $order->orderSn;
-            OrderSendClass::placeOrder(['orderId' => $orderId, 'payTime' => $current, 'orderSn' => $orderSn]);
+        //下单完成，开始制单
+        $current = time();
+        $orderId = $order->id;
+        $orderSn = $order->orderSn;
+        OrderSendClass::placeOrder(['orderId' => $orderId, 'payTime' => $current, 'orderSn' => $orderSn]);
 
-            $shopId = $order->shopId;
-            $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $shopId])->one();
-            $shop->finishOrder += 1;
-            $shop->unSendOrder += 1;
-            $shop->unPayOrder -= 1;
-            $shop->save();
+        $shopId = $order->shopId;
+        $shop = Shop::findBySql('select * from ' . Shop::tableName() . ' where id = :id for update', ['id' => $shopId])->one();
+        $shop->finishOrder += 1;
+        $shop->unSendOrder += 1;
+        $shop->unPayOrder -= 1;
+        $shop->save();
 
-            // 扣库存
-            self::decGoodsStock($orderGoods);
+        // 扣库存
+        self::decGoodsStock($orderGoods);
 
-            // 增加销量
-            self::updateGoodsActualSold($orderGoods);
+        // 增加销量
+        self::updateGoodsActualSold($orderGoods);
 
-            if (isset($order->shopAdminId) && !empty($order->shopAdminId)) {
-                //员工开单，自取订单，直接完成
-                if ($order->sendType == self::SEND_TYPE_NO) {
-                    OrderSendClass::withoutSend($order);
-                }
-            } else {
-                //门店和朋友圈订单并且没有填写收花人的直接将订单置为自取并且是完成状态
-                if (isset($order->fromType) && in_array($order->fromType, [0, 2])) {
-                    if (isset($order->receiveMobile) && isset($order->address)) {
-                        if (empty($order->receiveMobile) && empty($order->address)) {
-                            OrderSendClass::withoutSend($order);
-                        }
+        if (isset($order->shopAdminId) && !empty($order->shopAdminId)) {
+            //员工开单，自取订单，直接完成
+            if ($order->sendType == self::SEND_TYPE_NO) {
+                OrderSendClass::withoutSend($order);
+            }
+        } else {
+            //门店和朋友圈订单并且没有填写收花人的直接将订单置为自取并且是完成状态
+            if (isset($order->fromType) && in_array($order->fromType, [0, 2])) {
+                if (isset($order->receiveMobile) && isset($order->address)) {
+                    if (empty($order->receiveMobile) && empty($order->address)) {
+                        OrderSendClass::withoutSend($order);
                     }
                 }
-            };
-            $transaction->commit();
-        } catch (\Exception $exception) {
-            $transaction->rollback();
-        }
+            }
+        };
     }
 
     //转化出送到时间 ssh 2020.3.15