Merge branch 'master' of ssh://119.23.72.7:22611/q578953158/php_frq_api

app/Model/InquiryItemsAssignModel.php

@@ -27,5 +27,17 @@ class InquiryItemsAssignModel extends Model
 		return $this->insert($data);
 	}
 
+	// 删除
+	public function delAssign($inquiry_items_id, $assign_uid, $types=1)
+	{
+		$map = [];
+		$map['types']            = $types;
+		$map['inquiry_items_id'] = $inquiry_items_id;
+		$map['assign_uid']       = $assign_uid;
+		
+		return $this->where($map)->delete();
+	}
+
+
 
 }
\ No newline at end of file

app/Model/QuoteModel.php

@@ -203,11 +203,16 @@ class QuoteModel extends Model
         try {
             $quote_info = $this->find($id);
 
-            if ($quote_info['status'] == -1) return [1, '该报价已撤销，请刷新页面查看'];
+            if ($quote_info['status'] == -1) return [1, '撤销失败，该报价已撤销，请刷新页面查看'];
+            if ($quote_info['status'] == 3) return [1, '撤销失败，该报价已确认，请刷新页面查看'];
             // if ($quote_info['status'] > 1) return [1, '当前报价状态不能撤销，请刷新页面查看'];
 
             $res = $this->where('id', $id)->update(['status' => -1, 'cancel_reason'=>$cancel_reason]);
 
+            // 需要删除当前用户的领取记录
+            $InquiryItemsAssignModel = new InquiryItemsAssignModel;
+            $InquiryItemsAssignModel->delAssign($quote_info['inquiry_items_id'], $quote_info['create_uid']);
+
             $data = [];
             $data['types']       = 2;
             $data['relation_id'] = $id;