111

.idea/php.xml

@@ -112,7 +112,7 @@
       <path value="$PROJECT_DIR$/vendor/phpunit/php-timer" />
     </include_path>
   </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="8.1">
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.0">
     <option name="suggestChangeDefaultLanguageLevel" value="false" />
   </component>
   <component name="PhpStanOptionsConfiguration">

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

@@ -150,6 +150,8 @@ class BankCardController
                     $datalist->card_num = '*******************';
                 } elseif ($datalist->status == 3) {
                     $status_name = '已开户';
+                }elseif ($datalist->status == 4) {
+                    $status_name = '邮寄中';
                 } else {
                     $status_name = '';
                 }