1

application/admin/controller/Crontab.php

@@ -26,7 +26,6 @@ class Crontab extends Controller
             foreach($list as $k=>$v){
 
                 if($v['send_time']<time()){
-
                     $theme=Db::table('think_email_template')
                         ->where('id',$v['theme_id'])
                         ->where('is_deleted',0)
@@ -50,10 +49,10 @@ class Crontab extends Controller
                             $mail->FromName = $email['form_name'];
                             $mail->Username = $email['email'];
                             $mail->Password = $email['password'];
-                            $mail->From = $email['email'];
+                            $mail->From = $v['from'];
                             $mail->isHTML(true);
                             $mail->addAddress($v['to']);
-                            $mail->Subject = $theme['theme'];
+                            $mail->Subject = $v['theme'];
                             $mail->Body = $v['content'];
                             $status = $mail->send();
                             if($status){
@@ -62,7 +61,7 @@ class Crontab extends Controller
                                 $status=0;
                             }
 
-                            //发件人邮箱不存在的情况下
+//                            发件人邮箱不存在的情况下
                             Db::table('think_email_send')
                                 ->where('id',$v['id'])
                                 ->update(['update_time'=>time(),'status'=>1,'send_status'=>$status,'remark'=>'该数据已经在脚本中自动发送,发送时间是:'.date('Y-m-d H:i:s')]);
@@ -76,7 +75,7 @@ class Crontab extends Controller
                                 ->update(['update_time'=>time(),'status'=>2,'remark'=>'发件人邮箱不存在,任务自动取消该条数据']);
                         }
                     }else{
-                        //主题模版不存在的情况下
+                        // 主题模版不存在的情况下
                         Db::table('think_email_send')
                             ->where('id',$v['id'])
                             ->update(['update_time'=>time(),'status'=>2,'remark'=>'主题模版不存在,任务自动取消该条数据']);

application/admin/controller/Customer.php

@@ -1597,6 +1597,18 @@ class Customer extends Base
 //                    ];
 //                    $status = 0; // 设置为0标识此行有错误
 //                }
+                if (!empty($v[2])) {
+                    $checkEmail = Db::name('customer')->wehre('emial',$v[2])->where('spread_id',session('uid'))->find();
+                    if ($checkEmail) {
+                        $error[] = [
+                            'rows'    => $k,
+                            'msg'     => '此客户邮箱已存在',
+                            'content' => $v[2],
+                            'uni'     => $uni,
+                        ];
+                        $status = 0; // 设置为0标识此行有错误
+                    }
+                }
                 $customer_chengk = new CustomerModel();
                 if ($customer_chengk->checkCustomer($v[2],$v[1],$v[3])) {
                     $error[] = [
@@ -1606,21 +1618,20 @@ class Customer extends Base
                         'uni'     => $uni,
                     ];
                     $status = 0; // 设置为0标识此行有错误
-                } else {
-                    if (!empty($v[2])) {
-                        $ckeckWebsiteCompany = Db::name('customer')->where('company',$v[1])->where('website',$v[3])->where('status',0)->where('email','')->find();
-                        if ($ckeckWebsiteCompany) {
-                            Db::name('customer')->where('id',$ckeckWebsiteCompany['id'])->update(['spread_id'=>session('uid'),'emial' => $v[2]]);
-                            Db::name('customer')->where('emial',$v[2])->setInc('people',1);
-                            Db::name('ranking')->where('c_id',$ckeckWebsiteCompany['id'])->update([['admin_id' => session('uid')]]);
-                            $error[] = [
-                                'rows'    => $k,
-                                'msg'     => '已存在此公司，网站客户，直接更新，不计入添加次数',
-                                'content' => "已存在此公司，网站客户，直接更新，不计入添加次数",
-                                'uni'     => $uni,
-                            ];
-                            $status = 0; // 设置为0标识此行有错误
-                        }
+                }
+                if (!empty($v[2])) {
+                    $ckeckWebsiteCompany = Db::name('customer')->where('company',$v[1])->where('website',$v[3])->where('status',0)->where('email','')->find();
+                    if ($ckeckWebsiteCompany) {
+                        Db::name('customer')->where('id',$ckeckWebsiteCompany['id'])->update(['spread_id'=>session('uid'),'emial' => $v[2]]);
+                        Db::name('customer')->where('emial',$v[2])->setInc('people',1);
+                        Db::name('ranking')->where('c_id',$ckeckWebsiteCompany['id'])->update([['admin_id' => session('uid')]]);
+                        $error[] = [
+                            'rows'    => $k,
+                            'msg'     => '已存在此公司，网站客户，直接更新，不计入添加次数',
+                            'content' => "已存在此公司，网站客户，直接更新，不计入添加次数",
+                            'uni'     => $uni,
+                        ];
+                        $status = 0; // 设置为0标识此行有错误
                     }
                 }
                 // 判断网站

application/admin/controller/EmailSend.php

@@ -134,13 +134,16 @@ class EmailSend extends Base
                 return json(['code' => 100, 'msg' => '请先填写邮件内容']);
             }
 
-            $resEmail = explode('&&',$param['to']);
+            $resEmail = explode(' ',$param['to']);
+
             foreach ($resEmail as $v) {
+                if ($v == '') return json(['code' => 100,'msg' => '空格间隔过长，请检查']);
                 $res = Db::name('customer')->where('email',$v)->where('spread_id',session('uid'))->find();
                 if (!$res) {
                     return json(['code' => 100,'msg' => $v.'此邮箱不存在']);
                 }
             }
+            var_dump($resEmail);die;
             $to_email = Db::table('think_email')->where('id', 'in', $param['email_id'])->select();
             $theme = Db::table('think_email_template')->where('id', $param['theme'])->value('theme');
             $send_email = Db::name('customer')->where('email', 'in', implode(',',$resEmail))->where('spread_id',session('uid'))->field('id,email')->select();
@@ -208,7 +211,7 @@ class EmailSend extends Base
                     $data['theme'] = $theme;
                     $data['theme_id'] = $param['theme'];
                     $data['content'] = $param['content'];
-                    $data['email_id'] = $param['email_id'];
+                    $data['email_id'] = $v['id'];
                     $data['send_type'] = $n['send_type'];
                     $data['spread_id'] = session('uid');
                     $data['create_time'] = time();
@@ -258,7 +261,7 @@ class EmailSend extends Base
             $email = Db::name('customer')->where('id','in',$ids)->where('status','in','0,1,2')->column('email');
             $id = explode(',', $ids);
 //            $this->assign('customer', $customer);
-            $this->assign('emial' ,implode('&&',$email));
+            $this->assign('emial' ,implode(' ',$email));
             $this->assign('ids', $ids);
         } else {
             $customer = Db::name('customer')->where('spread_id', session('uid'))->where('status','in','0,1,2')->field('id,email,name')->select();
@@ -384,9 +387,10 @@ class EmailSend extends Base
     public function editDraft()
     {
         $data = $this->request->param();
-        $resEmail = explode('&&',$data['to']);
+        $resEmail = explode(' ',$data['to']);
 //        var_dump($data);die;
         foreach ($resEmail as $v) {
+            if ($v == '') return json(['code' => 100,'msg' => '空格间隔过长，请检查']);
             $res = Db::name('customer')->where('email',$v)->where('spread_id',session('uid'))->find();
             if (!$res) {
                 return json(['code' => 100,'msg' => $v.'此邮箱不存在']);

application/admin/view/email_send/add.html

@@ -51,9 +51,9 @@
                             <label class="layui-form-label">收件人</label>
                             <div class="layui-input-inline" style="width: 300px;">
                                 {if !empty($ids)}
-                                <input type="text" name="to" value="{$emial}" class="layui-input" id="shoujian" lay-verify="required" placeholder="多个邮箱请用&符号隔开">
+                                <input type="text" name="to" value="{$emial}" class="layui-input" id="shoujian" lay-verify="required" placeholder="多个邮箱请用空格符号隔开">
                                 {else}
-                                <input type="text" name="to" value="" class="layui-input" id="shoujian" lay-verify="required" placeholder="多个邮箱请用&符号隔开">
+                                <input type="text" name="to" value="" class="layui-input" id="shoujian" lay-verify="required" placeholder="多个邮箱请用空格符号隔开">
                                 {/if}
                             </div>
                         </div>