作者 赵彬吉

update

@@ -52,7 +52,7 @@ class SyncSubmitTaskZbj extends Command @@ -52,7 +52,7 @@ class SyncSubmitTaskZbj extends Command
52 $project = Project::getProjectByDomain($task_info['data']['domain'] ?? ''); 52 $project = Project::getProjectByDomain($task_info['data']['domain'] ?? '');
53 $task_info->project_id = $project->id; 53 $task_info->project_id = $project->id;
54 54
55 - SyncSubmitTaskService::handler($task_info); 55 + SyncSubmitTaskService::handler($task_info, $task_info->created_at);
56 $task_info->status = 1; 56 $task_info->status = 1;
57 $task_info->save(); 57 $task_info->save();
58 58
@@ -53,11 +53,14 @@ class Visit extends Base @@ -53,11 +53,14 @@ class Visit extends Base
53 /** 53 /**
54 * 访问写入 54 * 访问写入
55 */ 55 */
56 - public static function saveData($data) 56 + public static function saveData($data, $date)
57 { 57 {
  58 + if(!$date){
  59 + $date = date('Y-m-d');
  60 + }
58 //判断IP当天是否有一条数据 61 //判断IP当天是否有一条数据
59 - $visit = Visit::where("ip",$data['ip'])->where("created_at",">=",Carbon::now()->today()->startOfDay())  
60 - ->where("created_at","<=",Carbon::now()->today()->endOfDay()) 62 + $visit = Visit::where("ip",$data['ip'])->where("created_at",">=",Carbon::make($date)->startOfDay())
  63 + ->where("created_at","<=",Carbon::make($date)->endOfDay())
61 ->first(); 64 ->first();
62 DB::connection('custom_mysql')->beginTransaction(); 65 DB::connection('custom_mysql')->beginTransaction();
63 if (!empty($visit) && $visit->count() >= 1){ 66 if (!empty($visit) && $visit->count() >= 1){
@@ -31,7 +31,7 @@ class SyncSubmitTaskService @@ -31,7 +31,7 @@ class SyncSubmitTaskService
31 * @author zbj 31 * @author zbj
32 * @date 2023/11/28 32 * @date 2023/11/28
33 */ 33 */
34 - public static function handler($task) 34 + public static function handler($task, $date = '')
35 { 35 {
36 $data = $task['data']; 36 $data = $task['data'];
37 $checkIpCountry = self::checkIpCountry($data['domain'], $data['ip'], $task['type']); 37 $checkIpCountry = self::checkIpCountry($data['domain'], $data['ip'], $task['type']);
@@ -53,7 +53,7 @@ class SyncSubmitTaskService @@ -53,7 +53,7 @@ class SyncSubmitTaskService
53 53
54 $action = $task['type']; 54 $action = $task['type'];
55 $handler = new self(); 55 $handler = new self();
56 - return $handler->$action($data); 56 + return $handler->$action($data, $date);
57 } 57 }
58 58
59 59
@@ -85,7 +85,7 @@ class SyncSubmitTaskService @@ -85,7 +85,7 @@ class SyncSubmitTaskService
85 * @author zbj 85 * @author zbj
86 * @date 2023/12/4 86 * @date 2023/12/4
87 */ 87 */
88 - public function inquiry($data) 88 + public function inquiry($data, $date)
89 { 89 {
90 90
91 $this->inquiryFilter($data['project_id'], $data); 91 $this->inquiryFilter($data['project_id'], $data);
@@ -113,7 +113,7 @@ class SyncSubmitTaskService @@ -113,7 +113,7 @@ class SyncSubmitTaskService
113 * @author zbj 113 * @author zbj
114 * @date 2023/12/4 114 * @date 2023/12/4
115 */ 115 */
116 - public function visit($data) 116 + public function visit($data, $date)
117 { 117 {
118 118
119 $visit_data = $data['data']; 119 $visit_data = $data['data'];
@@ -132,7 +132,7 @@ class SyncSubmitTaskService @@ -132,7 +132,7 @@ class SyncSubmitTaskService
132 $visit_data['country'] = $data['country']; 132 $visit_data['country'] = $data['country'];
133 $visit_data['updated_date'] = $data['submit_at']->toDateString(); 133 $visit_data['updated_date'] = $data['submit_at']->toDateString();
134 $visit_data['created_at'] = $data['submit_at']; 134 $visit_data['created_at'] = $data['submit_at'];
135 - Visit::saveData($visit_data); 135 + Visit::saveData($visit_data, $date);
136 136
137 return true; 137 return true;
138 } 138 }