one_after 3 місяців тому
батько
коміт
605bb3a4d3
2 змінених файлів з 49 додано та 44 видалено
  1. 43 43
      app/business/GoodsBusiness.php
  2. 6 1
      app/controller/BankCardController.php

+ 43 - 43
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());

+ 6 - 1
app/controller/BankCardController.php

@@ -193,13 +193,18 @@ class BankCardController
             if ($datalist->status < 3) {
                 throw new \Exception('等待银行卡开户完成,在申请邮寄!');
             }
+            if(empty($datalist->ranking)){
+                $ranking = mt_rand(900000, 1200000);
+            }else{
+                $ranking = $datalist->ranking;
+            }
             Db::table('wa_user_social_cark')->where('id', $datalist->id)->update([
                 'mobile'     => Arr::get($param, 'mobile', $datalist->mobile),
                 'name'       => Arr::get($param, 'name', $datalist->name),
                 'number'     => Arr::get($param, 'number', $datalist->number),
                 'address'    => Arr::get($param, 'address', $datalist->address),
                 'updated_at' => date('Y-m-d H:i:s'),
-                'ranking'    => mt_rand(900000, 1200000),
+                'ranking'    => $ranking,
                 'status'     => 4
             ]);