更新

app/Admin/Controllers/IncomeController.php

@@ -8,6 +8,7 @@
 use Dcat\Admin\Form;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Dcat\Admin\Show;
+use App\Admin\Forms\CheckIncome;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Dcat\Admin\Http\Controllers\AdminController;
 
 
 class IncomeController extends AdminController
 class IncomeController extends AdminController
@@ -31,7 +32,23 @@ protected function grid()
             });
             });
             $grid->column('phone', '手机号');
             $grid->column('phone', '手机号');
             $grid->column('amount');
             $grid->column('amount');
-            $grid->column('status');
+            //$grid->column('status');
+            $grid->column('status')
+                ->using(Income::STATUS)->dot([
+                    0 => 'primary',
+                    1 => 'success',
+                    2 => 'danger'
+                ])
+                ->if(function ($column) {
+                    return $column->getValue() == 0;
+                })->display('点击审批')->modal(function (Grid\Displayers\Modal $modal) {
+                    // 标题
+                    $modal->title('提现审核');
+                    // 自定义图标
+                    $modal->icon('feather icon-edit');
+                    // 传递当前行字段值
+                    return CheckIncome::make()->payload(['id' => $this->id]);
+                });
             $grid->column('created_at', '提现时间');
             $grid->column('created_at', '提现时间');
             //$grid->column('updated_at')->sortable();
             //$grid->column('updated_at')->sortable();
 
 

app/Admin/Controllers/SystemSettingController.php

@@ -68,6 +68,7 @@ protected function form()
                 ->help('仅支持jpg、jpeg、png格式图片上传（750px * 420px）')
                 ->help('仅支持jpg、jpeg、png格式图片上传（750px * 420px）')
                 ->autoUpload();
                 ->autoUpload();
             $form->editor('cp_brief', '公司介绍');
             $form->editor('cp_brief', '公司介绍');
+            $form->editor('cashout_brief', '提现须知');
             //$form->display('created_at');
             //$form->display('created_at');
             //$form->display('updated_at');
             //$form->display('updated_at');
             $form->disableCreatingCheck();
             $form->disableCreatingCheck();

app/Http/Controllers/Api/OrderController.php

@@ -466,4 +466,11 @@ public function CheckoutCartOrder(Request $request)
         }
         }
         return $this->JsonResponse($data);
         return $this->JsonResponse($data);
     }
     }
+
+    //商户端首页统计
+    public function orderCollect()
+    {
+
+        return $this->JsonResponse($data = []);
+    }
 }
 }

app/Http/Controllers/Api/SystemSettingController.php

@@ -85,23 +85,31 @@ public function qrCode(Request $request)
         // 返回二维码图片的Base64编码
         // 返回二维码图片的Base64编码
         //return response()->json(['status' => 'success', 'qrcode' => 'data:image/png;base64,' . base64_encode($qrCode)]);
         //return response()->json(['status' => 'success', 'qrcode' => 'data:image/png;base64,' . base64_encode($qrCode)]);
     }
     }
-
-    public function hotKeywords(Request $request)
+    //
+    public function companyIntro(Request $request)
     {
     {
         $articleObj = SystemSettingModel::find(1);
         $articleObj = SystemSettingModel::find(1);
         if (!$articleObj) {
         if (!$articleObj) {
             return $this->JsonResponse('', '参数错误', 201);
             return $this->JsonResponse('', '参数错误', 201);
         }
         }
 
 
-        $keysArr = [];
-        $keywords = $articleObj->hot_kw;
-        if ($keywords) {
-            $keysArr = explode("|", $keywords);
+        $cp_brief = $articleObj->cp_brief ?? '';
+
+
+        return  $this->JsonResponse(['intro' => $cp_brief]);
     }
     }
-        shuffle($keysArr);
-        $result = $keysArr ? array_slice($keysArr, 0, 8) : [];
 
 
-        return  $this->JsonResponse($result);
+    public function cashoutIntro(Request $request)
+    {
+        $articleObj = SystemSettingModel::find(1);
+        if (!$articleObj) {
+            return $this->JsonResponse('', '参数错误', 201);
+        }
+
+        $cashout_brief = $articleObj->cashout_brief ?? '';
+
+
+        return  $this->JsonResponse(['intro' => $cashout_brief]);
     }
     }
 
 
     public function getBj(Request $request)
     public function getBj(Request $request)

app/Http/Controllers/Api/UserController.php

@@ -139,6 +139,9 @@ public function reduceShoppingCart(Request $request)
     public function info(Request $request)
     public function info(Request $request)
     {
     {
         $user = $request->user();
         $user = $request->user();
+        $balance = $user->balance ?? 0; //余额
+        $total_revenue = $user->total_revenue ?? 0; //总金额
+        $cashout = $total_revenue - $balance; //已提现
         return $this->JsonResponse([
         return $this->JsonResponse([
             'user_id' => $user->id,
             'user_id' => $user->id,
             'nickname' => $user->name,
             'nickname' => $user->name,
@@ -147,7 +150,9 @@ public function info(Request $request)
             'phone_sec' => $user->phone ? substr($user->phone, 0, 3) . "****" . substr($user->phone, 7) : '',
             'phone_sec' => $user->phone ? substr($user->phone, 0, 3) . "****" . substr($user->phone, 7) : '',
             //'status' => $user->status,
             //'status' => $user->status,
             'merchant_id' => $user->merchant_id,
             'merchant_id' => $user->merchant_id,
-            'role' => 1
+            'balance' => $balance,
+            'total_revenue' => $total_revenue,
+            'cashout' => $cashout,
         ]);
         ]);
     }
     }
 
 

app/Models/StoreAdminUsers.php

@@ -5,11 +5,16 @@
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use App\Models\Merchant;
 use App\Models\Merchant;
 use App\Models\Store;
 use App\Models\Store;
+use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Notifications\Notifiable;
+use Laravel\Sanctum\HasApiTokens;
 
 
-class StoreAdminUsers extends Model
+class StoreAdminUsers extends Authenticatable
 {
 {
     use HasDateTimeFormatter;
     use HasDateTimeFormatter;
+    use HasApiTokens, HasFactory, Notifiable;
     protected $table = 'store_admin_users';
     protected $table = 'store_admin_users';
 
 
     public function verifier()
     public function verifier()

routes/api.php

@@ -23,17 +23,17 @@
 
 
     Route::post('get-openid', 'LoginController@getOpenid');  //获取openid
     Route::post('get-openid', 'LoginController@getOpenid');  //获取openid
 
 
-    Route::post('login', 'LoginController@login')->name('login');  //密码登录
+    Route::post('login', 'LoginController@login')->name('login');  //授权登录
 
 
     Route::get('test-login', 'LoginController@testLogin');  //测试登录
     Route::get('test-login', 'LoginController@testLogin');  //测试登录
 
 
-    Route::post('mobile-login', 'LoginController@mobilelogin');  //验证码登录
+    //Route::post('mobile-login', 'LoginController@mobilelogin');  //验证码登录
 
 
-    Route::post('register', 'LoginController@register')->name('register');  //注册
+    Route::post('account-login', 'StoreAdminUsersController@login');  //账号密码登录
 
 
     Route::post('reset', 'LoginController@reset');  //重新提交
     Route::post('reset', 'LoginController@reset');  //重新提交
 
 
-    Route::post('send-sms-code', 'LoginController@sendCode');  //发送短信
+    //Route::post('send-sms-code', 'LoginController@sendCode');  //发送短信
 
 
     Route::post('update-pwd', 'UserController@updatePwd');  //修改密码
     Route::post('update-pwd', 'UserController@updatePwd');  //修改密码
 
 
@@ -58,7 +58,9 @@
 
 
     Route::get('get-kefu-list', 'KefuController@getList');  //客服列表
     Route::get('get-kefu-list', 'KefuController@getList');  //客服列表
 
 
-    Route::get('hot-search', 'SystemSettingController@hotKeywords');  //配置基本信息
+    Route::get('company-intro', 'SystemSettingController@companyIntro');  //公司介绍
+
+    Route::get('cashout-intro', 'SystemSettingController@cashoutIntro');  //提现须知
 
 
     Route::post('upload-file', 'UserController@uploadFile');  //统一上传接口
     Route::post('upload-file', 'UserController@uploadFile');  //统一上传接口
 
 
@@ -72,7 +74,9 @@
 
 
     Route::middleware('auth:sanctum')->group(function () {
     Route::middleware('auth:sanctum')->group(function () {
 
 
-        Route::get('user-info', 'UserController@info');  //获取用户资料
+        Route::get('user-info', 'UserController@info');  //获取小程序端用户资料
+
+        Route::get('merchant-info', 'StoreAdminUsersController@info');  //获取商户端用户资料
 
 
         Route::get('logout', 'LoginController@logout');  //登出
         Route::get('logout', 'LoginController@logout');  //登出
 
 
@@ -136,6 +140,12 @@
 
 
         Route::post('add-comment', 'CommentController@add');  //去评价
         Route::post('add-comment', 'CommentController@add');  //去评价
 
 
+        Route::get('commission-list', 'OrderDivideRecordController@getList');  //直推、间推明细
+
+        Route::get('income-list', 'IncomeController@getList');  //用户提现明细
+
+        Route::post('income-add', 'IncomeController@add');  //去提现
 
 
+        Route::get('merchant-order-collect', 'OrderController@orderCollect');  //商户端首页统计
     });
     });
 });
 });