From 67507a96987b6f81ef5d2743359e67468f0b9091 Mon Sep 17 00:00:00 2001 From: lanzu_qsy <334039090@qq.com> Date: Tue, 1 Sep 2020 17:08:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=95=86=E6=8F=90=E7=8E=B0=E8=A2=AB=E6=8B=92=E7=BB=9D=E6=97=B6?= =?UTF-8?q?=20=E6=8F=90=E7=8E=B0=E9=87=91=E9=A2=9D=E6=9C=AA=E8=BF=94?= =?UTF-8?q?=E8=BF=98=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/LanzuMpWithdrawController.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/Admin/Controllers/LanzuMpWithdrawController.php b/app/Admin/Controllers/LanzuMpWithdrawController.php index 6d95ac0..0a02083 100755 --- a/app/Admin/Controllers/LanzuMpWithdrawController.php +++ b/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(); @@ -151,13 +150,13 @@ class LanzuMpWithdrawController extends AdminController } $form->saved(function (Form $form, $result) { + $adminUserId = $form->model()->mp_info['admin_user_id']; + $money = $form->model()->money; if ($form->isEditing()) { - if ($form->model()->status == -1) { + if ($form->status == -1) { //如果服务商提现审核被拒绝,退回服务商的提现金额 - MpBalance::returnBalance($form->model()->mp_id, 1, $form->model()->money); + MpBalance::returnBalance($adminUserId, 1, $money); }elseif ($form->status==1){ - $adminUserId = $form->model()->mp_info['admin_user_id']; - $money = $form->model()->money; //如果审核通过,则记录流水 FinancialRecord::addFinancialRecord($adminUserId,2,$money,102,'服务商提现','服务商提现'); } From 65f2a2b3d4c91f4c266ea4fa8e9f77bfe4218c64 Mon Sep 17 00:00:00 2001 From: lanzu_qsy <334039090@qq.com> Date: Tue, 1 Sep 2020 18:05:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/LanzuMmInfoController.php | 4 +- .../Controllers/LanzuMmWithdrawController.php | 11 +++--- .../Controllers/LanzuMpInfoController.php | 4 +- .../Controllers/LanzuMpWithdrawController.php | 4 +- app/Admin/Controllers/Type.php | 38 +++++++++++++++++++ 5 files changed, 50 insertions(+), 11 deletions(-) create mode 100644 app/Admin/Controllers/Type.php diff --git a/app/Admin/Controllers/LanzuMmInfoController.php b/app/Admin/Controllers/LanzuMmInfoController.php index 5c0cb1b..0681a45 100644 --- a/app/Admin/Controllers/LanzuMmInfoController.php +++ b/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); @@ -132,7 +132,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) { diff --git a/app/Admin/Controllers/LanzuMmWithdrawController.php b/app/Admin/Controllers/LanzuMmWithdrawController.php index e742082..2e59808 100644 --- a/app/Admin/Controllers/LanzuMmWithdrawController.php +++ b/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); } } }); diff --git a/app/Admin/Controllers/LanzuMpInfoController.php b/app/Admin/Controllers/LanzuMpInfoController.php index e29e3fc..ffc8b02 100644 --- a/app/Admin/Controllers/LanzuMpInfoController.php +++ b/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) { diff --git a/app/Admin/Controllers/LanzuMpWithdrawController.php b/app/Admin/Controllers/LanzuMpWithdrawController.php index 0a02083..c656a0b 100755 --- a/app/Admin/Controllers/LanzuMpWithdrawController.php +++ b/app/Admin/Controllers/LanzuMpWithdrawController.php @@ -155,10 +155,10 @@ class LanzuMpWithdrawController extends AdminController if ($form->isEditing()) { if ($form->status == -1) { //如果服务商提现审核被拒绝,退回服务商的提现金额 - MpBalance::returnBalance($adminUserId, 1, $money); + 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,'服务商提现','服务商提现'); } } }); diff --git a/app/Admin/Controllers/Type.php b/app/Admin/Controllers/Type.php new file mode 100644 index 0000000..84a0751 --- /dev/null +++ b/app/Admin/Controllers/Type.php @@ -0,0 +1,38 @@ +=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; //商户提现类型 +} From 0cfc7eead04787a709dbeca368ef37401cd8907a Mon Sep 17 00:00:00 2001 From: lanzu_qsy <334039090@qq.com> Date: Wed, 2 Sep 2020 10:26:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/LanzuMmInfoController.php | 10 ++++++++-- app/Admin/Controllers/LanzuMpInfoController.php | 5 +++++ app/Admin/Controllers/LanzuMpWithdrawController.php | 7 +++---- app/Models/AdminUsers.php | 1 + app/Models/LanzuMmInfo.php | 2 ++ 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/Admin/Controllers/LanzuMmInfoController.php b/app/Admin/Controllers/LanzuMmInfoController.php index 0681a45..a7cd796 100644 --- a/app/Admin/Controllers/LanzuMmInfoController.php +++ b/app/Admin/Controllers/LanzuMmInfoController.php @@ -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',Type::BALANCE_USER_TYPE_MM); + $res = Auth::addAdminUser($form, $model, $mmid, 'lanzu_mm', Type::BALANCE_USER_TYPE_MM); if ($res == -1) { return $form->error('该手机号作为登陆帐号已存在!'); } elseif ($res == -2) { @@ -141,7 +142,7 @@ class LanzuMmInfoController extends AdminController } else { //>>4.编辑时同步登陆帐号状态 - $adu = new AdminUsers(); + $adu = new AdminUsers(); $id = $form->getKey(); $mm = mmInfo::find($id); $ad = $adu->find($mm->admin_user_id); @@ -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(); + }); }); } diff --git a/app/Admin/Controllers/LanzuMpInfoController.php b/app/Admin/Controllers/LanzuMpInfoController.php index ffc8b02..c9d4f69 100644 --- a/app/Admin/Controllers/LanzuMpInfoController.php +++ b/app/Admin/Controllers/LanzuMpInfoController.php @@ -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(); + }); }); } diff --git a/app/Admin/Controllers/LanzuMpWithdrawController.php b/app/Admin/Controllers/LanzuMpWithdrawController.php index c656a0b..48a88d7 100755 --- a/app/Admin/Controllers/LanzuMpWithdrawController.php +++ b/app/Admin/Controllers/LanzuMpWithdrawController.php @@ -146,19 +146,18 @@ class LanzuMpWithdrawController extends AdminController } else { $form->radio('status')->options([1 => '通过审核', -1 => '拒绝'])->default(-1); } - } $form->saved(function (Form $form, $result) { $adminUserId = $form->model()->mp_info['admin_user_id']; - $money = $form->model()->money; + $money = $form->model()->money; if ($form->isEditing()) { if ($form->status == -1) { //如果服务商提现审核被拒绝,退回服务商的提现金额 MpBalance::returnBalance($adminUserId, Type::BALANCE_USER_TYPE_MP, $money); - }elseif ($form->status==1){ + } elseif ($form->status == 1) { //如果审核通过,则记录流水 - FinancialRecord::addFinancialRecord($adminUserId,Type::BALANCE_USER_TYPE_MP,$money,102,'服务商提现','服务商提现'); + FinancialRecord::addFinancialRecord($adminUserId, Type::BALANCE_USER_TYPE_MP, $money, 102, '服务商提现', '服务商提现'); } } }); diff --git a/app/Models/AdminUsers.php b/app/Models/AdminUsers.php index 5f7106e..39cb6d4 100644 --- a/app/Models/AdminUsers.php +++ b/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 diff --git a/app/Models/LanzuMmInfo.php b/app/Models/LanzuMmInfo.php index aeae4a5..9d857f2 100644 --- a/app/Models/LanzuMmInfo.php +++ b/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';