调整发送邮件

app/Http/Controllers/OrderController.php

@@ -13,6 +13,7 @@ use Illuminate\Support\Facades\Redis;
 use App\Http\Error;
 use App\Http\Error;
 use Excel;
 use Excel;
 use App\Model\OrderModel;
 use App\Model\OrderModel;
+use App\Model\OrderExtendModel;
 use App\Model\UserMainModel;
 use App\Model\UserMainModel;
 use App\Model\OrderActionLogModel;
 use App\Model\OrderActionLogModel;
 use App\Model\OrderReturnModel;
 use App\Model\OrderReturnModel;
@@ -2203,6 +2204,10 @@ Class OrderController extends Controller
             $this->pushQueue($v);
             $this->pushQueue($v);
         }
         }
 
 
+        // 标记邮件已发送
+        $OrderExtendModel = new OrderExtendModel;
+        $OrderExtendModel->where('order_id', $id)->update(['is_send_mail' => 1]);
+
         // 添加操作日志
         // 添加操作日志
         $event = '发送邮件成功，收件人邮箱：'.json_encode($to_user_array).'，抄送人邮箱：'.json_encode($cc_send_mail_array);
         $event = '发送邮件成功，收件人邮箱：'.json_encode($to_user_array).'，抄送人邮箱：'.json_encode($cc_send_mail_array);
 
 

app/Model/OrderExtendModel.php

+<?php
+namespace App\Model;
+
+use Illuminate\Database\Eloquent\Model;
+use Request;
+use Excel;
+use DB;
+
+class OrderExtendModel extends Model
+{
+    protected $connection = 'order';
+    protected $table      = 'lie_order_extend';
+    protected $primaryKey = 'temp_id';
+    public $timestamps    = false;
+
+    
+
+}
\ No newline at end of file

resources/views/detail/content.blade.php

@@ -176,8 +176,13 @@
 
 
                 <!-- 判断邮件发送时机 -->  
                 <!-- 判断邮件发送时机 -->  
                 @if (!empty($order_temp_info['erp_sn']) && in_array($order_info['status'], [2, 3, 4]))
                 @if (!empty($order_temp_info['erp_sn']) && in_array($order_info['status'], [2, 3, 4]))
-                    <a class="btn btn-warning send_mail" data-id="{{ $order_info['order_id'] }}">发送邮件</a>        
+                    @if ($order_temp_info['is_send_mail'])
+                        <a class="btn btn-danger send_mail" data-id="{{ $order_info['order_id'] }}">再次发送邮件</a>
+                    @else        
+                        <a class="btn btn-warning send_mail" data-id="{{ $order_info['order_id'] }}">发送邮件</a>        
+                    @endif
                 @endif
                 @endif
+
                 <!-- 预付款 管理员完成首款对账后改变'对账'按钮 -->
                 <!-- 预付款 管理员完成首款对账后改变'对账'按钮 -->
                 @if (in_array($order_info['status'], [2, 3]) && in_array('check_account', $userPerms))
                 @if (in_array($order_info['status'], [2, 3]) && in_array('check_account', $userPerms))
                     @if ($order_info['status'] == 3 && (!empty($order_pay_log) && $order_pay_log[0]['pay_type'] != ''))
                     @if ($order_info['status'] == 3 && (!empty($order_pay_log) && $order_pay_log[0]['pay_type'] != ''))

resources/views/orderlist/content.blade.php

@@ -362,7 +362,11 @@
                                         @endif
                                         @endif
 
 
                                         @if (!empty($order_extend->erp_sn) && in_array($v['status'], [2, 3, 4]))
                                         @if (!empty($order_extend->erp_sn) && in_array($v['status'], [2, 3, 4]))
-                                            <a class="btn btn-warning send_mail" data-id="{{ $v['order_id'] }}">发送邮件</a>        
+                                            @if ($order_extend->is_send_mail)
+                                                <a class="btn btn-danger send_mail" data-id="{{ $v['order_id'] }}">再次发送邮件</a> 
+                                            @else       
+                                                <a class="btn btn-warning send_mail" data-id="{{ $v['order_id'] }}">发送邮件</a>        
+                                            @endif
                                         @endif
                                         @endif
 
 
 	                                    <a class="btn btn-primary" href="{{URL('details', ['order_id'=>$v['order_id']])}}" target="_blank">详情</a>     
 	                                    <a class="btn btn-primary" href="{{URL('details', ['order_id'=>$v['order_id']])}}" target="_blank">详情</a>