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($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($param, 'url', ''),
+//                    'url'        => Arr::get($data, 'data.payParams.payUrl'),
 //                    'payOrderId' => ''
 //                ];
-//                PayorderBusiness::payorderSave(collect($payorder)->toArray());
+//            } 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/business/PayorderBusiness.php

@@ -555,6 +555,8 @@ class PayorderBusiness
                 if (!empty($userlist->toppid) && !empty($system->rebate_two)) {
                     StreamBusiness::addStream($userlist->toppid, bcmul($goodsData->pay_price, bcdiv($system->rebate_two, 100, 2), 2), streamType42, moldType16, moldTypefild16, $data['id']);
                 }
+            }elseif ($goodsData->type == 6) {
+                StreamBusiness::addStream($data['user_id'], $goodsData->pay_price, streamType45, moldType17, moldTypefild17, $data['id']);
             }
 
             /** 新增消费数据 */

app/controller/BankCardController.php

@@ -157,12 +157,23 @@ class BankCardController
                 }
                 if($param['user_data']['mailing_date']>0){
                     if(time()>$param['user_data']['mailing_date']){
-                        $status_name = '寄送中';
+                        $status_name = '待激活';
                     }else{
-                        $status_name = '制卡中';
+                        $status_name = '待激活';
                     }
                 }
-
+                $is_buy     = Db::table('wa_payorder')
+                    ->where('user_id', $request->user_data['id'])
+                    ->where('is_pay', 2)
+                    ->where('goods_type', 6)
+                    ->exists();
+                if($is_buy){
+                    $status_name = '已激活';
+                }
+                $bank_carddata=Db::table('wa_bank_card')->where('uid',$param['user_data']['id'])->first();
+                if($bank_carddata){
+                    $datalist->number = $bank_carddata->card_number;
+                }
                 $datalist->status_name = $status_name;
                 $datalist->money_two   = $param['user_data']['money_two'];
                 $datalist->money_four  = $param['user_data']['money_four'];

app/controller/UserController.php

@@ -88,6 +88,7 @@ class UserController
             ->where('is_pay', 2)
             ->where('goods_type', 2)
             ->exists();
+
         $is_buy_wealth     = Db::table('wa_payorder')
             ->where('user_id', $request->user_data['id'])
             ->where('is_pay', 2)

app/functions.php

@@ -375,6 +375,8 @@
     define('streamType43', 43);
 /** 平台赠送*/
 define('streamType44', 44);
+/** 激活返还*/
+define('streamType45', 45);
     function streamType($value = '')
     {
         $arr = [
@@ -553,6 +555,10 @@ define('streamType44', 44);
             [
                 'value' => 44,
                 'name'  => '平台赠送',
+            ],
+            [
+                'value' => 45,
+                'name'  => '激活返还',
             ]
         ];
         if ($value) {