feat: 优化充值

mini/components/Recharge/index.vue

@@ -102,7 +102,8 @@ export default {
       },
       combos: [],
       rechargeActive: 0,
-      buyNum: 0
+      buyNum: 0,
+      payId: 0
     }
   },
   computed: {
@@ -145,6 +146,8 @@ export default {
       const item = this.combos[this.rechargeActive]
       this.$loading('请稍后...')
       this.$api.user.recharge.create({ id: item.id }).then(res => {
+        this.payId = res.pay_id
+        delete res.pay_id
         console.log('-->data', res)
         // #ifdef MP-TOUTIAO
         tt.pay({

mini/setting.js

@@ -1,7 +1,8 @@
 /**
  * Created by JianJia.Zhou<jianjia.zhou> on 2022/3/18.
  */
-const IS_DEV = process.env.NODE_ENV === 'development'
+// const IS_DEV = process.env.NODE_ENV === 'development'
+const IS_DEV = false
 // const URL = 'https://zhangsiye.9026.com'
 const URL = 'https://t3.9026.com'
 

server/app/Http/Controllers/V1/PayNoticeController.php

@@ -118,7 +118,7 @@ class PayNoticeController extends Controller
             //处理支付订单
             try {
                 \DB::beginTransaction();
-                $payId = $message['out_order_no'];
+                $payId = $message['out_trade_no'];
                 $pay = Pay::find($payId);
                 if (!$pay) { // 如果订单不存在
                     return true;

server/app/Http/Controllers/V1/User/RechargeController.php

@@ -68,7 +68,6 @@ class RechargeController extends Controller
                     $res = [
                         'order_id' => $pay->prepay_id,
                         'order_token' => $pay->token,
-                        'pay_id' => $pay->pay_id,
                     ];
                 }
             }else{
@@ -87,8 +86,8 @@ class RechargeController extends Controller
                     $res = $app->payment()->jssdk->bridgeConfig($pay->prepay_id);
                     $res = json_decode($res, true);
                 }
-
             }
+            $res['pay_id'] = $recharge->pay_id;
 
             \DB::commit();
             return $this->success($res);

server/app/Http/Controllers/V1/User/VipController.php

@@ -55,19 +55,18 @@ class VipController extends Controller
                     $res = [
                         'order_id' => $pay->prepay_id,
                         'order_token' => $pay->token,
-                        'pay_id' => $pay->pay_id,
                     ];
                 }
             }else{
                 $res = app(Pay::class)->create($app, $combo->price,Pay::SOURCE_BUY_VIP);
 
-                $recharge = new UserVipRecord();
-                $recharge->user_id = \user()->id;
-                $recharge->combo_id = $combo->id;
-                $recharge->valid_day = $combo->valid_day;
-                $recharge->pay_id = $res['pay_id'];
-                $recharge->status = 0;
-                $recharge->save();
+                $vip = new UserVipRecord();
+                $vip->user_id = \user()->id;
+                $vip->combo_id = $combo->id;
+                $vip->valid_day = $combo->valid_day;
+                $vip->pay_id = $res['pay_id'];
+                $vip->status = 0;
+                $vip->save();
 
                 if(\user()->info->platform == 3){
                     $pay = Pay::find($res['pay_id']);
@@ -75,6 +74,7 @@ class VipController extends Controller
                     $res = json_decode($res, true);
                 }
             }
+            $res['pay_id'] = $vip->pay_id;
             \DB::commit();
             return $this->success($res);
         }catch (QueryException $e){