diff --git a/app/admin/controller/user/UserController.php b/app/admin/controller/user/UserController.php index 3beea43f..722f5501 100644 --- a/app/admin/controller/user/UserController.php +++ b/app/admin/controller/user/UserController.php @@ -8,6 +8,8 @@ use app\admin\controller\BaseAdminController; use app\admin\lists\user\UserLists; use app\admin\logic\user\UserLogic; use app\admin\validate\user\UserValidate; +use app\api\lists\user_sign\UserSignLists; +use app\api\lists\user_sign_log\UserSignLogLists; class UserController extends BaseAdminController { @@ -82,6 +84,19 @@ class UserController extends BaseAdminController } + + /** + * 礼品券/冻结券 + */ + public function userSing() + { + return $this->dataLists(new UserSignLogLists()); + + } + + + + //用户领取列表 public function userGiftList() { diff --git a/app/api/lists/user_sign_log/UserSignLogLists.php b/app/api/lists/user_sign_log/UserSignLogLists.php index 907c707a..efcf9599 100644 --- a/app/api/lists/user_sign_log/UserSignLogLists.php +++ b/app/api/lists/user_sign_log/UserSignLogLists.php @@ -47,6 +47,7 @@ class UserSignLogLists extends BaseApiDataLists implements ListsSearchInterface { $type=$this->request->get('type',1); $mark=$this->request->get('mark',''); + $uid=$this->request->get('uid',''); if($type==1){ $this->searchWhere[]=['type','in',[1,7,3]]; $this->searchWhere[]=['status','=',1]; @@ -56,7 +57,11 @@ class UserSignLogLists extends BaseApiDataLists implements ListsSearchInterface }elseif($mark==2){ $this->searchWhere[]=['financial_pm','=',0]; } - $this->searchWhere[]=['uid','=',$this->userId]; + if($uid){ + $this->searchWhere[]=['uid','=',$uid]; + }else{ + $this->searchWhere[]=['uid','=',$this->userId]; + } $list=UserSignLog::where($this->searchWhere)->order('id desc') ->limit($this->limitOffset, $this->limitLength) ->select()->each(function ($item){