失效得奖励不展示问题

app/common/repositories/user/UserRepository.php

@@ -2587,7 +2587,7 @@ class UserRepository extends BaseRepository
 
         return $age;
     }
-    public function yanglaolog($where,$page=1, $limit=10,$month=''){
+    public function yanglaolog($where,$page=1, $limit=10,$month='',$is_shixiao = 0){
         $where1 = [];
         if(!empty($where)){
             foreach($where as $key => $value){
@@ -2602,7 +2602,10 @@ class UserRepository extends BaseRepository
             ->when($month!='',function ($q) use ($month){
                 $q->whereLike('a.create_time',$month.'%');
             });
-        $query -> where('a.status','<>','-1');
+
+        if($is_shixiao == 0){
+            $query -> where('a.status','<>','-1');
+        }
         $query_sql1 = clone $query;
         $query_sql2 = clone $query;
         $query_sql3 = clone $query;

app/controller/api/user/User.php

@@ -219,17 +219,23 @@ class User extends BaseController
 
         if ($pm==0){
 
-            $data = DB::name('user_sign_hongbao')->where($where)->where(['type' => 1,'status' => 1])->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_hongbao')->where($where)->where('type',1)->where('status',1)->field('id,mark,number,type,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
         }
         if($pm==1){
             $data = DB::name('user_sign_hongbao')->where($where)->where(['type' => 2,'status' => 1])->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
         if($pm==2){
-            $data = DB::name('user_sign_hongbao')->where($where)->where('status', -1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
-
+            $data = DB::name('user_sign_hongbao')->where($where)->where('type',1)->where([['status','in','-1,0']])->field('id,mark,number,type,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+            if($data){
+                $data = $data->toArray();
+                foreach ($data as $k=>$v){
+                    if($v['status'] == 0){
+                        $data[$k]['mark'] = '(失效)' . $v['mark'];
+                    }
+                }
+            }
         }
-        log::info("=======date==={$data}");
         return app("json")->success($data);
     }
 
@@ -408,17 +414,24 @@ class User extends BaseController
 
         if ($pm==0){
 
-            $data = DB::name('user_sign_gongxian')->where($where)->where('status', 1)->where('number', '<>',0)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_gongxian')->where($where)->where('status',1)->where('number', '<>',0)->field('id,mark,number,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+
         }
 //        if($pm==1){
 //            $data = DB::name('user_sign_gongxian')->where($where)->where('pm', 2)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 //
 //        }
         if($pm==2){
-            $data = DB::name('user_sign_gongxian')->where($where)->where('number', '<>',0)->where('status', -1)->field('id,mark,number,addtime,order_id')->page($page, $limit)->order("id desc")->select();
-
+            $data = DB::name('user_sign_gongxian')->where($where)->where('number', '<>',0)->where([['status','in','-1,0']])->field('id,mark,number,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+            if($data){
+                $data = $data->toArray();
+                foreach ($data as $k=>$v){
+                    if($v['status'] == 0){
+                        $data[$k]['mark'] = '(失效)' . $v['mark'];
+                    }
+                }
+            }
         }
-        log::info("=======date==={$data}");
         return app("json")->success($data);
     }
 
@@ -490,15 +503,23 @@ class User extends BaseController
         $where['uid'] = $uid;
 
         if ($pm==0){
-            $data = DB::name('user_sign_fugou')->where($where)->where('type', 1)->where('status', 1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_fugou')->where($where)->where('type', 1)->where('status',1)->field('id,mark,number,type,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+
         }
         if($pm==1){
             $data = DB::name('user_sign_fugou')->where($where)->where('type', 2)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
         }
         if($pm==2){
-            $data = DB::name('user_sign_fugou')->where($where)->where('status', -1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_fugou')->where($where)->where('type', 1)->where([['status','in','-1,0']])->field('id,mark,number,type,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+            if($data){
+                $data = $data->toArray();
+                foreach ($data as $k=>$v){
+                    if($v['status'] == 0){
+                        $data[$k]['mark'] = '(失效)' . $v['mark'];
+                    }
+                }
+            }
         }
-        log::info("=======date==={$data}");
         return app("json")->success($data);
     }
 
@@ -1143,8 +1164,16 @@ class User extends BaseController
         if ($source > -1) {
             $where['source'] = $source;
         }
-        $res = $this->repository->yanglaolog($where, $page, $limit, $month);
+        $res = $this->repository->yanglaolog($where, $page, $limit, $month,1);
         if ($res) {
+            $res['list'] = $res['list']->toArray();
+            if($res['list']){
+                foreach ($res['list'] as $k=>$v){
+                    if($v['status'] == -1){
+                        $res['list'][$k]['mer_name'] = $v['mer_name'] . '(失效)';
+                    }
+                }
+            }
             return app('json')->success($res);
         } else {
             return app('json')->fail('获取失败');
@@ -2182,17 +2211,24 @@ class User extends BaseController
 //        }
         if ($pm==0){
 
-            $data = DB::name('user_sign_score')->where($where)->where('pm', 1)->where('status', 1)->field('id,mark,reward_socre,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_score')->where($where)->where('pm', 1)->where('status',1)->field('id,mark,reward_socre,pm,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+
         }
         if($pm==1){
             $data = DB::name('user_sign_score')->where($where)->where('pm', 2)->where('status', 1)->field('id,mark,reward_socre,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
         if($pm==2){
-            $data = DB::name('user_sign_score')->where($where)->where('status', -1)->field('id,mark,reward_socre,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
-
+            $data = DB::name('user_sign_score')->where($where)->where([['status','in','-1,0']])->field('id,mark,reward_socre,pm,addtime,order_id,status')->page($page, $limit)->order("id desc")->select();
+            if($data){
+                $data = $data->toArray();
+                foreach ($data as $k=>$v){
+                    if($v['status'] == 0){
+                        $data[$k]['mark'] = '(失效)' . $v['mark'];
+                    }
+                }
+            }
         }
-        log::info("=======date==={$data}");
         return app("json")->success($data);
 
     }
@@ -2264,6 +2300,10 @@ class User extends BaseController
             if ($v['status'] == 1) {
 //                $v['create_time'] = $v['take_time'];
             }
+            if ($v['status'] == -1) {
+                $v['mark'] = '(失效)' . $v['mark'];
+                $v['status'] = 0;
+            }
 
             $data_arr[] = $v;
         }