完善功能

app/admin/controller/auth/AuthController.php

@@ -4,7 +4,10 @@ namespace app\admin\controller\auth;
 
 use app\admin\service\auth\AuthService;
 use app\admin\validate\auth\AuthValidate;
+use app\model\SysUser;
+use support\Redis;
 use support\Request;
+use Tinywan\Jwt\JwtToken;
 
 class AuthController
 {
@@ -20,6 +23,23 @@ class AuthController
         return AuthService::login($request->post());
     }
 
+    public function logout(Request $request)
+    {
+        try {
+            $userId = JwtToken::getCurrentId();
+            SysUser::where('user_id',$userId)->update(['user_login_status'=>"OFFLINE"]);
+
+            Redis::del("JWT:TOKEN:admin:".$userId);
+        }catch (\Exception $e){
+            dump($e->getMessage());
+            return json_fail('退出登录失败');
+        }
+
+
+        return json_success('退出登录成功');
+
+    }
+
     /**
      * @Desc 刷新token
      * @Author Gorden

app/admin/controller/finance/GoodsSalesController.php

@@ -2,13 +2,41 @@
 
 namespace app\admin\controller\finance;
 
+use app\model\OrderSheet;
 use support\Request;
 
 class GoodsSalesController{
 
-    public function list(Request $request){
-        // $Total = 
+    public function list(Request $request)
+    {
+//        $rows = OrderSheet::leftJoin('goods','goods.goods_id','=','order_sheet.')
+    }
+
+    public function statistics() 
+    {
+          
+        $data['total'] = OrderSheet::whereIn('order_sheet_status',['PENDING','NOSTOCK','WAITING','ENDING','RECVING','SIGNED','CONFIRM','DONE'])
+            ->selectRaw("SUM(order_sheet_pay) as pay_amount ,SUM(order_sheet_num) as goods_amount")
+            ->first();
+
+        $data['entity'] = OrderSheet::leftJoin('goods','goods.goods_id','=','order_sheet.join_sheet_goods_id')
+            ->where('goods_classify','GOODS')
+            ->whereIn('order_sheet_status',['PENDING','NOSTOCK','WAITING','ENDING','RECVING','SIGNED','CONFIRM','DONE'])
+            ->selectRaw("SUM(order_sheet_pay) as pay_amount ,SUM(order_sheet_num) as goods_amount")
+            ->first();
+
+        $data['service'] = OrderSheet::leftJoin('goods','goods.goods_id','=','order_sheet.join_sheet_goods_id')
+            ->where('goods_classify','SERVICE')
+            ->whereIn('order_sheet_status',['PENDING','NOSTOCK','WAITING','ENDING','RECVING','SIGNED','CONFIRM','DONE'])
+            ->selectRaw("SUM(order_sheet_pay) as pay_amount ,SUM(order_sheet_num) as goods_amount")
+            ->first();
 
+        $data['package'] = OrderSheet::leftJoin('goods','goods.goods_id','=','order_sheet.join_sheet_goods_id')
+            ->where('goods_classify','PACKAGE')
+            ->whereIn('order_sheet_status',['PENDING','NOSTOCK','WAITING','ENDING','RECVING','SIGNED','CONFIRM','DONE'])
+            ->selectRaw("SUM(order_sheet_pay) as pay_amount ,SUM(order_sheet_num) as goods_amount")
+            ->first();
 
+        return json_success('',$data);
     }
 }

app/admin/service/auth/AuthService.php

@@ -42,6 +42,10 @@ class AuthService
                 'name'=> $user->user_name
             ];
             $token = JwtToken::generateToken($extend);
+
+            $user->user_login_status = "ONLINE";
+            $user->save();
+
             // 提交事务
             DB::commit();
             // 写操作日志

app/admin/service/member/MemberService.php

@@ -171,7 +171,7 @@ class MemberService
                 if($isAuth == 'Y'){
                     $query->where('member_cert.member_cert_name','<>',NULL)->where('member_cert.member_cert_nbr','<>',NULL)->where('member_cert.member_cert_name','<>','')->where('member_cert.member_cert_nbr','<>','');
                 }else{
-                    $query->where('member_cert.member_cert_name',NULL)->orWhere('member_cert.member_cert_nbr',NULL)->orWhere('member_cert.member_cert_name','')->orWhere('member_cert.member_cert_nbr','');
+                    $query->where('member_cert.member_cert_name',NULL)->where('member_cert.member_cert_nbr',NULL)->where('member_cert.member_cert_name','')->where('member_cert.member_cert_nbr','');
                 }
             })->when(!empty($addtime), function ($query) use ($addtime) {
                 $addtime[0] = strtotime($addtime[0]);

route/admin.php

@@ -19,6 +19,7 @@ Route::group('/admin', function () {
     /* 鉴权 */
     Route::group('/auth', function () {
         Route::post('/login', [\app\admin\controller\auth\AuthController::class, 'login']);
+        Route::post('/logout', [\app\admin\controller\auth\AuthController::class, 'logout']);
         Route::get('/userInfo', [\app\admin\controller\auth\AuthController::class, 'userInfo']);
         Route::get('/refreshToken', [\app\admin\controller\auth\AuthController::class, 'refreshToken']);
     })->middleware([
@@ -96,6 +97,9 @@ Route::group('/admin', function () {
         Route::group('/writeOff',function (){
             Route::get('/list',[\app\admin\controller\finance\WriteOffController::class,'records']);
         });
+        Route::group('/goodsSales',function (){
+            Route::get('/statistics',[\app\admin\controller\finance\GoodsSalesController::class,'statistics']);
+        });
     });
     /* 系统管理中心 */
     Route::group('/sys', function () {