sign v2

app/Http/Controllers/Wap/User/UserController.php

@@ -142,7 +142,13 @@ class UserController extends BaseController
      *   }
      */
     public function signRecord(Request $request){
-        return response()->pagination(new SignRecordTransformer(),UserSignService::getUserSignRecord($this->uid));
+        $sign_result = paginationTransform(new SignRecordTransformer(),UserSignService::getUserSignRecord($this->uid));
+        $sign_status = UserSignService::isSign($this->uid);
+        $result = [
+            'sign_status'=>$sign_status,
+            'sign_result'=>$sign_result
+        ];
+        return response()->success($result);
     }
 
     public function getCoupons(Request $request){

app/Http/Middleware/ReadOauth.php

@@ -1018,4 +1018,8 @@ class ReadOauth
         }
         return $area;
     }
+
+    private function yun(Request $request,$uid){
+
+    }
 }

app/Libs/Helpers.php

@@ -202,7 +202,27 @@ function collectionTransform($trans, $data){
     return $ret_data;
 }
 
+function paginationTransform ($trans, $paginator) {
+    $ret = [];
+    $ret['list'] = [];
+    if($paginator)
+    {
+        foreach ($paginator as $item)
+        {
+            $ret['list'][] = $trans->transform($item);
+        }
 
+        $ret['meta']= [
+            'total'=>(int)$paginator->total(),
+            'per_page'=>(int)$paginator->perPage(),
+            'current_page'=>(int)$paginator->currentPage(),
+            'last_page'=>(int)$paginator->lastPage(),
+            'next_page_url'=>(string)$paginator->nextPageUrl(),
+            'prev_page_url'=>(string)$paginator->previousPageUrl()
+        ];
+    }
+    return $ret;
+}
 function ImageNewsToArray($datas){
     if(empty($datas)) return null;
     if(!is_array($datas)){

app/Modules/User/Models/UserSign.php

@@ -34,6 +34,6 @@ class UserSign extends Model
      * 用户签到记录
      */
     public static function getUserSignRecord($uid){
-        return self::where('uid',$uid)->select('price','sign_time')->orderBy('sign_time','desc')->paginate();
+        return self::where('uid',$uid)->where('day','<',date('Y-m-d'))->select('price','sign_time')->orderBy('sign_time','desc')->paginate();
     }
 }