ok

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

@@ -181,7 +181,7 @@ class UserController extends BaseController
         }
     }
 
-        /**
+    /**
      * @apiVersion 1.0.0
      * @apiDescription 用户签到记录
      * @api {GET} user/sign_record 用户签到记录
@@ -190,8 +190,9 @@ class UserController extends BaseController
      * @apiSuccess {int}         code 状态码
      * @apiSuccess {String}      msg  信息
      * @apiSuccess {object}      data 结果集
-     * @apiSuccess {reward}     data.reward 奖励金额.
-     * @apiSuccess {sign_time}  data.sign_time 签到时间.
+     * @apiSuccess {sign_status}     data.sign_status .
+     * @apiSuccess {sign_result}  data.sign_result .
+     * @apiSuccess {sign_today}  data.sign_today .
      * @apiParam {page}  page
      * @apiSuccessExample {json} Success-Response:
      *
@@ -199,26 +200,33 @@ class UserController extends BaseController
      *       code: 0,
      *       msg: "",
      *       data: {
-     *           list: [
-     *           {
-     *               reward: 50,
-     *               sign_time: "2018-03-20 13:43:11"
-     *           },
-     *           {
-     *               reward: 50,
-     *               sign_time: "2018-01-18 16:22:33"
-     *           },
-     *       ],
-     *       meta: {
-     *           total: 12,
-     *           per_page: 15,
-     *           current_page: 1,
-     *           last_page: 1,
-     *           next_page_url: "",
-     *           prev_page_url: ""
-     *       }
-     *       }
+     *            "sign_status": true,
+     *            "sign_result": {
+     *            "list": [
+     *       {
+     *            "reward": 30,
+     *            "sign_time": "2019-11-01 14:20:30"
+     *              }
+     *   ],
+     *            "meta": {
+     *            "total": 1,
+     *            "per_page": 15,
+     *            "current_page": 1,
+     *            "last_page": 1,
+     *            "next_page_url": "",
+     *            "prev_page_url": ""
      *   }
+     * },
+     *            "sign_today": {
+     *            "uid": 162261523,
+     *            "price": 50,
+     *            "day": "2019-11-01",
+     *            "sign_time": "2019-11-01 09:04:43",
+     *            "created_at": "2019-11-01 09:04:43",
+     *            "updated_at": "2019-11-01 09:04:43",
+     *            "reward": 50
+     * }
+     * }
      */
     public function signRecord(Request $request)
     {

app/Modules/User/Models/UserSign.php

@@ -7,16 +7,14 @@ use Illuminate\Database\Eloquent\Model;
 class UserSign extends Model
 {
     protected $table = 'user_sign';
-    protected $fillable = ['uid','price','day','sign_time'];
+    protected $fillable = ['uid', 'price', 'day', 'sign_time'];
 
-    public function setCurrentTable($time=''){
-        if($time == '201906'){
-            $time = '';
-        }
-        if($time){
-            $this->setTable('user_sign'.$time);
-        }else{
+    public function setCurrentTable($time = '')
+    {
+        if ($time == '201906') {
             $this->setTable('user_sign');
+        } else {
+            $this->setTable('user_sign' . $time);
         }
     }
 }

app/Modules/User/Services/UserSignService.php

@@ -16,9 +16,6 @@ use App\Modules\Activity\Services\ActivityService;
 
 class UserSignService
 {
-    protected $table = 'user_sign';
-    protected $fillable = ['uid', 'price', 'day', 'sign_time'];
-
     /**
      * 用户是否已签到
      * @param $uid
@@ -46,71 +43,11 @@ class UserSignService
     {
         $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();
+        return $UserSignModel->where('uid', $uid)->where('day', '<=', date('Y-m-d'))->select('price', 'sign_time')->orderBy('sign_time', 'desc')->paginate();
     }
 
-    /**
-     * 签到
-     * @param $uid
-     * @param $day
-     * @return mixed
-     */
-    public static function sign($uid, $day)
-    {
-        \Log::info('sign:uid:' . $uid . ' day:' . $day);
-        //查看签到日期
-        $sign_day = ReadRecordService::getSignDay($uid);
-        if ($sign_day == -1) {
-            return false;
-        }
-        //已经签过到
-        if ($sign_day == $day) {
-            return false;
-        }
-
-        $count = ReadRecordService::getSignCountSimple($uid);
-        //记录签到日期
-        if ($sign_day && $sign_day == date('Y-m-d', time() - 86400)) {
-            $continue = true;
-            //昨天有签过到
-            ReadRecordService::sign((int) $uid, true);
-            $count += 1;
-        } else {
-            $continue = false;
-            //昨天没有签过到
-            ReadRecordService::sign((int) $uid, false);
-            $count = 1;
-        }
-
-        $return_fee = $fee = 30;
-        //连续签到两天 50书币
-        if ($continue && $count >= 3) {
-            $return_fee = $fee = 50;
-        }
-        if ($count % 15 == 7) {
-            $fee += 100;
-        }
-        if ($count % 15 == 0) {
-            $fee += 150;
-        }
-        UserService::addBalance($uid, $fee, 0, $fee);
-        // 先扔到redis里面，异步更新user_sign表
-        $use_redis_user_sign = true;
-        if ($use_redis_user_sign) {
-            $sign_data = ['uid' => $uid, 'price' => $fee, 'day' => $day, 'sign_time' => time(), 'created_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s')];
-            Redis::sadd('user_sign:uid', $uid);
-            Redis::hset('user_sign:uid:info', $uid, json_encode($sign_data));
-            ReadRecordService::setSignInfo($uid, json_encode($sign_data));
-        } else {
-            $user_sign_model = new UserSign();
-            $user_sign_model->setCurrentTable(date('Ym'));
-            $data = ['uid' => $uid, 'price' => $fee, 'day' => $day, 'sign_time' => time()];
-            $user_sign_model->create($data);
-        }
-        return $return_fee;
-    }
 
-    public static function signV2($uid, $day)
+    public static function sign($uid, $day)
     {
         //查看签到日期
         $sign_day = ReadRecordService::getSignDay($uid);
@@ -161,74 +98,11 @@ class UserSignService
         return ['fee' => $fee, 'days' => $count];
     }
 
-    public static function getUserSignVersion($uid)
-    {
-        return 'v2';
-        /*list($version, $sign_day, $count) = ReadRecordService::getByMultiField($uid, 'sign_version', 'sign_day', 'sign_counts');
-        if ($version == 'v2') {
-            return 'v2';
-        }
-        if ($version == 'v1') {
-            if ($sign_day == date('Y-m-d')) {
-                return $version;
-            }
-            if ($sign_day == date('Y-m-d', time() - 86400)) {
-                if ($count % 15 == 0 ) {
-                    ReadRecordService::setByMultiField($uid, ['sign_counts' => 0, 'sign_version' => 'v2']);
-                    return 'v2';
-                }
-                return $version;
-            }
-
-            ReadRecordService::setByMultiField($uid, ['sign_version' => 'v2']);
-            return 'v2';
-        }
-
-        if (!$count || !$sign_day) {
-            ReadRecordService::setByMultiField($uid, ['sign_version' => 'v2']);
-            return 'v2';
-        }
-
-        if ($sign_day == date('Y-m-d')) {
-            self::setUserSignVersion($uid, 'v1');
-            return 'v1';
-        }
-
-        if ($sign_day == date('Y-m-d', time() - 86400)) {
-            if ($count % 15 == 0) {
-                ReadRecordService::setByMultiField($uid, ['sign_counts' => 0, 'sign_version' => 'v2']);
-                return 'v2';
-            }
-            self::setUserSignVersion($uid, 'v1');
-            return 'v1';
-        }
-
-        self::setUserSignVersion($uid, 'v2');
-        return 'v2';*/
-    }
-
     public static function setUserSignVersion($uid, $version)
     {
         ReadRecordService::setByField($uid, 'sign_version', $version);
     }
 
-    public static function signToday($uid, $version = '')
-    {
-        return self::signV2($uid, date('Y-m-d'));
-        /*if(!$version){
-            $version = self::getUserSignVersion($uid);
-        }
-         if($version == 'v1'){
-             return self::sign($uid, date('Y-m-d'));
-         }
-
-        if($version == 'v2'){
-            return self::signV2($uid, date('Y-m-d'));
-        }
-        return 0;*/
-    }
-
-
     /**
      * 新签到回复
      * @param $openid

public/kyydoc/api_project.js

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

public/kyydoc/api_project.json

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