作者 开飞机的舒克

接口优化

@@ -18,7 +18,7 @@ class Bind extends Api @@ -18,7 +18,7 @@ class Bind extends Api
18 18
19 19
20 /** 20 /**
21 - * @ApiTitle (输入学号绑定信息) 21 + * @ApiTitle (输入手环ID绑定信息)
22 * @ApiMethod (POST) 22 * @ApiMethod (POST)
23 * @ApiParams (name="unique", type="string", required=true, description="手环id") 23 * @ApiParams (name="unique", type="string", required=true, description="手环id")
24 * @ApiReturn ({ 24 * @ApiReturn ({
@@ -27,7 +27,7 @@ class Bind extends Api @@ -27,7 +27,7 @@ class Bind extends Api
27 "data": {} 27 "data": {}
28 }) 28 })
29 */ 29 */
30 - public function inputUnique() 30 + public function inUnique()
31 { 31 {
32 $unique = $this->request->param('unique'); 32 $unique = $this->request->param('unique');
33 $user = $this->auth->getUserinfo(); 33 $user = $this->auth->getUserinfo();
@@ -150,20 +150,20 @@ class Bind extends Api @@ -150,20 +150,20 @@ class Bind extends Api
150 */ 150 */
151 public function Ewm() 151 public function Ewm()
152 { 152 {
153 - $items_id = $this->request->param('items_id'); 153 + $id = $this->request->param('id');
154 $unique = $this->request->param('unique'); 154 $unique = $this->request->param('unique');
155 - if (empty($unique) && empty($items_id)) { 155 + if (empty($unique) && empty($id)) {
156 $this->error('参数错误', ['status' => 2]); 156 $this->error('参数错误', ['status' => 2]);
157 } 157 }
158 $study = db('study')->where('unique', $unique)->field('id,grade_id,name,team_id,earn_score')->find(); 158 $study = db('study')->where('unique', $unique)->field('id,grade_id,name,team_id,earn_score')->find();
159 - $item = db('item')->where('id', $items_id)->field('score,title,campus_id')->find(); 159 + $item = db('item')->where('id', $id)->field('score,title,campus_id')->find();
160 $team = \db('team')->where('id', $study['team_id'])->field('title,score')->find(); 160 $team = \db('team')->where('id', $study['team_id'])->field('title,score')->find();
161 $sum1 = $team['score'] + $item['score']; //合计战队总分 161 $sum1 = $team['score'] + $item['score']; //合计战队总分
162 $sum2 = $study['earn_score'] + $item['score']; //合计个人总分 162 $sum2 = $study['earn_score'] + $item['score']; //合计个人总分
163 Db::startTrans(); 163 Db::startTrans();
164 try { 164 try {
165 db('study_score_log')->insert([ 165 db('study_score_log')->insert([
166 - 'item_id' => $items_id, 166 + 'item_id' => $id,
167 'campus_id' => $item['campus_id'], 167 'campus_id' => $item['campus_id'],
168 'study_id' => $study['id'], 168 'study_id' => $study['id'],
169 'team_id' => $study['team_id'], 169 'team_id' => $study['team_id'],
@@ -194,7 +194,7 @@ class Bind extends Api @@ -194,7 +194,7 @@ class Bind extends Api
194 /** 194 /**
195 * @ApiTitle (获取学生信息) 195 * @ApiTitle (获取学生信息)
196 * @ApiMethod (POST) 196 * @ApiMethod (POST)
197 - * @ApiParams (name="campus_id", type="string", required=true, description="校区id") 197 + * @ApiParams (name="cid", type="string", required=true, description="校区id")
198 * @ApiReturn ({ 198 * @ApiReturn ({
199 "code":"状态码", 199 "code":"状态码",
200 "msg": "提示消息", 200 "msg": "提示消息",
@@ -220,7 +220,7 @@ class Bind extends Api @@ -220,7 +220,7 @@ class Bind extends Api
220 public function getScore() 220 public function getScore()
221 { 221 {
222 $user = $this->auth->getUserinfo(); 222 $user = $this->auth->getUserinfo();
223 - $campus_id = $this->request->param('campus_id'); 223 + $cid = $this->request->param('cid');
224 $sid = \db('study')->where('user_id', $user['id'])->value('id'); 224 $sid = \db('study')->where('user_id', $user['id'])->value('id');
225 //获取学生的信息 225 //获取学生的信息
226 $data = \db('study')->where('id', $sid)->field('avatar,name,earn_score')->find(); 226 $data = \db('study')->where('id', $sid)->field('avatar,name,earn_score')->find();
@@ -230,7 +230,7 @@ class Bind extends Api @@ -230,7 +230,7 @@ class Bind extends Api
230 ->distinct('item_id') 230 ->distinct('item_id')
231 ->field('item_id,SUM(score) as sum_score') 231 ->field('item_id,SUM(score) as sum_score')
232 ->group('item_id') 232 ->group('item_id')
233 - ->where(['campus_id' => $campus_id, 'study_id' => $sid]) 233 + ->where(['campus_id' => $cid, 'study_id' => $sid])
234 ->paginate(3) 234 ->paginate(3)
235 ->each(function ($item, $key) { 235 ->each(function ($item, $key) {
236 $item['title'] = \db('item i') 236 $item['title'] = \db('item i')
@@ -144,7 +144,7 @@ class User extends Api @@ -144,7 +144,7 @@ class User extends Api
144 //老师 144 //老师
145 $data['hd'] = '活动现场'; 145 $data['hd'] = '活动现场';
146 } 146 }
147 - $data['xh'] = "输入学号绑定信息"; 147 + $data['xh'] = "输入手环ID绑定信息";
148 $data['sm'] = "扫码绑定信息"; 148 $data['sm'] = "扫码绑定信息";
149 $this->success('',$data); 149 $this->success('',$data);
150 } 150 }