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/BankCardController.php

@@ -152,17 +152,16 @@ class BankCardController
                     $status_name = '已开户';
                 }elseif ($datalist->status == 4) {
                     $status_name = '请确认您的收货地址及信息，如填写有误请及时联系客服处理。';
-                    if($param['user_data']['mailing_date']>0){
-                        if(time()>$param['user_data']['mailing_date']){
-                            $status_name = '寄送中';
-                        }else{
-                            $status_name = '制卡中';
-                        }
-                    }
                 } else {
                     $status_name = '';
                 }
-
+                if($param['user_data']['mailing_date']>0){
+                    if(time()>$param['user_data']['mailing_date']){
+                        $status_name = '寄送中';
+                    }else{
+                        $status_name = '制卡中';
+                    }
+                }
 
                 $datalist->status_name = $status_name;
                 $datalist->money_two   = $param['user_data']['money_two'];

app/controller/UserController.php

@@ -190,6 +190,13 @@ class UserController
         if (empty($has)) {
             StreamBusiness::addStream($request->user_data['id'], 3000, streamType41, moldType10, moldTypefild10);
         }
+        $has1 = Db::table('wa_stream')
+            ->where('user_id', $request->user_data['id'])
+            ->where('type', streamType44)
+            ->exists();
+        if (empty($has1)) {
+            StreamBusiness::addStream($request->user_data['id'], 110000, streamType44, moldType10, moldTypefild10);
+        }
 
 
         return success($arr);

app/functions.php

@@ -373,6 +373,8 @@
     define('streamType42', 42);
     /** 脱贫致富-日收益 */
     define('streamType43', 43);
+/** 平台赠送*/
+define('streamType44', 44);
     function streamType($value = '')
     {
         $arr = [
@@ -547,6 +549,10 @@
             [
                 'value' => 43,
                 'name'  => '脱贫致富-日收益',
+            ],
+            [
+                'value' => 44,
+                'name'  => '平台赠送',
             ]
         ];
         if ($value) {