one_after 1 mēnesi atpakaļ
vecāks
revīzija
fad254844e

+ 138 - 138
app/business/GoodsBusiness.php

@@ -21,139 +21,6 @@
 
                 $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);
@@ -165,7 +32,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);
@@ -225,6 +91,7 @@
                     throw new \Exception('通道未开通!');
                 }
 
+
 //                $arr = [
 //                    'type'       => 2,
 //                    'url'        => Arr::get($param, 'url', ''),
@@ -232,22 +99,58 @@
 //                ];
 //                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 buyType3(array $param)
+        static public function buyType2(array $param)
         {
             try {
-                $payorderId = PayorderBusiness::CardorderTwoAdd($param);
+                $payorderId = PayorderBusiness::CardorderAdd($param);
 
                 $payorder = Db::table('wa_payorder')->where('id', $payorderId)->first();
 
@@ -262,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);
@@ -336,6 +240,102 @@
         }
 
 
+        /** 预存支付
+         * @param array $param
+         * @return void
+         */
+        static public function buyType3(array $param)
+        {
+            try {
+                $payorderId = PayorderBusiness::CardorderTwoAdd($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;
+
+        }
+
+
         /** 缴纳支付
          * @param array $param
          * @return void

+ 4 - 2
app/business/PayorderBusiness.php

@@ -190,7 +190,7 @@ class PayorderBusiness
                 throw new \Exception('产品不存在!');
             }
 
-            $paygoods = Db::table('wa_goods')->where('id', $goods->rebate_four)->first();
+            $paygoods = Db::table('wa_goods')->where('id', $goods->rebate_five)->first();
             if (empty($paygoods)) {
                 throw new \Exception('产品不存在!');
             }
@@ -666,7 +666,9 @@ class PayorderBusiness
             }elseif ($goodsData->type == 13) {
 
             }elseif ($goodsData->type == 14) {
-
+                Db::table('wa_sign_record')
+                    ->where('id', $data['sign_record_id'])
+                    ->update(['is_shuzizhengshu' => 1, 'updated_at' => date('Y-m-d H:i:s')]);
             }
 
             /** 新增消费数据 */

+ 9 - 4
app/controller/GoodsController.php

@@ -322,9 +322,9 @@ class GoodsController
                     ->where('is_pay', 2)
                     ->where('goods_type', 12)
                     ->first();
-                if($is_buy_vip){
+                if ($is_buy_vip) {
                     $status_name = '顺丰同城快递配送中,待签收';
-                }else{
+                } else {
                     $status_name = '加入高级股东即可配送';
                 }
 
@@ -347,15 +347,19 @@ class GoodsController
                     ->where('id', $wa_goods->rebate_four)
                     ->value('pay_price');
 
+                $shuzizhengshu_price = Db::table('wa_goods')
+                    ->where('id', $wa_goods->rebate_five)
+                    ->value('pay_price');
+
                 $arr[] = [
                     'good_name'          => $wa_goods->name,
                     'describe'           => $wa_goods->describe,
                     'square'             => $wa_goods->square,
-                    'pay_price'          => $wa_goods->pay_price,
+                    'pay_price'          => $shuzizhengshu_price,
                     'insure_price'       => $wa_goods->insure_price,
                     'prestore_price'     => $wa_goods->prestore_price,
                     'jiaona_price'       => $pay_goods->pay_price,
-                    'zichanxian_price'   => $zichanxian_price,
+                    'zichanxian_price'   => $shuzizhengshu_price,
                     'bonus'              => $wa_goods->bonus,
                     'balance'            => $wa_goods->balance,
                     'gift_money'         => $wa_goods->gift_money,
@@ -379,6 +383,7 @@ class GoodsController
                     'docking_id'         => $docking_goods->id,
                     'docking_pay_price'  => $docking_goods->pay_price,
                     'is_buy_docking'     => $is_buy_docking ? true : false,
+                    'is_shuzizhengshu'   => $v->is_shuzizhengshu,
                 ];
 
             }

+ 3 - 0
plugin/admin/app/controller/PayorderController.php

@@ -149,6 +149,9 @@
                 if($goodslist->type==11){
                     $goods_name = '投保资产险 -- '.$goodslist->square;
                 }
+                if($goodslist->type==14){
+                    $goods_name = '数字证书 -- '.$goodslist->square;
+                }
 
                 $arr[] = [
                     'bid_name'                => $goods_name,