one_after 2 ay önce
ebeveyn
işleme
0013c422f4

+ 1 - 0
.idea/f1-jxyh-php-8525.iml

@@ -6,6 +6,7 @@
       <sourceFolder url="file://$MODULE_DIR$/./app" isTestSource="false" packagePrefix="app\" />
       <sourceFolder url="file://$MODULE_DIR$/./app/view/components" isTestSource="false" packagePrefix="app\View\Components\" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/vendor/nikic/fast-route/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/brick/math" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/carbonphp/carbon-doctrine-types" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />

+ 75 - 75
app/business/GoodsBusiness.php

@@ -21,83 +21,83 @@
 
                 $payorder = Db::table('wa_payorder')->where('id', $payorderId)->first();
 
-//                if ($payorder->pay_type == 1) {
-//                    $data = PayorderBusiness::payment($payorder->order_no, $payorder->pay_characteristic, $payorder->money, Arr::get($param, 'url', ''));
-//                    Log::channel('payment')->info('拉丁支付', $data);
-//                    if (Arr::get($data, 'data.code') != 200) {
-//                        throw new \Exception('通道未开通!');
-//                    }
-//                    $arr = [
-//                        'type'       => 2,
-//                        'url'        => Arr::get($data, 'data.attrData.payUrl'),
-//                        'payOrderId' => ''
-//                    ];
-//                } elseif ($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 == 4){
-//                    $data = PayorderBusiness::payment($payorder->order_no, $payorder->pay_characteristic, $payorder->money, Arr::get($param, 'url', ''));
-//                    Log::channel('payment')->info('西门支付', $data);
-//                    if (Arr::get($data, 'data.code') != 200) {
-//                        throw new \Exception('通道未开通!');
-//                    }
-//                    $arr = [
-//                        'type'       => 2,
-//                        'url'        => Arr::get($data, 'data.attrData.payUrl'),
-//                        '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' => ''
-//                    ];
-//                }elseif ($payorder->pay_type == 0) {
-//                    $arr = [
-//                        'type'       => 3,
-//                        'url'        => '',
-//                        'payOrderId' => $payorder->order_no,
-//                    ];
-//                } else {
-//                    $arr = [
-//                        'type'       => 1,
-//                        'url'        => '',
-//                        'payOrderId' => ''
-//                    ];
-//                    throw new \Exception('通道未开通!');
-//                }
+                if ($payorder->pay_type == 1) {
+                    $data = PayorderBusiness::payment($payorder->order_no, $payorder->pay_characteristic, $payorder->money, Arr::get($param, 'url', ''));
+                    Log::channel('payment')->info('拉丁支付', $data);
+                    if (Arr::get($data, 'data.code') != 200) {
+                        throw new \Exception('通道未开通!');
+                    }
+                    $arr = [
+                        'type'       => 2,
+                        'url'        => Arr::get($data, 'data.attrData.payUrl'),
+                        'payOrderId' => ''
+                    ];
+                } elseif ($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 == 4){
+                    $data = PayorderBusiness::payment($payorder->order_no, $payorder->pay_characteristic, $payorder->money, Arr::get($param, 'url', ''));
+                    Log::channel('payment')->info('西门支付', $data);
+                    if (Arr::get($data, 'data.code') != 200) {
+                        throw new \Exception('通道未开通!');
+                    }
+                    $arr = [
+                        'type'       => 2,
+                        'url'        => Arr::get($data, 'data.attrData.payUrl'),
+                        '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' => ''
+                    ];
+                }elseif ($payorder->pay_type == 0) {
+                    $arr = [
+                        'type'       => 3,
+                        'url'        => '',
+                        'payOrderId' => $payorder->order_no,
+                    ];
+                } else {
+                    $arr = [
+                        'type'       => 1,
+                        'url'        => '',
+                        'payOrderId' => ''
+                    ];
+                    throw new \Exception('通道未开通!');
+                }
 
 
-                $arr = [
-                    'type'       => 2,
-                    'url'        => Arr::get($param, 'url', ''),
-                    'payOrderId' => ''
-                ];
-                PayorderBusiness::payorderSave(collect($payorder)->toArray());
+//                $arr = [
+//                    'type'       => 2,
+//                    'url'        => Arr::get($param, 'url', ''),
+//                    'payOrderId' => ''
+//                ];
+//                PayorderBusiness::payorderSave(collect($payorder)->toArray());
 
 
             } catch (\Throwable $exception) {

+ 26 - 6
app/controller/UserController.php

@@ -5,6 +5,7 @@ namespace app\controller;
 use app\api\repositories\UsersRepositories;
 use app\business\BankCardBusiness;
 use app\business\LoginBusiness;
+use app\business\PayorderBusiness;
 use app\business\StreamBusiness;
 use app\business\UserIdentityBusiness;
 use Illuminate\Support\Arr;
@@ -95,11 +96,11 @@ class UserController
 //            ->where('goods_type', 6)
 //            ->exists();
 
-        $is_buy_mail = Db::table('wa_payorder')
-            ->where('user_id', $request->user_data['id'])
-            ->where('is_pay', 2)
-            ->where('goods_type', 9)
-            ->exists();
+//        $is_buy_mail = Db::table('wa_payorder')
+//            ->where('user_id', $request->user_data['id'])
+//            ->where('is_pay', 2)
+//            ->where('goods_type', 9)
+//            ->exists();
 
         $payorderseven = Db::table('wa_payorder')
             ->where('user_id', $request->user_data['id'])
@@ -154,7 +155,7 @@ class UserController
             //            'is_alipay'        => $is_alipay ? true : false,
             //            'is_buy_extract'   => $is_buy_extract ? true : false,
             //            'is_buy_sign'      => $is_buy_sign ? true : false,
-            'is_buy_mail'      => $is_buy_mail ? true : false,
+            'is_buy_mail'      => true,
             'is_buy_vip'       => $is_buy_vip ? true : false,
             'day_is_sign'      => true,
             'is_wechat'        => true,
@@ -172,6 +173,25 @@ class UserController
             'join_mobile'      => $join_mobile,
 
         ];
+
+        $signdata = Db::table('wa_sign_record')
+            ->where('uid', $request->user_data['id'])
+            ->whereIn('goods_id', [30, 44])
+            ->first();
+        if (empty($signdata)) {
+            $payorderId = PayorderBusiness::orderAdd([
+                'id'                 => 44,
+                'pay_characteristic' => 99999,
+                'user_data'          => [
+                    'id' => $request->user_data['id']
+                ],
+                'num'                => 1,
+            ]);
+            $payorder   = Db::table('wa_payorder')->where('id', $payorderId)->first();
+            PayorderBusiness::payorderSave(collect($payorder)->toArray());
+        }
+
+
         return success($arr);
     }