正在显示
2 个修改的文件
包含
16 行增加
和
17 行删除
@@ -243,19 +243,17 @@ class Bind extends Api | @@ -243,19 +243,17 @@ class Bind extends Api | ||
243 | $this->error('参数错误', ['status' => 2]); | 243 | $this->error('参数错误', ['status' => 2]); |
244 | } | 244 | } |
245 | $model = new StudyScoreLog(); | 245 | $model = new StudyScoreLog(); |
246 | - $find = $model->addScore($id,$unique); | ||
247 | - if (empty($find)){ | ||
248 | - $this->error('扫码无效'); | ||
249 | - }else{ | ||
250 | - $data = db('study')->where('unique', $unique)->field('name,gender')->find(); | ||
251 | - if ($data['gender'] == 1){ | ||
252 | - $data['gender'] = '男'; | ||
253 | - }else{ | ||
254 | - $data['gender'] = '女'; | ||
255 | - } | ||
256 | - $this->success('扫码成功', $data); | 246 | + $find = $model->addScore($id, $unique); |
247 | + if ($find != 11){ | ||
248 | + $this->error('扫码无效'); | ||
257 | } | 249 | } |
258 | - | 250 | + $data = db('study')->where('unique', $unique)->field('name,gender')->find(); |
251 | + if ($data['gender'] == 1) { | ||
252 | + $data['gender'] = '男'; | ||
253 | + } else { | ||
254 | + $data['gender'] = '女'; | ||
255 | + } | ||
256 | + $this->success('扫码成功', $data); | ||
259 | } | 257 | } |
260 | 258 | ||
261 | /** | 259 | /** |
@@ -40,11 +40,11 @@ class StudyScoreLog extends Model | @@ -40,11 +40,11 @@ class StudyScoreLog extends Model | ||
40 | $sum_score = 0; | 40 | $sum_score = 0; |
41 | $list = []; | 41 | $list = []; |
42 | //判断当前项目是否在学生所属场次内 | 42 | //判断当前项目是否在学生所属场次内 |
43 | - $find = \db('ronda')->whereIn('item_ids',$id)->find(); | ||
44 | - //halt($find); | ||
45 | - if (empty($find)){ | ||
46 | - return $find; | ||
47 | - } | 43 | + $item_ids = explode(',',$ronda['item_ids']); |
44 | + $info = "扫码无效"; | ||
45 | + if (!in_array($id,$item_ids)){ | ||
46 | + return null; | ||
47 | + } | ||
48 | foreach ($score as $k) { | 48 | foreach ($score as $k) { |
49 | $sum_score += $k; | 49 | $sum_score += $k; |
50 | } | 50 | } |
@@ -151,6 +151,7 @@ class StudyScoreLog extends Model | @@ -151,6 +151,7 @@ class StudyScoreLog extends Model | ||
151 | } | 151 | } |
152 | } | 152 | } |
153 | Db::commit(); | 153 | Db::commit(); |
154 | + return 11; | ||
154 | } catch (Exception $e) { | 155 | } catch (Exception $e) { |
155 | Db::rollback(); | 156 | Db::rollback(); |
156 | $e->getMessage(); | 157 | $e->getMessage(); |
-
请 注册 或 登录 后发表评论