任务优化

application/api/controller/Task.php

@@ -148,6 +148,7 @@ class Task extends Api
                 Db::commit();
                 $this->success("领取成功！");
             } else {
+                Db::rollback();
                 $this->error("领取失败！");
             }
         }catch (ValidateException $e) {

application/common/model/TaskLog.php

@@ -46,13 +46,7 @@ class TaskLog extends Model
         $tasklogInfo = $tasklogModel->where($where)->find();
         if($tasklogInfo) {
             if($tasklogInfo["finish_number"] >= $taskInfo["number"] || $tasklogInfo["is_finish"] == 1) {
-                if($tasklogInfo["finish_number"] >= $taskInfo["number"]) {
-                    $tasklogInfo->is_finish = 1;
-                    $tasklogInfo->save();
-                    return false;
-                } else {
-                    return false;
-                }
+                return false;
             }
             $finish_number = $tasklogInfo["finish_number"]+$number;
             $where = [];
@@ -61,7 +55,7 @@ class TaskLog extends Model
             $data["finish_number"] = $finish_number;
             $data["pace"] = round($finish_number/$taskInfo["number"],2)*100;
             $data["finish_date"] = date("Ymd");
-            if($data["pace"]>=100) {
+            if($finish_number >= $taskInfo["number"]) {
                 $data["is_finish"] = 1;
                 $data["finish_time"] = time();
             }
@@ -73,7 +67,7 @@ class TaskLog extends Model
             $data["finish_number"] = $number;
             $data["pace"] = round($number/$taskInfo["number"],2)*100;
             $data["finish_date"] = date("Ymd");
-            if($data["pace"]==100) {
+            if($number >= $taskInfo["number"]) {
                 $data["is_finish"] = 1;
                 $data["finish_time"] = time();
             }