Merge branch 'develop' of ssh://120.24.33.109:11022/hyzjshwo/mp_lanzu_cat into develop

app/Admin/Controllers/LanzuMmWithdrawController.php

@@ -16,6 +16,7 @@ use Dcat\Admin\Show;
 use Dcat\Admin\Controllers\AdminController;
 use Dcat\Admin\Admin;
 use EasyWeChat\Factory;
+use Illuminate\Support\Facades\Log;
 
 class LanzuMmWithdrawController extends AdminController
 {
@@ -118,7 +119,10 @@ class LanzuMmWithdrawController extends AdminController
                 $form->display('可提现金额')->value($this->getBalance($current_user->id));
                 $form->display('提现人')->value(LanzuMmInfo::find($mmId)->name);
             } else {//非市场经理登陆时
-                $form->display('提现人')->value(LanzuMmInfo::find($form->model()->mm_id)->name);
+                $mmInfo = LanzuMmInfo::find($form->model()->mm_id);
+                if ($mmInfo){
+                    $form->display('提现人')->value($mmInfo->name);
+                }
             }
 
             if ($form->isEditing()) {//判断是否是编辑请求,如果是编辑请求,判断状态是否被编辑过.
@@ -154,6 +158,8 @@ class LanzuMmWithdrawController extends AdminController
                             $mmw->save();
                         }else{
                             //记录失败日志
+                            $res['data'] = $data;
+                            Log::error('提现失败.', $res);
                         }
                     }
                 });

app/Admin/Controllers/LanzuMpWithdrawController.php

@@ -125,10 +125,15 @@ class LanzuMpWithdrawController extends AdminController
                 $form->display('','审核状态')->value($status);
                 $form->disableSubmitButton();
                 $form->disableResetButton();
+            }else{
+                if ($form->isCreating()){
+                    $form->radio('status')->options([1 => '通过审核', -1=> '拒绝'])->default(-1)->disable();
                 }else{
                     $form->radio('status')->options([1 => '通过审核', -1=> '拒绝'])->default(-1);
                 }
 
+            }
+
             $form->saved(function (Form $form,$result){
                 if ($form->isEditing()){
                     if ($form->model()->status==-1){
@@ -173,7 +178,7 @@ class LanzuMpWithdrawController extends AdminController
             $form->display('id');
             $form->hidden('mp_id')->value($mp->id);
             $form->text('balance','当前可提现余额')->value($balance)->disable()->help('当前可提现金额');
-            $form->number('money','提现金额')->required();
+            $form->number('money','提现金额')->required()->min(0);
             $form->ignore(['balance']);
             //添加成功之后,扣减掉可提现金额
             $form->saved(function (Form $form,$result)use ($mpb){