commit

app/api/controller/many/ManyController.php

@@ -78,6 +78,7 @@ class ManyController
         $many = Many::where('id', $data['id'])->find();
         $surplus = $this->surplus($data['id'], $request->uid(),1);
         $user = User::where('uid', $request->uid())->find();
+        if ($data['price'] < 10) return app('json')->fail('最小投注数10');
         if (!$many) return app('json')->fail('场次不存在');
         if ($many['number'] >= $many['money']) return app('json')->fail('已完成无法投注');
         if ($many['status'] == 0) return app('json')->fail('未开启');

app/api/controller/user/UserController.php

@@ -730,4 +730,56 @@ class UserController
         }
         return app('json')->success($data);
     }
+
+    /**
+     * 消息通知
+     * @param Request $request
+     * @return mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function notice(Request $request)
+    {
+        $data = UtilService::getMore([
+            'type',
+            'page',
+            'limit'
+        ]);
+        if ($data['type']){
+            $list = UserNotice::where('type', $data['type'])->where('uid', $request->uid())->order('id DESC')->page($data['page'], $data['limit'])->select();//系统消息
+            $list = empty($list)?[]:$list->toArray();
+            foreach ($list as &$item)
+            {
+                $item['add_time'] = date('Y-m-d H:i:s', $item['add_time']);
+            }
+            return app('json')->success($list);
+        }else{
+            $list['xt'] = UserNotice::where('type', 1)->where('uid', $request->uid())->order('id DESC')->find();//系统消息
+            if ($list['xt']) $list['xt']['add_time'] = date('Y-m-d H:i:s', $list['xt']['add_time']);
+            $list['xx'] = UserNotice::where('type', 2)->where('uid', $request->uid())->order('id DESC')->find();//新增下线
+            if ($list['xx'])$list['xx']['add_time'] = date('Y-m-d H:i:s', $list['xx']['add_time']);
+            $list['yj'] = UserNotice::where('type', 3)->where('uid', $request->uid())->order('id DESC')->find();//佣金通知
+            if ($list['yj'])$list['yj']['add_time'] = date('Y-m-d H:i:s', $list['yj']['add_time']);
+            $list['fh'] = UserNotice::where('type', 4)->where('uid', $request->uid())->order('id DESC')->find();//发货通知
+            if ($list['fh'])$list['fh']['add_time'] = date('Y-m-d H:i:s', $list['fh']['add_time']);
+            $list['dg'] = UserNotice::where('type', 5)->where('uid', $request->uid())->order('id DESC')->find();//打怪通知
+            if ($list['dg'])$list['dg']['add_time'] = date('Y-m-d H:i:s', $list['dg']['add_time']);
+            return app('json')->success($list);
+        }
+    }
+
+    public function read(Request $request)
+    {
+        $data = UtilService::getMore([
+            'id',
+        ]);
+        $notice = UserNotice::where('id', $data['id'])->find();
+        if (!$notice)  return app('json')->fail('消息不存在');
+
+        $notice['status'] = 1;
+        $notice->save();
+        $notice = empty($notice)?[]:$notice->toArray();
+        return app('json')->success($notice);
+    }
 }

app/api/controller/user/UserExtractController.php

@@ -70,8 +70,7 @@ class UserExtractController
             ['weixin', ''],
         ], $request);
         if ($extractInfo['money'] < 50) return app('json')->fail('最少提现50');
-        if (time() - CacheService::get('UserExtract_' . $request->uid(), time()) < 5) return app('json')->fail('请勿连续多次提交');
-        else CacheService::set('UserExtract_' . $request->uid(), time());
+        if (cache($request->uid())) return app('json')->fail('请勿频繁点击');
         if (!preg_match('/^(([1-9]\d*)|0)(\.\d{1-2})?$/', $extractInfo['money'])) return app('json')->fail('提现金额输入有误');
         $user = $request->user();
         $broken_time = intval(sys_config('extract_time'));
@@ -99,6 +98,7 @@ class UserExtractController
         if (!$extractInfo['cardnum'] == '')
             if (!preg_match('/^([1-9]{1})(\d{14}|\d{18})$/', $extractInfo['cardnum']))
                 return app('json')->fail('银行卡号输入有误');
+        cache($request->uid(), 1, 5);
         if (UserExtract::userExtract($request->user(), $extractInfo))
             return app('json')->successful('申请提现成功!');
         else

app/models/user/User.php

@@ -634,7 +634,7 @@ class User extends BaseModel
         $res1 = self::create($data);
         $res = $res1 && $res2;
         if ($spread){
-            UserNotice::create(['uid' => $res1['uid'], 'type' => 2, 'title' => '推荐用户', 'content' => '恭喜你,'.$res1['phone'].'在'.date('Y-m-d H:i:s', time()).'成为你的下线', 'add_time' => time()]); // 通知消息
+            UserNotice::create(['uid' => $spread, 'type' => 2, 'title' => '推荐用户', 'content' => '恭喜你,'.$res1['phone'].'在'.date('Y-m-d H:i:s', time()).'成为你的下线', 'add_time' => time()]); // 通知消息
         }
         self::checkTrans($res);
         return $res;

crmeb/subscribes/UserSubscribe.php

@@ -140,7 +140,7 @@ class UserSubscribe
      */
     public function onMany($event)
     {
-        UserNotice::create(['uid' => $event['uid'], 'type' => 4, 'title' => '打怪', 'content' => '你于'.date('Y-m-d H:i:s', time()).'成功参与'.$event['many']['name'].'场次,第'.$event['many']['stage'].'期,打怪'.$event['data']['price'].'成功,快去邀请好友一起来玩吧', 'add_time' => time()]); // 通知消息
+        UserNotice::create(['uid' => $event['uid'], 'type' => 5, 'title' => '打怪', 'content' => '你于'.date('Y-m-d H:i:s', time()).'成功参与'.$event['many']['name'].'场次,第'.$event['many']['stage'].'期,打怪'.$event['data']['price'].'成功,快去邀请好友一起来玩吧', 'add_time' => time()]); // 通知消息
     }
 
 

route/api/route.php

@@ -194,6 +194,8 @@ Route::group(function () {
 
     Route::post('auction/pay', 'many.ManyController/pay')->name('pay');// 添加收款方式
     Route::get('auction/pay_list', 'many.ManyController/pay_list')->name('pay_list');// 用户收款方式
+    Route::get('user/notice', 'user.UserController/notice')->name('notice');// 消息通知
+    Route::get('user/notice/read', 'user.UserController/read')->name('read');// 阅读消息
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, true);
 //未授权接口
 Route::group(function () {