合并分支 'akun' 到 'master'

Akun



查看合并请求 !1307

@@ -9,6 +9,7 @@
 namespace App\Console\Commands\Inquiry;
 namespace App\Console\Commands\Inquiry;
 
 
 use App\Helper\Translate;
 use App\Helper\Translate;
+use App\Helper\Validate;
 use App\Models\Inquiry\InquiryInfo;
 use App\Models\Inquiry\InquiryInfo;
 use App\Services\InquiryRelayService;
 use App\Services\InquiryRelayService;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
@@ -167,7 +168,20 @@ class SyncInquiryRelay extends Command
             $data['image'] = '';
             $data['image'] = '';
         }
         }
 
 
-        $model->createInquiry($data['name'], $data['phone'], $data['email'], $data['ip'], $country, $data['message'], $message_cn, $type, $data['time'], $data['refer'], $data['title'], $keywords, $message_sign, $data['origin_key'], $data['image']);
+        //判断手机和邮箱是否有效
+        $email_status = 0;
+        if ($data['email']) {
+            $check_email = Validate::email($data['email']);
+            $email_status = $check_email ? 1 : 0;
+        }
+        $phone_status = 0;
+        if ($data['phone']) {
+            $num_phone = preg_replace('/\D/', '', $data['phone']) ?? ''; // \D 匹配所有非数字字符
+            $check_phone = Validate::phone($num_phone);
+            $phone_status = $check_phone ? 1 : 0;
+        }
+
+        $model->createInquiry($data['name'], $data['phone'], $data['email'], $data['ip'], $country, $data['message'], $message_cn, $type, $data['time'], $data['refer'], $data['title'], $keywords, $message_sign, $data['origin_key'], $data['image'], $email_status, $phone_status);
         return true;
         return true;
     }
     }
 
 

@@ -342,7 +342,7 @@ class InquiryForwardLogic extends BaseLogic
         $rs = $this->model->edit(['status' => $status], ['id' => $this->param['id']]);
         $rs = $this->model->edit(['status' => $status], ['id' => $this->param['id']]);
 
 
         if ($rs === false) {
         if ($rs === false) {
-            $this->fail('设置无效失败');
+            $this->fail('设置失败');
         }
         }
         return $this->success();
         return $this->success();
     }
     }

@@ -85,9 +85,11 @@ class InquiryInfo extends Base
      * @param $message_sign
      * @param $message_sign
      * @param $origin_key
      * @param $origin_key
      * @param string $image
      * @param string $image
+     * @param int $email_status
+     * @param int $phone_status
      * @return bool
      * @return bool
      */
      */
-    public function createInquiry($name, $phone, $email, $ip, $country, $message, $message_cn, $type, $inquiry_date, $url, $url_title, $url_keyword, $message_sign, $origin_key, $image = '')
+    public function createInquiry($name, $phone, $email, $ip, $country, $message, $message_cn, $type, $inquiry_date, $url, $url_title, $url_keyword, $message_sign, $origin_key, $image = '', $email_status = 0, $phone_status = 0)
     {
     {
         try {
         try {
             $self = new self();
             $self = new self();