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

app/Model/QuoteModel.php

@@ -316,6 +316,10 @@ class QuoteModel extends Model
             $quote_info['brand_name'] = $brand[0]['brand_name'];
             unset($quote_info['brand_s']);
 
+            if ($quote_info['currency'] == 2) { // 美元时，含税单价为0
+                $quote_info['price_rmb'] = 0;
+            }
+
             $params = [];
             $params['spu_name'] = strtoupper($quote_info['goods_name']);
             $params['brand_name'] = $quote_info['brand_name'];
@@ -402,8 +406,14 @@ class QuoteModel extends Model
             $ApiController = new ApiController;
 
             foreach ($excel as &$v) {
+                if ($v['currency'] == 'RMB') { 
+                    $v['currency'] = 1;
+                } else {
+                    $v['currency']  = 2;
+                    $v['price_rmb'] = 0; // 美元时，含税单价为0
+                }
+
                 $v['quote_sn']         = $ApiController->createSn($this, 'quote_sn', 'B');
-                $v['currency']         = $v['currency'] == 'RMB' ? 1 : 2;
                 $v['inquiry_id']       = $input['inquiry_id'];
                 $v['inquiry_sn']       = $input['inquiry_sn'];
                 $v['inquiry_items_id'] = $input['inquiry_items_id'];