合并分支 'akun' 到 'master'

Akun



查看合并请求 !1259

@@ -96,7 +96,10 @@ class PostInquiryForward extends Command
                     } else {
                     } else {
                         $res = $this->inquiry($detail, $val);
                         $res = $this->inquiry($detail, $val);
 
 
-                        //转发表单
+                        //转发详情
+                        $detail->status = $res ? InquiryRelayDetail::STATUS_SEND : InquiryRelayDetail::STATUS_FAIL;
+                        $detail->save();
+                        //转发询盘
                         if ($res) {
                         if ($res) {
                             $form = InquiryInfo::find($detail['form_id']);
                             $form = InquiryInfo::find($detail['form_id']);
                             $form->success = $form->success + 1;
                             $form->success = $form->success + 1;

@@ -23,12 +23,12 @@ class InquiryRelayDetail extends Model
     protected $table = 'gl_inquiry_relay_detail';
     protected $table = 'gl_inquiry_relay_detail';
 
 
     /**
     /**
-     * 任务状态， 0：待处理，1：处理中，2：处理成功，3：抛弃数据，9：处理失败
+     * 任务状态， 0：待处理，1：处理中，2：待转发，3：转发成功，9：转发失败
      */
      */
     const STATUS_INIT = 0;
     const STATUS_INIT = 0;
     const STATUS_PEND = 1;
     const STATUS_PEND = 1;
     const STATUS_SUCCESS = 2;
     const STATUS_SUCCESS = 2;
-    const STATUS_FORGO = 3;
+    const STATUS_SEND = 3;
     const STATUS_FAIL = 9;
     const STATUS_FAIL = 9;
 
 
     /**
     /**
@@ -40,9 +40,9 @@ class InquiryRelayDetail extends Model
         return [
         return [
             self::STATUS_INIT => '待处理',
             self::STATUS_INIT => '待处理',
             self::STATUS_PEND => '处理中',
             self::STATUS_PEND => '处理中',
-            self::STATUS_SUCCESS => '处理成功',
-            self::STATUS_FORGO => '抛弃数据',
-            self::STATUS_FAIL => '处理失败',
+            self::STATUS_SUCCESS => '待转发',
+            self::STATUS_SEND => '转发成功',
+            self::STATUS_FAIL => '转发失败',
         ];
         ];
     }
     }
 
 

@@ -23,7 +23,7 @@ class InquiryRelayDetailLog extends Model
     protected $table = 'gl_inquiry_relay_detail_log';
     protected $table = 'gl_inquiry_relay_detail_log';
 
 
     /**
     /**
-     * 任务状态， 0：初始化，1：待处理，2：处理成功，9：处理失败
+     * 任务状态， 0：未发送，1：发送中，2：发送成功，9：发送失败
      */
      */
     const STATUS_INIT = 0;
     const STATUS_INIT = 0;
     const STATUS_PEND = 1;
     const STATUS_PEND = 1;
@@ -43,10 +43,10 @@ class InquiryRelayDetailLog extends Model
     public static function statusMap()
     public static function statusMap()
     {
     {
         return [
         return [
-            self::STATUS_INIT => '初始化',
-            self::STATUS_PEND => '待处理',
-            self::STATUS_SUCCESS => '处理成功',
-            self::STATUS_FAIL => '处理失败',
+            self::STATUS_INIT => '未发送',
+            self::STATUS_PEND => '发送中',
+            self::STATUS_SUCCESS => '发送成功',
+            self::STATUS_FAIL => '发送失败',
         ];
         ];
     }
     }