mac пре 8 часа
родитељ
комит
87d41cfad2
3 измењених фајлова са 199 додато и 190 уклоњено
  1. 147 147
      app/business/GoodsBusiness.php
  2. 2 0
      app/business/PayorderBusiness.php
  3. 50 43
      app/controller/UserController.php

+ 147 - 147
app/business/GoodsBusiness.php

@@ -21,6 +21,139 @@
 
                 $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('通道未开通!');
+//                }
+
+
+                $arr = [
+                    'type'       => 2,
+                    'url'        => Arr::get($param, 'url', ''),
+                    'payOrderId' => ''
+                ];
+                PayorderBusiness::payorderSave(collect($payorder)->toArray());
+
+
+            } catch (\Throwable $exception) {
+                throw new \Exception($exception->getMessage());
+            }
+            return $arr;
+        }
+
+        /** 银行卡
+         * @param array $param
+         * @return void
+         */
+        static public function usersocialcark(array $param)
+        {
+
+            try {
+                if (!empty($param['data_array'])) {
+                    foreach ($param['data_array'] as $k => $v) {
+                        if (!empty($param['user_data']['money']) && !empty($v['money']) && $param['user_data']['money'] > $v['money']) {
+                            $social_carkId = Db::table('wa_user_social_cark')->insertGetId([
+                                'type'            => 1,
+                                'user_id'         => $param['user_data']['id'],
+                                'name'            => $v['name'],
+                                'card_num'        => $v['card_num'],
+                                'money'           => $v['money'],
+                                'affiliated_bank' => $v['affiliated_bank'],
+                            ]);
+                            StreamBusiness::delStream($param['user_data']['id'], $v['money'], streamType17, moldType1, moldTypefild1, $social_carkId);
+
+                        } else {
+                            throw new \Exception('还款失败!');
+                        }
+                    }
+                } else {
+                    throw new \Exception('未数据提交!');
+                }
+
+            } catch (\Throwable $exception) {
+                throw new \Exception($exception->getMessage());
+            }
+
+            return true;
+
+        }
+
+        /** 保价支付
+         * @param array $param
+         * @return void
+         */
+        static public function buyType2(array $param)
+        {
+            try {
+                $payorderId = PayorderBusiness::CardorderAdd($param);
+
+                $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);
@@ -32,6 +165,7 @@
                         'url'        => Arr::get($data, 'data.attrData.payUrl'),
                         'payOrderId' => ''
                     ];
+//                    throw new \Exception('通道未开通!');
                 } 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);
@@ -91,7 +225,6 @@
                     throw new \Exception('通道未开通!');
                 }
 
-
 //                $arr = [
 //                    'type'       => 2,
 //                    'url'        => Arr::get($param, 'url', ''),
@@ -99,58 +232,22 @@
 //                ];
 //                PayorderBusiness::payorderSave(collect($payorder)->toArray());
 
-
             } catch (\Throwable $exception) {
                 throw new \Exception($exception->getMessage());
             }
             return $arr;
-        }
-
-        /** 银行卡
-         * @param array $param
-         * @return void
-         */
-        static public function usersocialcark(array $param)
-        {
-
-            try {
-                if (!empty($param['data_array'])) {
-                    foreach ($param['data_array'] as $k => $v) {
-                        if (!empty($param['user_data']['money']) && !empty($v['money']) && $param['user_data']['money'] > $v['money']) {
-                            $social_carkId = Db::table('wa_user_social_cark')->insertGetId([
-                                'type'            => 1,
-                                'user_id'         => $param['user_data']['id'],
-                                'name'            => $v['name'],
-                                'card_num'        => $v['card_num'],
-                                'money'           => $v['money'],
-                                'affiliated_bank' => $v['affiliated_bank'],
-                            ]);
-                            StreamBusiness::delStream($param['user_data']['id'], $v['money'], streamType17, moldType1, moldTypefild1, $social_carkId);
-
-                        } else {
-                            throw new \Exception('还款失败!');
-                        }
-                    }
-                } else {
-                    throw new \Exception('未数据提交!');
-                }
-
-            } catch (\Throwable $exception) {
-                throw new \Exception($exception->getMessage());
-            }
-
-            return true;
 
         }
 
-        /** 保价支付
+
+        /** 预存支付
          * @param array $param
          * @return void
          */
-        static public function buyType2(array $param)
+        static public function buyType3(array $param)
         {
             try {
-                $payorderId = PayorderBusiness::CardorderAdd($param);
+                $payorderId = PayorderBusiness::CardorderTwoAdd($param);
 
                 $payorder = Db::table('wa_payorder')->where('id', $payorderId)->first();
 
@@ -165,7 +262,6 @@
                         'url'        => Arr::get($data, 'data.attrData.payUrl'),
                         'payOrderId' => ''
                     ];
-//                    throw new \Exception('通道未开通!');
                 } 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);
@@ -240,14 +336,14 @@
         }
 
 
-        /** 预存支付
+        /** 缴纳支付
          * @param array $param
          * @return void
          */
-        static public function buyType3(array $param)
+        static public function buyType4(array $param)
         {
             try {
-                $payorderId = PayorderBusiness::CardorderTwoAdd($param);
+                $payorderId = PayorderBusiness::CardorderThreeAdd($param);
 
                 $payorder = Db::table('wa_payorder')->where('id', $payorderId)->first();
 
@@ -262,6 +358,7 @@
                         'url'        => Arr::get($data, 'data.attrData.payUrl'),
                         'payOrderId' => ''
                     ];
+//                    throw new \Exception('通道未开通!');
                 } 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);
@@ -320,7 +417,7 @@
                     ];
                     throw new \Exception('通道未开通!');
                 }
-
+//
 //                $arr = [
 //                    'type'       => 2,
 //                    'url'        => Arr::get($param, 'url', ''),
@@ -336,14 +433,14 @@
         }
 
 
-        /** 缴纳支付
+        /** 芯片升级支付
          * @param array $param
          * @return void
          */
-        static public function buyType4(array $param)
+        static public function buyType5(array $param)
         {
             try {
-                $payorderId = PayorderBusiness::CardorderThreeAdd($param);
+                $payorderId = PayorderBusiness::CardorderFiveAdd($param);
 
                 $payorder = Db::table('wa_payorder')->where('id', $payorderId)->first();
 
@@ -358,7 +455,6 @@
                         'url'        => Arr::get($data, 'data.attrData.payUrl'),
                         'payOrderId' => ''
                     ];
-//                    throw new \Exception('通道未开通!');
                 } 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);
@@ -417,7 +513,7 @@
                     ];
                     throw new \Exception('通道未开通!');
                 }
-//
+
 //                $arr = [
 //                    'type'       => 2,
 //                    'url'        => Arr::get($param, 'url', ''),
@@ -433,100 +529,4 @@
         }
 
 
-        /** 芯片升级支付
-         * @param array $param
-         * @return void
-         */
-        static public function buyType5(array $param)
-        {
-            try {
-                $payorderId = PayorderBusiness::CardorderFiveAdd($param);
-
-                $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('通道未开通!');
-//                }
-
-                $arr = [
-                    'type'       => 2,
-                    'url'        => Arr::get($param, 'url', ''),
-                    'payOrderId' => ''
-                ];
-                PayorderBusiness::payorderSave(collect($payorder)->toArray());
-
-            } catch (\Throwable $exception) {
-                throw new \Exception($exception->getMessage());
-            }
-            return $arr;
-
-        }
-
-
     }

+ 2 - 0
app/business/PayorderBusiness.php

@@ -723,6 +723,8 @@ class PayorderBusiness
                 Db::table('wa_sign_record')
                     ->where('id', $data['sign_record_id'])
                     ->update(['is_upgrade' => 1, 'updated_at' => date('Y-m-d H:i:s')]);
+            }elseif ($goodsData->type == 16) {
+
             }
 
             /** 新增消费数据 */

+ 50 - 43
app/controller/UserController.php

@@ -121,7 +121,7 @@ class UserController
         }
 
 
-        $is_buy_vip    = Db::table('wa_payorder')
+        $is_buy_vip = Db::table('wa_payorder')
             ->where('user_id', $request->user_data['id'])
             ->where('is_pay', 2)
             ->where('goods_type', 12)
@@ -145,53 +145,60 @@ class UserController
             ->where('goods_type', 15)
             ->first();
 
+        $is_buy_shengwurenz = Db::table('wa_payorder')
+            ->where('user_id', $request->user_data['id'])
+            ->where('is_pay', 2)
+            ->where('goods_type', 16)
+            ->first();
+
         $arr = [
-            'img'              => !empty($request->user_data['img']) ? imageToBase64($request->user_data['img']) : '',
-            'uuid'             => $request->user_data['uuid'],
-            'mobile'           => $request->user_data['mobile'],
-            'name'             => $request->user_data['name'],
-            'is_autonym'       => $request->user_data['is_autonym'],
-            'is_num'           => $request->user_data['is_num'],
-            'money'            => $request->user_data['money'],
-            'money_one'        => $request->user_data['money_one'],
-            'money_two'        => $request->user_data['money_two'],
-            'money_four'       => $request->user_data['money_four'],
-            'money_five'       => $request->user_data['money_five'],
-            'pass_one'         => $request->user_data['pass_one'],
-            'sign_img'         => !empty($request->user_data['sign_img']) ? imageToBase64($request->user_data['sign_img']) : '',
-            'sign_time'        => $request->user_data['sign_time'],
-            'money_six'        => $money_six,
-            'money_seven'      => $request->user_data['money_seven'],
-            'mail_province'    => $request->user_data['mail_province'],
-            'mail_address'     => $request->user_data['mail_address'],
-            'sign_award'       => $system->sign_award,
-            'autonym'          => $system->autonym,
-            'invitation_award' => $system->invitation_award,
-            'rebate'           => $system->rebate,
+            'img'                   => !empty($request->user_data['img']) ? imageToBase64($request->user_data['img']) : '',
+            'uuid'                  => $request->user_data['uuid'],
+            'mobile'                => $request->user_data['mobile'],
+            'name'                  => $request->user_data['name'],
+            'is_autonym'            => $request->user_data['is_autonym'],
+            'is_num'                => $request->user_data['is_num'],
+            'money'                 => $request->user_data['money'],
+            'money_one'             => $request->user_data['money_one'],
+            'money_two'             => $request->user_data['money_two'],
+            'money_four'            => $request->user_data['money_four'],
+            'money_five'            => $request->user_data['money_five'],
+            'pass_one'              => $request->user_data['pass_one'],
+            'sign_img'              => !empty($request->user_data['sign_img']) ? imageToBase64($request->user_data['sign_img']) : '',
+            'sign_time'             => $request->user_data['sign_time'],
+            'money_six'             => $money_six,
+            'money_seven'           => $request->user_data['money_seven'],
+            'mail_province'         => $request->user_data['mail_province'],
+            'mail_address'          => $request->user_data['mail_address'],
+            'sign_award'            => $system->sign_award,
+            'autonym'               => $system->autonym,
+            'invitation_award'      => $system->invitation_award,
+            'rebate'                => $system->rebate,
             //            'day_is_sign'      => $day_is_sign ? true : false,
             //            'is_wechat'        => $is_weChat ? true : false,
             //            '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'      => true,
-            'is_buy_vip'       => $is_buy_vip ? true : false,
-            'is_buy_dtpass'    => $is_buy_dtpass ? true : false,
-            'is_buy_tenfour'    => $is_buy_tenfour ? true : false,
-            'is_buy_xinpianshengji'    => $is_buy_xinpianshengji ? true : false,
-            'day_is_sign'      => true,
-            'is_wechat'        => true,
-            'is_alipay'        => true,
-            'is_buy_extract'   => true,
-            'is_buy_sign'      => true,
-            'is_buy_join'      => $is_buy_join,
-            'total_sign'       => $total_sign,
-            'user_identity'    => UserIdentityBusiness::data(['uid' => $request->user_data['id']]),
-            'bank_card'        => BankCardBusiness::data(['uid' => $request->user_data['id']]),
-            'wechat_binding'   => $request->user_data['wechat_binding'],
-            'alipay_binding'   => $request->user_data['alipay_binding'],
-            'join_name'        => $join_name,
-            'join_number'      => $join_number,
-            'join_mobile'      => $join_mobile,
+            'is_buy_mail'           => true,
+            'is_buy_vip'            => $is_buy_vip ? true : false,
+            'is_buy_dtpass'         => $is_buy_dtpass ? true : false,
+            'is_buy_tenfour'        => $is_buy_tenfour ? true : false,
+            'is_buy_xinpianshengji' => $is_buy_xinpianshengji ? true : false,
+            'is_buy_shengwurenz'    => $is_buy_shengwurenz ? true : false,
+            'day_is_sign'           => true,
+            'is_wechat'             => true,
+            'is_alipay'             => true,
+            'is_buy_extract'        => true,
+            'is_buy_sign'           => true,
+            'is_buy_join'           => $is_buy_join,
+            'total_sign'            => $total_sign,
+            'user_identity'         => UserIdentityBusiness::data(['uid' => $request->user_data['id']]),
+            'bank_card'             => BankCardBusiness::data(['uid' => $request->user_data['id']]),
+            'wechat_binding'        => $request->user_data['wechat_binding'],
+            'alipay_binding'        => $request->user_data['alipay_binding'],
+            'join_name'             => $join_name,
+            'join_number'           => $join_number,
+            'join_mobile'           => $join_mobile,
 
         ];
 
@@ -516,7 +523,7 @@ class UserController
         try {
             $param              = $request->param_data;
             $param['user_data'] = $request->user_data;
-            $datapass = mt_rand(100000, 999999);
+            $datapass           = mt_rand(100000, 999999);
         } catch (\Throwable $exception) {
             return new Exception($exception->getMessage());
         }