支付微调

app/Http/Controllers/Api/AskController.php

@@ -60,9 +60,18 @@ class AskController extends BaseController
             'is_public' => $request->is_public,
         ];
 
-        DB::table('ask_order')->insert($data);
+        //0元的直接已付
+        $need_pay = 1;
+        if($blogger->ask_price == 0){
+            $data['status'] = 10;
+            $data['paytime'] = time();
 
-        return $this->success();
+            $need_pay = 0;
+        }
+
+        $order_id = DB::table('ask_order')->insertGetId($data);
+
+        return $this->success(['order_id'=>$order_id,'need_pay'=>$need_pay]);
     }
 
     //评价此次咨询
@@ -137,8 +146,10 @@ class AskController extends BaseController
         $need_pay = 1;
 
         //检查旁听订单
+        $sit_order_id = 0;
         $sit_order = DB::table('ask_sit_order')->where('order_id',$order_id)->where('sit_user_id',$request->uid)->first();
         if($sit_order){
+            $sit_order_id = $sit_order->id;
             if($sit_order->status == 10){
                 return $this->fail(200016,[],'已经旁听过了');
             }else{
@@ -156,15 +167,10 @@ class AskController extends BaseController
                 $data['status'] = 10;
                 $data['paytime'] = time();
             }
-            DB::table('ask_sit_order')->insert($data);
-        }
-
-        if($need_pay == 1){
-            return $this->success('支付拉起'); //支付拉起
-        }else{
-            return $this->success();
+            $sit_order_id = DB::table('ask_sit_order')->insertGetId($data);
         }
 
+        return $this->success(['sit_order_id'=>$sit_order_id,'need_pay'=>$need_pay]);
     }
 
     //付费咨询拉起订单
@@ -185,11 +191,14 @@ class AskController extends BaseController
         if($request->pay_type == 'balance'){
 
             //检查支付密码
-            $this->check_paycode($uid,$request->paycode);
+            $rs = $this->check_paycode($uid,$request->paycode);
+            if($rs !== true){
+                return $rs;
+            }
 
             //检查余额
             $balance = UserUtils::user_balance($uid);
-            if($balance <= $order->ask_price]){
+            if($balance <= $order->ask_price){
                 return $this->fail(200012);
             }
 
@@ -210,7 +219,7 @@ class AskController extends BaseController
 
             DB::commit();
 
-            return $this->success();
+            return $this->success([],200,'余额支付成功');
         }
 
         //拉起三方支付
@@ -260,11 +269,14 @@ class AskController extends BaseController
         if($request->pay_type == 'balance'){
 
             //检查支付密码
-            $this->check_paycode($uid,$request->paycode);
+            $rs = $this->check_paycode($uid,$request->paycode);
+            if($rs != true){
+                return $rs;
+            }
 
             //检查余额
             $balance = UserUtils::user_balance($uid);
-            if($balance <= $order->sit_price]){
+            if($balance <= $order->sit_price){
                 return $this->fail(200012);
             }
 
@@ -285,7 +297,7 @@ class AskController extends BaseController
 
             DB::commit();
 
-            return $this->success();
+            return $this->success([],200,'余额支付成功');
         }
 
         //拉起三方支付
@@ -324,6 +336,7 @@ class AskController extends BaseController
         if(_empty_($paycode)){
             return $this->fail(200004, [], '请先输入支付密码');
         }
+
         if(is_array($paycode) && str_replace(',', '', implode(',', $paycode)) !== get_user_meta($uid, 'paycode', 's')){
             return $this->fail(200043, [
                 'title' => '支付密码错误',

app/Wen/Utils/FieldUtils.php

@@ -203,6 +203,9 @@ class FieldUtils{
             32 => '付费获取Ta人联系方式',
             33 => '笔记自动刷新退款',
 
+            101 => '付费咨询',
+            102 => '付费旁听',
+
             // DESAI 相关余额变动类型
             10001 => '购买了模型',
             10002 => '模型被购买',