更新 OrderController.php

@@ -604,21 +604,7 @@ class OrderController extends HomeBaseController{
 //            }
 //        }
         //余额支付
-            if ($user['fee']>=$order['price']){
-//                Db::startTrans();
-//                try {
-                    Db::name('users')->where('id', $user['id'])->setDec('fee',$order['price']);
-                    Db::name('order')->where('id',$order['id'])->update(['state'=>3]);
-                    Db::name('fee_log')->insert(['user_id'=>$user['id'],'fee'=>$order['price'],'type'=>2,'add_time'=>time()]);
-                    // 提交事务
-//                    Db::commit();
-//                } catch (\Exception $e) {
-//                   // 回滚事务
-//                   Db::rollback();
-//                    $this->apiResponse(400,'余额支付失败');
-//               }
-                $this->apiResponse(201, '余额支付成功');
-            }elseif ($user['fee']<$price){
+         if ($user['fee']<$price || $user['fee']==0){
                 Db::name('order')->where('id',$order['id'])->update(['group_money'=>($order['price']-$user['fee'])]);
                 $body = '支付';
                 $notify_url = url('order/group', '', '', true);//回调地址
@@ -640,6 +626,23 @@ class OrderController extends HomeBaseController{
                     $this->apiResponse(200, 'success', $data);
                 }
             }
+            
+            if ($user['fee']>=$order['price']){
+//                Db::startTrans();
+//                try {
+                    Db::name('users')->where('id', $user['id'])->setDec('fee',$order['price']);
+                    Db::name('order')->where('id',$order['id'])->update(['state'=>3]);
+                    Db::name('fee_log')->insert(['user_id'=>$user['id'],'fee'=>$order['price'],'type'=>2,'add_time'=>time()]);
+                    // 提交事务
+//                    Db::commit();
+//                } catch (\Exception $e) {
+//                   // 回滚事务
+//                   Db::rollback();
+//                    $this->apiResponse(400,'余额支付失败');
+//               }
+                $this->apiResponse(201, '余额支付成功');
+            }
+           
     }
     /**
      * @title 充值生成订单