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

app/Model/QuoteModel.php

@@ -309,6 +309,12 @@ class QuoteModel extends Model
             $inquiry_items_status = InquiryItemsModel::where('id', $quote_info['inquiry_items_id'])->value('status');
             $inquiry_items_status = InquiryItemsModel::where('id', $quote_info['inquiry_items_id'])->value('status');
             if ($inquiry_items_status == -1) return [1, '新增报价失败，该询价明细已关闭'];
             if ($inquiry_items_status == -1) return [1, '新增报价失败，该询价明细已关闭'];
 
 
+            $brand = json_decode($quote_info['brand_s'], true);
+
+            $quote_info['brand_id']   = $brand[0]['brand_id'];
+            $quote_info['brand_name'] = $brand[0]['brand_name'];
+            unset($quote_info['brand_s']);
+
             $params = [];
             $params = [];
             $params['spu_name'] = strtoupper($quote_info['goods_name']);
             $params['spu_name'] = strtoupper($quote_info['goods_name']);
             $params['brand_name'] = $quote_info['brand_name'];
             $params['brand_name'] = $quote_info['brand_name'];
@@ -581,7 +587,15 @@ class QuoteModel extends Model
         if (!$input['quote_id']) return [-1, '参数缺失'];
         if (!$input['quote_id']) return [-1, '参数缺失'];
 
 
         try {
         try {
-            $this->where('id', $input['quote_id'])->update($input['quote_info']);
+            $quote_info = $input['quote_info'];
+
+            $brand = json_decode($quote_info['brand_s'], true);
+            
+            $quote_info['brand_id']   = $brand[0]['brand_id'];
+            $quote_info['brand_name'] = $brand[0]['brand_name'];
+            unset($quote_info['brand_s']);
+
+            $this->where('id', $input['quote_id'])->update($quote_info);
 
 
             $data = [];
             $data = [];
             $data['types']       = 2;
             $data['types']       = 2;