From 71c12000b1b726dbaec230f624a4d4599b542ac9 Mon Sep 17 00:00:00 2001
From: lanzu_qsy <334039090@qq.com>
Date: Wed, 26 Aug 2020 18:03:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/LanzuCsInfoController.php     | 11 +++++++++++
 app/Admin/Controllers/LanzuCsWithdrawController.php |  6 ++++--
 app/Admin/Controllers/LanzuFinancialRecord.php      |  6 ++++--
 app/Models/LanzuUserBalance.php                     |  2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/Admin/Controllers/LanzuCsInfoController.php b/app/Admin/Controllers/LanzuCsInfoController.php
index dd8266d..9e05535 100644
--- a/app/Admin/Controllers/LanzuCsInfoController.php
+++ b/app/Admin/Controllers/LanzuCsInfoController.php
@@ -10,6 +10,7 @@ use App\Models\AdminUsers;
 use App\Models\FinancialRecord;
 use App\Models\ImsCjdcMarket;
 use App\Models\ImsCjdcUser;
+use App\Models\LanzuCsWithdraw;
 use App\Models\LanzuUserBalance;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
@@ -148,11 +149,21 @@ class LanzuCsInfoController extends AdminController
                     if ($adu){
                         $adu->delete();
                     }
+
                     //删除提现余额
                     $lb = LanzuUserBalance::where('source_id',$val['admin_user_id'])->first();
                     if ($lb){
                         $lb->delete();
                     }
+
+                    //软删除提现申请
+                    LanzuCsWithdraw::where('cs_id',$val['id'])->update(['deleted_at'=>time()]);
+
+
+                    //删除流水
+                    $fr = FinancialRecord::getFinancialRecordModel($val['admin_user_id']);
+                    $fr::where('user_id',$val['admin_user_id'])->delete();
+
                 }
 
             });
diff --git a/app/Admin/Controllers/LanzuCsWithdrawController.php b/app/Admin/Controllers/LanzuCsWithdrawController.php
index 0e9cab7..c9f92a1 100644
--- a/app/Admin/Controllers/LanzuCsWithdrawController.php
+++ b/app/Admin/Controllers/LanzuCsWithdrawController.php
@@ -25,9 +25,9 @@ class LanzuCsWithdrawController extends AdminController
      */
     protected function grid()
     {
-
         return Grid::make(new LanzuCsWithdraw('csInfo'), function (Grid $grid) {
             $user = Admin::user();
+            $grid->model()->orderBy('id','desc');
             if (!$user->isRole('lanzu_cs')) {//如果不是社区站点的角色登陆,则隐藏提现入口
                 $grid->disableCreateButton();
                 $grid->actions(function (Grid\Displayers\Actions $actions) use ($grid) {
@@ -106,6 +106,8 @@ class LanzuCsWithdrawController extends AdminController
                             }
                         });
                     }
+                    $form->disableEditingCheck();
+                    $form->disableViewCheck();
                 }
 
                 $form->saved(function () use ($cs, $form) {//扣减提现金额
@@ -156,7 +158,7 @@ class LanzuCsWithdrawController extends AdminController
                             $model->desc       = '社区站点提现';
                             $model->comment    = '社区站点提现';
                             $model->save();
-                            
+
                         } else {
                             //记录失败日志
                             Log::error('提现失败.', $res);
diff --git a/app/Admin/Controllers/LanzuFinancialRecord.php b/app/Admin/Controllers/LanzuFinancialRecord.php
index ba340ed..f0b249b 100644
--- a/app/Admin/Controllers/LanzuFinancialRecord.php
+++ b/app/Admin/Controllers/LanzuFinancialRecord.php
@@ -20,9 +20,11 @@ class LanzuFinancialRecord extends AdminController
     {
         $adu     = Admin::user();
         $builder = new FinancialRecord0();
+        $builder = $builder::where('user_type',4);
+
         if ($adu->isRole('lanzu_cs')) {
             $fr      = FinancialRecord::getFinancialRecordModel($adu->id);
-            $builder = $fr;
+            $builder = $fr->where('user_id',$adu->id);
         } else {
             $param = \Request::get('user_id');
             if ($param) {
@@ -31,7 +33,7 @@ class LanzuFinancialRecord extends AdminController
             }
         }
 
-        return Grid::make($builder::where('user_type',4), function (Grid $grid) use ($adu) {
+        return Grid::make($builder, function (Grid $grid) use ($adu) {
             $grid->id;
             $grid->user_id('用户')->display(function () {
                 if ($this->user_type == 1) {
diff --git a/app/Models/LanzuUserBalance.php b/app/Models/LanzuUserBalance.php
index c9b5b41..6225f2e 100644
--- a/app/Models/LanzuUserBalance.php
+++ b/app/Models/LanzuUserBalance.php
@@ -72,6 +72,6 @@ class LanzuUserBalance extends Model
      */
     public static function checkBalance($aduid,$money)
     {
-        return self::where('source_id',$aduid)->where('balance','>',$money)->count();
+        return self::where('source_id',$aduid)->where('balance','>=',$money)->count();
     }
 }