调整服务提现类型

app/Admin/Common/Auth.php

@@ -24,10 +24,10 @@ class Auth extends AdminController
     public static function addAdminUser($form, $model, $cid, $roles,$type=0)
     {
         $adu = new AdminUsers();
-        if (!$id) {
+        if (!$cid) {
             return '-2';
         }
-        $row = $model::find($id);
+        $row = $model::find($cid);
 
         //>>1.添加前,去查询是否已存在相同的帐号
         $count = $adu->where(['username' => $form->phone])->count();

app/Admin/Common/Type.php

@@ -0,0 +1,43 @@
+<?php
+
+
+namespace App\Admin\Common;
+
+
+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; // 用户线上支付订单
+    const  MONEY_TYPE_MP = 102; //市场经理提现类型
+    const  MONEY_TYPE_MM = 103; //市场经理提现类型
+    const  MONEY_TYPE_CS = 104; //社区提现类型
+
+    /**
+     * 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/Admin/Controllers/LanzuCsInfoController.php

@@ -4,6 +4,7 @@ namespace App\Admin\Controllers;
 
 use App\Admin\Common\Auth;
 use App\Admin\Common\Images;
+use App\Admin\Common\Type;
 use App\Admin\Repositories\LanzuCsInfo;
 
 use App\Models\AdminUsers;
@@ -19,7 +20,6 @@ use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Dcat\Admin\Controllers\AdminController;
 use \App\Models\LanzuCsInfo as modelCsInfo;
-use Illuminate\Support\Facades\DB;
 use function foo\func;
 
 class LanzuCsInfoController extends AdminController
@@ -121,7 +121,7 @@ class LanzuCsInfoController extends AdminController
                 $model = new modelCsInfo();
                 if ($form->isCreating()) {
                     //>>1.添加登录帐号
-                    $res = Auth::addAdminUser($form, $model, $cid, 'lanzu_cs',4);
+                    $res = Auth::addAdminUser($form, $model, $cid, 'lanzu_cs',Type::BALANCE_USER_TYPE_CS);
                     if ($res == -1) {
                         return $form->error('该手机号作为登陆帐号已存在!');
                     } elseif ($res == -2) {

app/Admin/Controllers/LanzuCsWithdrawController.php

@@ -5,15 +5,14 @@ namespace App\Admin\Controllers;
 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;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
+use App\Admin\Common\Type;
 use Dcat\Admin\Controllers\AdminController;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -93,7 +92,7 @@ class LanzuCsWithdrawController extends AdminController
                 if ($user->isRole('lanzu_cs')) {//如果是社区站点角色
                     $cs = LanzuCsInfo::where('admin_user_id', $user->id)->first();
                     if ($cs) {
-                        $form->text('amount', '可提现金额')->value(LanzuUserBalance::getBalance($user->id, 3))->disable();
+                        $form->text('amount', '可提现金额')->value(LanzuUserBalance::getBalance($user->id, ))->disable();
                         $form->hidden('cs_id', '提现用户id')->value($cs->id);
                         $form->text('csInfo.name', '提现用户')->value($cs->name)->disable();
                         $form->number('money')->min(env('MIN_MONEY'))->max(env('MAX_MONEY'));
@@ -113,13 +112,13 @@ class LanzuCsWithdrawController extends AdminController
                 }
 
                 $form->saved(function () use ($cs, $form) {//扣减提现金额
-                    LanzuUserBalance::reduceBalance($cs->admin_user_id, 3, $form->money);
+                    LanzuUserBalance::reduceBalance($cs->admin_user_id, Type::BALANCE_USER_TYPE_CS, $form->money);
                 });
 
             } else {//编辑操作
                 $aduid = LanzuCsInfo::where('id', $form->model()->cs_id)->pluck('admin_user_id')->first();
 
-                $form->display('amount', '可提现金额')->value(LanzuUserBalance::getBalance($aduid, 3));
+                $form->display('amount', '可提现金额')->value(LanzuUserBalance::getBalance($aduid, Type::BALANCE_USER_TYPE_CS));
                 $form->display('cs_id', '提现用户')->value($form->model()->name);
                 $form->display('money');
 
@@ -139,7 +138,7 @@ class LanzuCsWithdrawController extends AdminController
 
                 $form->saved(function (Form $form) use ($aduid) {
                     if ($form->status == -1) {//如何审核被拒绝,退回提现金额
-                        LanzuUserBalance::returnBalance($aduid, 3, $form->model()->money);
+                        LanzuUserBalance::returnBalance($aduid, Type::BALANCE_USER_TYPE_CS, $form->model()->money);
                     } elseif ($form->status == 1) {//调用微信企业付
                         //获取站点信息
                         $csInfo = LanzuCsInfo::find($form->model()->cs_id);
@@ -164,9 +163,9 @@ class LanzuCsWithdrawController extends AdminController
                                 //添加流水记录
                                 $model             = FinancialRecord::getFinancialRecordModel($csInfo->admin_user_id);
                                 $model->user_id    = $csInfo->admin_user_id;
-                                $model->user_type  = 4;
+                                $model->user_type  = Type::BALANCE_USER_TYPE_CS;
                                 $model->money      = $form->model()->money;
-                                $model->money_type = 104;
+                                $model->money_type = Type::MONEY_TYPE_CS;
                                 $model->desc       = '社区站点提现';
                                 $model->comment    = '社区站点提现';
                                 $model->save();
@@ -176,7 +175,7 @@ class LanzuCsWithdrawController extends AdminController
                                 $model->user_id    = -1;
                                 $model->user_type  = -1;
                                 $model->money      = $form->model()->money;
-                                $model->money_type = 104;
+                                $model->money_type = Type::MONEY_TYPE_CS;
                                 $model->desc       = '社区站点提现';
                                 $model->comment    = '社区站点提现';
                                 $model->save();
@@ -186,7 +185,7 @@ class LanzuCsWithdrawController extends AdminController
                         } else {
                             DB::transaction(function () use ($aduid, $form) {
                                 //提现失败,退回提现金额
-                                LanzuUserBalance::returnBalance($aduid, 3, $form->model()->money);
+                                LanzuUserBalance::returnBalance($aduid, Type::BALANCE_USER_TYPE_CS, $form->model()->money);
 
                                 //更改提现状态为-2 提现失败
                                 \App\Models\LanzuCsWithdraw::updateStatus($form->model()->id, -2);

app/Admin/Controllers/LanzuMmInfoController.php

@@ -3,6 +3,7 @@
 namespace App\Admin\Controllers;
 
 use App\Admin\Common\Auth;
+use App\Admin\Common\Type;
 use App\Admin\Repositories\LanzuMmInfo;
 use App\Models\AdminUsers;
 use \App\Models\AdminRoles;

app/Admin/Controllers/LanzuMmWithdrawController.php

@@ -3,6 +3,7 @@
 namespace App\Admin\Controllers;
 
 use App\Admin\Common\FinancialRecord;
+use App\Admin\Common\Type;
 use App\Admin\Repositories\LanzuMmWithdraw;
 use App\Models\ImsCjdcUser;
 use App\Models\LanzuMmWithdraw as MmWithdraw;
@@ -187,7 +188,7 @@ class LanzuMmWithdrawController extends AdminController
                             //添加流水记录
                             $adminUserId = $mm->admin_user_id;
                             $money       = $form->model()->money;
-                            FinancialRecord::addFinancialRecord($adminUserId, Type::BALANCE_USER_TYPE_MM, $money, 103, '市场经理提现', '市场经理提现');
+                            FinancialRecord::addFinancialRecord($adminUserId, Type::BALANCE_USER_TYPE_MM, $money, Type::MONEY_TYPE_MM, '市场经理提现', '市场经理提现');
                         } else {
                             //如果提现失败,返回提现金额
                             MpBalance::returnBalance($mm->admin_user_id, Type::BALANCE_USER_TYPE_MM, $form->model()->money);
@@ -303,9 +304,4 @@ class LanzuMmWithdrawController extends AdminController
     }
 
 
-    public function mmInfoList()
-    {
-        echo 11;
-    }
-
 }

app/Admin/Controllers/LanzuMpInfoController.php

@@ -3,6 +3,7 @@
 namespace App\Admin\Controllers;
 
 use App\Admin\Common\Auth;
+use App\Admin\Common\Type;
 use App\Admin\Extensions\CheckRow;
 use App\Admin\Metrics\Examples\TotalUsers;
 use App\Admin\Repositories\LanzuMpInfo;

app/Admin/Controllers/LanzuMpWithdrawController.php

@@ -4,6 +4,7 @@ namespace App\Admin\Controllers;
 
 use App\Admin\Common\FinancialRecord;
 use App\Admin\Common\Sms;
+use App\Admin\Common\Type;
 use App\Admin\Repositories\LanzuMpWithdraw;
 use App\Models\ImsCjdcMarket;
 use App\Models\LanzuMpWithdraw as modelMpInfo;
@@ -164,7 +165,7 @@ class LanzuMpWithdrawController extends AdminController
                         MpBalance::returnBalance($adminUserId, Type::BALANCE_USER_TYPE_MP, $money);
                     } elseif ($form->status == 1) {
                         //如果审核通过,则记录流水
-                        FinancialRecord::addFinancialRecord($adminUserId, Type::BALANCE_USER_TYPE_MP, $money, 102, '服务商提现', '服务商提现');
+                        FinancialRecord::addFinancialRecord($adminUserId, Type::BALANCE_USER_TYPE_MP, $money, Type::MONEY_TYPE_MP, '服务商提现', '服务商提现');
                     }
                 }
             });

app/Admin/Controllers/Type.php

@@ -1,40 +0,0 @@
-<?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; //商户提现类型
-
-
-}