fly 5 years ago
parent
commit
e858a2b643

+ 3 - 1
app/Http/Controllers/QuickApp/User/UserController.php

@@ -187,6 +187,7 @@ class UserController extends BaseController
      * @api {GET} user/sign_record 用户签到记录
      * @apiGroup User
      * @apiName signRecord
+     * @apiParam {String}  date 查询日期
      * @apiSuccess {int}         code 状态码
      * @apiSuccess {String}      msg  信息
      * @apiSuccess {object}      data 结果集
@@ -230,7 +231,8 @@ class UserController extends BaseController
      */
     public function signRecord(Request $request)
     {
-        $sign_result = paginationTransform(new SignRecordTransformer(), UserSignService::getUserSignRecord($this->uid));
+        $month = $request->get('date', date('Y-m-01'));
+        $sign_result = paginationTransform(new SignRecordTransformer(), UserSignService::getUserSignRecord($this->uid, $month));
         $sign_status = UserSignService::isSign($this->uid);
         $sign_today = [];
         if ($sign_status) {

+ 3 - 3
app/Modules/User/Services/UserSignService.php

@@ -39,11 +39,11 @@ class UserSignService
     /**
      * 用户签到记录
      */
-    public static function getUserSignRecord($uid)
+    public static function getUserSignRecord($uid, $month)
     {
         $UserSignModel = new UserSign();
-        $UserSignModel->setCurrentTable(date('Ym'));
-        return $UserSignModel->where('uid', $uid)->where('day', '<=', date('Y-m-d'))->select('price', 'sign_time')->orderBy('sign_time', 'desc')->paginate();
+        $UserSignModel->setCurrentTable(date('Ym', strtotime($month)));
+        return $UserSignModel->where('uid', $uid)->select('price', 'sign_time')->orderBy('sign_time', 'desc')->paginate();
     }
 
 

+ 20 - 13
public/kyydoc/api_data.js

@@ -3868,6 +3868,26 @@ define({ "api": [
     "title": "用户签到记录",
     "group": "User",
     "name": "signRecord",
+    "parameter": {
+      "fields": {
+        "Parameter": [
+          {
+            "group": "Parameter",
+            "type": "String",
+            "optional": false,
+            "field": "date",
+            "description": "<p>查询日期</p>"
+          },
+          {
+            "group": "Parameter",
+            "type": "page",
+            "optional": false,
+            "field": "page",
+            "description": ""
+          }
+        ]
+      }
+    },
     "success": {
       "fields": {
         "Success 200": [
@@ -3923,19 +3943,6 @@ define({ "api": [
         }
       ]
     },
-    "parameter": {
-      "fields": {
-        "Parameter": [
-          {
-            "group": "Parameter",
-            "type": "page",
-            "optional": false,
-            "field": "page",
-            "description": ""
-          }
-        ]
-      }
-    },
     "filename": "app/Http/Controllers/QuickApp/User/UserController.php",
     "groupTitle": "用户"
   },

+ 20 - 13
public/kyydoc/api_data.json

@@ -3868,6 +3868,26 @@
     "title": "用户签到记录",
     "group": "User",
     "name": "signRecord",
+    "parameter": {
+      "fields": {
+        "Parameter": [
+          {
+            "group": "Parameter",
+            "type": "String",
+            "optional": false,
+            "field": "date",
+            "description": "<p>查询日期</p>"
+          },
+          {
+            "group": "Parameter",
+            "type": "page",
+            "optional": false,
+            "field": "page",
+            "description": ""
+          }
+        ]
+      }
+    },
     "success": {
       "fields": {
         "Success 200": [
@@ -3923,19 +3943,6 @@
         }
       ]
     },
-    "parameter": {
-      "fields": {
-        "Parameter": [
-          {
-            "group": "Parameter",
-            "type": "page",
-            "optional": false,
-            "field": "page",
-            "description": ""
-          }
-        ]
-      }
-    },
     "filename": "app/Http/Controllers/QuickApp/User/UserController.php",
     "groupTitle": "用户"
   },

+ 1 - 1
public/kyydoc/api_project.js

@@ -17,7 +17,7 @@ define({
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2019-11-01T06:25:43.764Z",
+    "time": "2019-11-01T07:54:39.907Z",
     "url": "http://apidocjs.com",
     "version": "0.17.7"
   }

+ 1 - 1
public/kyydoc/api_project.json

@@ -17,7 +17,7 @@
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2019-11-01T06:25:43.764Z",
+    "time": "2019-11-01T07:54:39.907Z",
     "url": "http://apidocjs.com",
     "version": "0.17.7"
   }