作者 刘锟

update

@@ -74,6 +74,7 @@ class InquiryForwardLogic extends BaseLogic @@ -74,6 +74,7 @@ class InquiryForwardLogic extends BaseLogic
74 DB::beginTransaction(); 74 DB::beginTransaction();
75 try { 75 try {
76 $num = 0; 76 $num = 0;
  77 + $now = date('Y-m-d H:i:s');
77 foreach ($this->param['forward_url'] as $website) { 78 foreach ($this->param['forward_url'] as $website) {
78 //获取站点对应项目版本 79 //获取站点对应项目版本
79 $project_version = InquiryProject::select(['version'])->where('domain', 'like', '%' . $website . '%')->orWhere('test_domain', 'like', '%' . $website . '%')->first(); 80 $project_version = InquiryProject::select(['version'])->where('domain', 'like', '%' . $website . '%')->orWhere('test_domain', 'like', '%' . $website . '%')->first();
@@ -83,12 +84,15 @@ class InquiryForwardLogic extends BaseLogic @@ -83,12 +84,15 @@ class InquiryForwardLogic extends BaseLogic
83 84
84 //计算发送时间 85 //计算发送时间
85 if ($this->param['inquiry_diff'] > 0) { 86 if ($this->param['inquiry_diff'] > 0) {
86 - $start_at = date('Y-m-d H:i:s', strtotime($this->param['inquiry_date']) . ' -' . $this->param['inquiry_diff'] . ' hours'); 87 + $start_at = date('Y-m-d H:i:s', strtotime($this->param['inquiry_date'] . ' -' . $this->param['inquiry_diff'] . ' hours'));
87 } elseif ($this->param['inquiry_diff'] < 0) { 88 } elseif ($this->param['inquiry_diff'] < 0) {
88 - $start_at = date('Y-m-d H:i:s', strtotime($this->param['inquiry_date']) . ' +' . abs($this->param['inquiry_diff']) . ' hours'); 89 + $start_at = date('Y-m-d H:i:s', strtotime($this->param['inquiry_date'] . ' +' . abs($this->param['inquiry_diff']) . ' hours'));
89 } else { 90 } else {
90 $start_at = $this->param['inquiry_date']; 91 $start_at = $this->param['inquiry_date'];
91 } 92 }
  93 + if ($start_at < $now) {
  94 + $start_at = $now;
  95 + }
92 96
93 InquiryRelayDetail::insert([ 97 InquiryRelayDetail::insert([
94 'form_id' => $info['id'], 98 'form_id' => $info['id'],
@@ -101,8 +105,8 @@ class InquiryForwardLogic extends BaseLogic @@ -101,8 +105,8 @@ class InquiryForwardLogic extends BaseLogic
101 'message' => $this->param['message'], 105 'message' => $this->param['message'],
102 'is_v6' => $project_version->version == 6 ? 1 : 0, 106 'is_v6' => $project_version->version == 6 ? 1 : 0,
103 'start_at' => $start_at, 107 'start_at' => $start_at,
104 - 'created_at' => date('Y-m-d H:i:s'),  
105 - 'updated_at' => date('Y-m-d H:i:s') 108 + 'created_at' => $now,
  109 + 'updated_at' => $now
106 ]); 110 ]);
107 111
108 $num += 1; 112 $num += 1;