From dbe82dd823c06c012ab37c8a4017e328deb79aa7 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Mon, 14 Sep 2020 15:19:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E7=AB=99=E7=82=B9=E6=8F=90?=
 =?UTF-8?q?=E7=8E=B0=E8=AE=A2=E5=8D=95=E5=8F=B7=E4=BD=BF=E7=94=A8uniqid()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Common/WxPay.php                         |  9 +--------
 .../Controllers/LanzuCsWithdrawController.php      | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/Admin/Common/WxPay.php b/app/Admin/Common/WxPay.php
index ae1a395..aa27733 100644
--- a/app/Admin/Common/WxPay.php
+++ b/app/Admin/Common/WxPay.php
@@ -31,15 +31,8 @@ class WxPay
         return $res;
     }
 
-    public static function pay($model,$form)
+    public static function pay($data)
     {
-        $data                     = [];
-        $user                     = ImsCjdcUser::find($model->user_id);
-        $data['openid']           = $user->openid;
-        $data['amount']           = $form->model()->money * 100;
-        $data['partner_trade_no'] = $form->model()->id;
-        $data['re_user_name']     = $model->name;
-        $data['desc']             = $model->name;
         return self::transfers($data);
     }
 }
diff --git a/app/Admin/Controllers/LanzuCsWithdrawController.php b/app/Admin/Controllers/LanzuCsWithdrawController.php
index 558b5de..9b1cb03 100644
--- a/app/Admin/Controllers/LanzuCsWithdrawController.php
+++ b/app/Admin/Controllers/LanzuCsWithdrawController.php
@@ -6,6 +6,7 @@ use App\Admin\Common\WxPay;
 use App\Admin\Repositories\LanzuCsWithdraw;
 use App\Models\FinancialRecord;
 use App\Models\FinancialRecord0;
+use App\Models\ImsCjdcUser;
 use App\Models\LanzuCsInfo;
 use App\Models\LanzuUserBalance;
 use app\Request;
@@ -145,7 +146,15 @@ class LanzuCsWithdrawController extends AdminController
                         if (!$csInfo) {
                             return $form->error('社区站点不存在或已删除');
                         }
-                        $res = WxPay::pay($csInfo, $form);
+                        
+                        $data                     = [];
+                        $user                     = ImsCjdcUser::find($csInfo->user_id);
+                        $data['openid']           = $user->openid;
+                        $data['amount']           = $form->model()->money * 100;
+                        $data['partner_trade_no'] = uniqid();
+                        $data['re_user_name']     = $csInfo->name;
+                        $data['desc']             = $csInfo->name;
+                        $res = WxPay::pay($data);
                         if ($res['result_code'] == "SUCCESS") {//更新到账状态
                             DB::transaction(function () use ($csInfo, $form) {
                                 $csw         = modelCsWithdraw::find($form->model()->id);
@@ -184,6 +193,9 @@ class LanzuCsWithdrawController extends AdminController
                             });
 
                             //记录失败日志
+                            $res['w_id'] = $form->model()->id;
+                            $res['time'] = date('Y-m-d H:i:s',time());
+                            $res['data'] = $data;
                             Log::error('提现失败.', $res);
                             return $form->error($res['err_code_des']);
                         }