作者 刘锟

update

@@ -81,6 +81,7 @@ class InquiryForwardLogic extends BaseLogic @@ -81,6 +81,7 @@ class InquiryForwardLogic extends BaseLogic
81 if (!$project_version) { 81 if (!$project_version) {
82 continue; 82 continue;
83 } 83 }
  84 + $is_v6 = $project_version->version == 6 ? 1 : 0;
84 85
85 //计算发送时间 86 //计算发送时间
86 if ($this->param['inquiry_diff'] > 0) { 87 if ($this->param['inquiry_diff'] > 0) {
@@ -94,20 +95,7 @@ class InquiryForwardLogic extends BaseLogic @@ -94,20 +95,7 @@ class InquiryForwardLogic extends BaseLogic
94 $start_at = $now; 95 $start_at = $now;
95 } 96 }
96 97
97 - InquiryRelayDetail::insert([  
98 - 'form_id' => $info['id'],  
99 - 'website' => $website,  
100 - 'country' => $info['country'],  
101 - 'ip' => $this->param['ip'],  
102 - 'name' => $this->param['name'],  
103 - 'email' => $this->param['email'],  
104 - 'phone' => $this->param['phone'],  
105 - 'message' => $this->param['message'],  
106 - 'is_v6' => $project_version->version == 6 ? 1 : 0,  
107 - 'start_at' => $start_at,  
108 - 'created_at' => $now,  
109 - 'updated_at' => $now  
110 - ]); 98 + InquiryRelayDetail::createInquiry($info['id'], $website, $info['country'], $this->param['ip'], $this->param['name'], $this->param['email'], $this->param['phone'], $this->param['message'], $is_v6, $start_at);
111 99
112 $num += 1; 100 $num += 1;
113 } 101 }
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 * Date: 2024/9/30 5 * Date: 2024/9/30
6 * Time: 14:56 6 * Time: 14:56
7 */ 7 */
  8 +
8 namespace App\Models\Inquiry; 9 namespace App\Models\Inquiry;
9 10
10 use Illuminate\Database\Eloquent\Model; 11 use Illuminate\Database\Eloquent\Model;
@@ -22,7 +23,7 @@ class InquiryRelayDetail extends Model @@ -22,7 +23,7 @@ class InquiryRelayDetail extends Model
22 protected $table = 'gl_inquiry_relay_detail'; 23 protected $table = 'gl_inquiry_relay_detail';
23 24
24 /** 25 /**
25 - * 任务状态, 0:初始化,1:待处理,2:处理成功,3:抛弃数据,9:处理失败 26 + * 任务状态, 0:待处理,1:处理中,2:处理成功,3:抛弃数据,9:处理失败
26 */ 27 */
27 const STATUS_INIT = 0; 28 const STATUS_INIT = 0;
28 const STATUS_PEND = 1; 29 const STATUS_PEND = 1;
@@ -37,8 +38,8 @@ class InquiryRelayDetail extends Model @@ -37,8 +38,8 @@ class InquiryRelayDetail extends Model
37 public static function statusMap() 38 public static function statusMap()
38 { 39 {
39 return [ 40 return [
40 - self::STATUS_INIT => '初始化',  
41 - self::STATUS_PEND => '待处理', 41 + self::STATUS_INIT => '待处理',
  42 + self::STATUS_PEND => '处理中',
42 self::STATUS_SUCCESS => '处理成功', 43 self::STATUS_SUCCESS => '处理成功',
43 self::STATUS_FORGO => '抛弃数据', 44 self::STATUS_FORGO => '抛弃数据',
44 self::STATUS_FAIL => '处理失败', 45 self::STATUS_FAIL => '处理失败',
@@ -47,50 +48,33 @@ class InquiryRelayDetail extends Model @@ -47,50 +48,33 @@ class InquiryRelayDetail extends Model
47 48
48 /** 49 /**
49 * 创建询盘转发详情待处理任务 50 * 创建询盘转发详情待处理任务
50 - * @param $task_id  
51 * @param $form_id 51 * @param $form_id
52 - * @param $re_website 52 + * @param $website
53 * @param $country 53 * @param $country
54 * @param $ip 54 * @param $ip
55 * @param $name 55 * @param $name
56 * @param $email 56 * @param $email
57 * @param $phone 57 * @param $phone
58 * @param $message 58 * @param $message
59 - * @param $text_id  
60 - * @param $device_port  
61 - * @param $user_agent  
62 - * @param $referrer  
63 - * @param $urls  
64 * @param $is_v6 59 * @param $is_v6
65 * @param $start_at 60 * @param $start_at
66 * @param int $status 61 * @param int $status
67 - * @return ReInquiryDetail  
68 */ 62 */
69 - public static function createInquiry($task_id, $form_id, $re_website, $country, $ip, $name, $email, $phone, $message, $text_id, $device_port,  
70 - $user_agent, $referrer, $urls, $is_v6, $start_at, $status = self::STATUS_INIT, $type = 1) 63 + public static function createInquiry($form_id, $website, $country, $ip, $name, $email, $phone, $message, $is_v6, $start_at, $status = self::STATUS_INIT)
71 { 64 {
72 $self = new self(); 65 $self = new self();
73 - $self->task_id = $task_id;  
74 $self->form_id = $form_id; 66 $self->form_id = $form_id;
75 - $self->re_website = $re_website; 67 + $self->website = $website;
76 $self->country = $country; 68 $self->country = $country;
77 $self->ip = $ip; 69 $self->ip = $ip;
78 $self->name = $name; 70 $self->name = $name;
79 $self->email = $email; 71 $self->email = $email;
80 $self->phone = $phone; 72 $self->phone = $phone;
81 $self->message = $message; 73 $self->message = $message;
82 - $self->text_id = $text_id;  
83 - $self->device_port = $device_port;  
84 - $self->user_agent = $user_agent;  
85 - $self->referrer = $referrer;  
86 - $self->urls = json_encode($urls);  
87 $self->is_v6 = $is_v6; 74 $self->is_v6 = $is_v6;
88 - $self->num = count($urls) + 1;  
89 $self->start_at = $start_at; 75 $self->start_at = $start_at;
90 $self->status = $status; 76 $self->status = $status;
91 - $self->type = $type;  
92 $self->save(); 77 $self->save();
93 - return $self;  
94 } 78 }
95 79
96 /** 80 /**