x

@@ -34,6 +34,7 @@ class HotMail {
 
 
         // 把黑格自己的也算进去
         // 把黑格自己的也算进去
         $this->shopkHotEmail = array_merge($this->getHotEmail(),$fob);
         $this->shopkHotEmail = array_merge($this->getHotEmail(),$fob);
+        $this->shopkHotEmail = array_map('strtolower',$this->shopkHotEmail);
         if($this->shopkHotEmail){
         if($this->shopkHotEmail){
             array_map([$this,'moveMail'],$fob);
             array_map([$this,'moveMail'],$fob);
         }
         }
@@ -92,7 +93,7 @@ class HotMail {
         $lists = db()->all(
         $lists = db()->all(
             sprintf(
             sprintf(
                 "select `id`,`folder_id`,`lists`.`email_id`,`%s` from `lists` left join `fob_hot_mail` on `fob_hot_mail`.`lists_id` = `lists`.`id` where `lists`.`email_id` = %d and `folder_id` = %d and `fob_hot_mail`.`lists_id` is null order by `id` asc limit 1000 offset ".(($p-1)*1000),
                 "select `id`,`folder_id`,`lists`.`email_id`,`%s` from `lists` left join `fob_hot_mail` on `fob_hot_mail`.`lists_id` = `lists`.`id` where `lists`.`email_id` = %d and `folder_id` = %d and `fob_hot_mail`.`lists_id` is null order by `id` asc limit 1000 offset ".(($p-1)*1000),
-                $data->type=='s' ? 'from':'to_name', // 收件箱查询 from字段 发件箱 查询 to_name字段
+                $data->type=='f' ? 'to_name':'from', // 收件箱查询 from字段 发件箱 查询 to_name字段
                 $data->email_id,
                 $data->email_id,
                 $data->folder_id
                 $data->folder_id
             )
             )
@@ -122,7 +123,7 @@ class HotMail {
     private function insertData(array $data){
     private function insertData(array $data){
 
 
         $isInsert = false;
         $isInsert = false;
-        if($data['folder'] == 's'){
+        if($data['folder'] != 'f'){
             // 收件箱 匹配 from 字段
             // 收件箱 匹配 from 字段
             $isInsert = in_array(strtolower($data['from']),$this->shopkHotEmail);
             $isInsert = in_array(strtolower($data['from']),$this->shopkHotEmail);
         }else{
         }else{