Merge branch 'qs_local_mp' into develop

app/Admin/Controllers/LanzuMmInfoController.php

@@ -50,7 +50,7 @@ class LanzuMmInfoController extends AdminController
                 return $market->name;
             });
             $grid->column('可提现金额')->display(function () {
-                return MpBalance::getBalance($this->admin_user_id, 2);
+                return MpBalance::getBalance($this->admin_user_id, Type::BALANCE_USER_TYPE_MM);
             });
             $grid->id_frond->image('', 50, 50);
             $grid->id_back->image('', 50, 50);
@@ -120,6 +120,7 @@ class LanzuMmInfoController extends AdminController
     protected function form()
     {
         return Form::make(new LanzuMmInfo(), function (Form $form) {
+
             $form->display('id');
             $form->text('user_id', '懒ID')->placeholder('对应懒族小程序个人中心的懒ID')->required();
             $form->text('name')->required();
@@ -132,7 +133,7 @@ class LanzuMmInfoController extends AdminController
             $form->saved(function (Form $form, $mmid) {
                 $model = new mmInfo();
                 if ($form->isCreating()) {
-                    $res = Auth::addAdminUser($form, $model, $mmid, 'lanzu_mm',2);
+                    $res = Auth::addAdminUser($form, $model, $mmid, 'lanzu_mm', Type::BALANCE_USER_TYPE_MM);
                     if ($res == -1) {
                         return $form->error('该手机号作为登陆帐号已存在!');
                     } elseif ($res == -2) {
@@ -149,6 +150,11 @@ class LanzuMmInfoController extends AdminController
                     $ad->save();
                 }
             });
+            $form->deleted(function (Form $form, $result) {
+                $ids = array_column($form->model()->toArray(), 'admin_user_id');
+                //删除对应的登陆帐号
+                AdminUsers::whereIn('id', $ids)->delete();
+            });
         });
     }
 

app/Admin/Controllers/LanzuMmWithdrawController.php

@@ -25,6 +25,7 @@ class LanzuMmWithdrawController extends AdminController
      * Make a grid builder.
      * @return Grid
      */
+
     protected function grid()
     {
         $user   = Admin::user();
@@ -151,14 +152,14 @@ class LanzuMmWithdrawController extends AdminController
                         ->default(0)->disable();
                 } else {
                     $form->radio('status', '状态')
-                        ->options([1 => '已同意', -1 => '已拒绝']);
+                        ->options([1 => '同意', -1 => '拒绝']);
 
                 }
                 $form->saved(function (Form $form) use ($mmId) {
                     $mm = LanzuMmInfo::find($mmId);
                     if ($form->status == -1) {
                         //如果提现申请被拒绝,返回提现金额
-                        MpBalance::returnBalance($mm->admin_user_id, 0, $form->model()->money);
+                        MpBalance::returnBalance($mm->admin_user_id, Type::BALANCE_USER_TYPE_MM, $form->model()->money);
                     } elseif ($form->status == 1) {
                         //调用微信企业付
                         $data                     = [];
@@ -177,10 +178,10 @@ class LanzuMmWithdrawController extends AdminController
                             //添加流水记录
                             $adminUserId = $mm->admin_user_id;
                             $money       = $form->model()->money;
-                            FinancialRecord::addFinancialRecord($adminUserId, 3, $money, 103, '市场经理提现', '市场经理提现');
+                            FinancialRecord::addFinancialRecord($adminUserId, Type::BALANCE_USER_TYPE_MM, $money, 103, '市场经理提现', '市场经理提现');
                         } else {
                             //如果提现失败,返回提现金额
-                            MpBalance::returnBalance($mm->admin_user_id, 0, $form->model()->money);
+                            MpBalance::returnBalance($mm->admin_user_id, Type::BALANCE_USER_TYPE_MM, $form->model()->money);
 
                             //记录失败日志
                             $res['data'] = $data;
@@ -203,7 +204,7 @@ class LanzuMmWithdrawController extends AdminController
                     if ($form->isCreating()) {
                         if ($result) {
                             $mm = LanzuMmInfo::find($mmId);
-                            MpBalance::reduceBalance($mm->admin_user_id, 2, $form->money);
+                            MpBalance::reduceBalance($mm->admin_user_id, 3, $form->money);
                         }
                     }
                 });

app/Admin/Controllers/LanzuMpInfoController.php

@@ -44,7 +44,7 @@ class LanzuMpInfoController extends AdminController
                 $actions->row->id;
             });
             $grid->column('可提现金额')->display(function () {
-                return MpBalance::getBalance($this->admin_user_id, 1);
+                return MpBalance::getBalance($this->admin_user_id, Type::BALANCE_USER_TYPE_MP);
             });
             $grid->id_frond->image('', 50, 50);
             $grid->id_back->image('', 50, 50);
@@ -121,7 +121,7 @@ class LanzuMpInfoController extends AdminController
             $form->saved(function (Form $form, $mpid) {
                 $model = new mpInfo();
                 if ($form->isCreating()) {
-                    $res = Auth::addAdminUser($form, $model, $mpid, 'lanzu_mp',1);
+                    $res = Auth::addAdminUser($form, $model, $mpid, 'lanzu_mp',Type::BALANCE_USER_TYPE_MP);
                     if ($res == -1) {
                         return $form->error('该手机号作为登陆帐号已存在!');
                     } elseif ($res == -2) {
@@ -138,6 +138,11 @@ class LanzuMpInfoController extends AdminController
                     $ad->save();
                 }
             });
+            $form->deleted(function (Form $form, $result) {
+                $ids = array_column($form->model()->toArray(), 'admin_user_id');
+                //删除对应的登陆帐号
+                AdminUsers::whereIn('id', $ids)->delete();
+            });
         });
     }
 

app/Admin/Controllers/LanzuMpWithdrawController.php

@@ -102,7 +102,6 @@ class LanzuMpWithdrawController extends AdminController
     {
         //管理员或者lanzu_bis操作
         return Form::make(new LanzuMpWithdraw(['mpInfo']), function (Form $form) {
-
             $form->footer(function ($footer) {
                 // 去掉`查看`checkbox
                 $footer->disableViewCheck();
@@ -147,19 +146,18 @@ class LanzuMpWithdrawController extends AdminController
                 } else {
                     $form->radio('status')->options([1 => '通过审核', -1 => '拒绝'])->default(-1);
                 }
-
             }
 
             $form->saved(function (Form $form, $result) {
-                if ($form->isEditing()) {
-                    if ($form->model()->status == -1) {
-                        //如果服务商提现审核被拒绝,退回服务商的提现金额
-                        MpBalance::returnBalance($form->model()->mp_id, 1, $form->model()->money);
-                    }elseif ($form->status==1){
                 $adminUserId = $form->model()->mp_info['admin_user_id'];
                 $money       = $form->model()->money;
+                if ($form->isEditing()) {
+                    if ($form->status == -1) {
+                        //如果服务商提现审核被拒绝,退回服务商的提现金额
+                        MpBalance::returnBalance($adminUserId, Type::BALANCE_USER_TYPE_MP, $money);
+                    } elseif ($form->status == 1) {
                         //如果审核通过,则记录流水
-                        FinancialRecord::addFinancialRecord($adminUserId,2,$money,102,'服务商提现','服务商提现');
+                        FinancialRecord::addFinancialRecord($adminUserId, Type::BALANCE_USER_TYPE_MP, $money, 102, '服务商提现', '服务商提现');
                     }
                 }
             });

app/Admin/Controllers/Type.php

@@ -0,0 +1,38 @@
+<?php
+
+
+namespace App\Admin\Controllers;
+
+
+class Type
+{
+    /**
+     * 流水类型，大的分类，<100是奖励分账等收入项 >=100是提现消费等支出项
+     */
+    const MONEY_TYPE_CS_PLAT_NEW_USER  = 1; // 社区服务点新用户奖励（线上订单完成）
+    const MONEY_TYPE_CS_FIRST_ORDER    = 2; // 社区服务点新用户线上首单奖励（线上订单完成）
+    const MONEY_TYPE_CS_OL_ORDER       = 3; // 社区服务点用户线上订单分账（线上订单完成）
+    const MONEY_TYPE_STORE_PLAT_NEW_USER    = 4; // 商户平台新用户奖励
+    const MONEY_TYPE_STORE_FIRST_ORDER      = 5; // 商户当日首单奖励
+    const MONEY_TYPE_STORE_OL_ORDER_COMP    = 6; // 商户线上订单完成收入
+    const MONEY_TYPE_STORE_OFL_ORDER_COMP   = 7; // 商户线下订单完成收入
+    const MONEY_TYPE_USER_OL_ORDER_REFUND   = 8; // 用户线上订单退款
+    const MONEY_TYPE_MM_PLAT_NEW_USER       = 9; // 市场经理发展新用户
+    const MONEY_TYPE_MM_PLAT_NEW_STORE      = 10; // 市场经理发展新商户
+    const MONEY_TYPE_MP_PLAT_NEW_USER       = 11; // 服务商发展新用户
+    const MONEY_TYPE_MP_PLAT_NEW_STORE      = 12; // 服务商发展新商户
+    const MONEY_TYPE_MP_OL_ORDER            = 13; // 服务商线上订单分账（线上订单完成）
+
+    const MONEY_TYPE_USER_OFL_ORDER         = 100; // 用户线下支付订单
+    const MONEY_TYPE_USER_OL_ORDER          = 101; // 用户线上支付订单
+
+
+    /**
+     * lanzu_user_balance 提现类型
+     */
+    const  BALANCE_USER_TYPE_U = 1; //用户提现类型
+    const  BALANCE_USER_TYPE_MP = 2; //服务商提现类型
+    const  BALANCE_USER_TYPE_MM = 3; //市场经理提现类型
+    const  BALANCE_USER_TYPE_CS = 4; //社区提现类型
+    const  BALANCE_USER_TYPE_STORE= 5; //商户提现类型
+}

app/Models/AdminUsers.php

@@ -3,6 +3,7 @@
 
 namespace App\Models;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 
 class AdminUsers extends Model

app/Models/LanzuMmInfo.php

@@ -6,10 +6,12 @@ use Dcat\Admin\Admin;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class LanzuMmInfo extends Model
 {
 	use HasDateTimeFormatter;
+	use SoftDeletes;
     protected $table = 'lanzu_mm_info';
     protected $dateFormat = 'U';