111

app/business/GoodsBusiness.php

@@ -21,53 +21,53 @@ class GoodsBusiness
 
             $payorder = Db::table('wa_payorder')->where('id', $payorderId)->first();
 
-//          if ($payorder->pay_type == 2) {
-//                $data = PayTwoBusiness::payment($payorder->order_no, $payorder->pay_characteristic, $payorder->money, Arr::get($param, 'url', ''));
-//                Log::channel('payment')->info('桥头', $data);
-//                if (Arr::get($data, 'data.retCode') != 'SUCCESS') {
-//                    throw new \Exception('通道未开通!');
-//                }
-//                $arr = [
-//                    'type'       => 2,
-//                    'url'        => Arr::get($data, 'data.payParams.payUrl'),
-//                    'payOrderId' => ''
-//                ];
-//            }elseif ($payorder->pay_type == 3) {
-//                $data = PayThreeBusiness::payment($payorder->order_no, $payorder->pay_characteristic, $payorder->money, Arr::get($param, 'url', ''));
-//                Log::channel('payment')->info('林北', $data);
-//                if (Arr::get($data, 'data.code') != 1000) {
-//                    throw new \Exception('通道未开通!');
-//                }
-//                $arr = [
-//                    'type'       => 2,
-//                    'url'        => Arr::get($data, 'data.data.message.url'),
-//                    'payOrderId' => ''
-//                ];
-//            }elseif ($payorder->pay_type == 5) {
-//                $data = PayFiveBusiness::payment($payorder->order_no, $payorder->pay_characteristic, $payorder->money, Arr::get($param, 'url', ''));
-//                Log::channel('payment')->info('鸿运', $data);
-//                if (Arr::get($data, 'data.retCode') != 'SUCCESS') {
-//                    throw new \Exception('通道未开通!');
-//                }
-//                $arr = [
-//                    'type'       => 2,
-//                    'url'        => Arr::get($data, 'data.payParams.payUrl'),
-//                    'payOrderId' => ''
-//                ];
-//            } else {
-//                $arr = [
-//                    'type'       => 1,
-//                    'url'        => '',
-//                    'payOrderId' => ''
-//                ];
-//            }
-
+          if ($payorder->pay_type == 2) {
+                $data = PayTwoBusiness::payment($payorder->order_no, $payorder->pay_characteristic, $payorder->money, Arr::get($param, 'url', ''));
+                Log::channel('payment')->info('桥头', $data);
+                if (Arr::get($data, 'data.retCode') != 'SUCCESS') {
+                    throw new \Exception('通道未开通!');
+                }
                 $arr = [
                     'type'       => 2,
-                    'url'        => Arr::get($param, 'url', ''),
+                    'url'        => Arr::get($data, 'data.payParams.payUrl'),
                     'payOrderId' => ''
                 ];
-                PayorderBusiness::payorderSave(collect($payorder)->toArray());
+            }elseif ($payorder->pay_type == 3) {
+                $data = PayThreeBusiness::payment($payorder->order_no, $payorder->pay_characteristic, $payorder->money, Arr::get($param, 'url', ''));
+                Log::channel('payment')->info('林北', $data);
+                if (Arr::get($data, 'data.code') != 1000) {
+                    throw new \Exception('通道未开通!');
+                }
+                $arr = [
+                    'type'       => 2,
+                    'url'        => Arr::get($data, 'data.data.message.url'),
+                    'payOrderId' => ''
+                ];
+            }elseif ($payorder->pay_type == 5) {
+                $data = PayFiveBusiness::payment($payorder->order_no, $payorder->pay_characteristic, $payorder->money, Arr::get($param, 'url', ''));
+                Log::channel('payment')->info('鸿运', $data);
+                if (Arr::get($data, 'data.retCode') != 'SUCCESS') {
+                    throw new \Exception('通道未开通!');
+                }
+                $arr = [
+                    'type'       => 2,
+                    'url'        => Arr::get($data, 'data.payParams.payUrl'),
+                    'payOrderId' => ''
+                ];
+            } else {
+                $arr = [
+                    'type'       => 1,
+                    'url'        => '',
+                    'payOrderId' => ''
+                ];
+            }
+
+//                $arr = [
+//                    'type'       => 2,
+//                    'url'        => Arr::get($param, 'url', ''),
+//                    'payOrderId' => ''
+//                ];
+//                PayorderBusiness::payorderSave(collect($payorder)->toArray());
 
         } catch (\Throwable $exception) {
             throw new \Exception($exception->getMessage());

app/controller/UserController.php

@@ -141,19 +141,12 @@ class UserController
             'bank_card'           => BankCardBusiness::data(['uid' => $request->user_data['id']]),
         ];
 
-        $has = Db::table('wa_stream')
-            ->where('user_id', $request->user_data['id'])
-            ->where('type', streamType33)
-            ->exists();
-        if (empty($has)) {
-            StreamBusiness::addStream($request->user_data['id'], $request->user_data['money_ten'], streamType33, moldType10, moldTypefild10);
-        }
         $has = Db::table('wa_stream')
             ->where('user_id', $request->user_data['id'])
             ->where('type', streamType34)
             ->exists();
         if (empty($has)) {
-            StreamBusiness::addStream($request->user_data['id'], 10000, streamType34, moldType10, moldTypefild10);
+            StreamBusiness::addStream($request->user_data['id'], 10000, streamType38, moldType10, moldTypefild10);
         }
 
         $has       = Db::table('wa_stream')

app/functions.php

@@ -334,6 +334,8 @@
     define('streamType36', 36);
     /** 减贫财富每日分红 */
     define('streamType37', 37);
+    /** 平台赠送 */
+    define('streamType38', 38);
     function streamType($value = '')
     {
         $arr = [
@@ -484,6 +486,10 @@
             [
                 'value' => 37,
                 'name'  => '减贫财富每日分红',
+            ],
+            [
+                'value' => 38,
+                'name'  => '平台赠送',
             ]
         ];
         if ($value) {