1

app/Http/Controllers/ServerController.php

@@ -42,7 +42,7 @@ class ServerController extends Controller
         $server->handle();
     }
     public function InquiryServer($info){
-        $res= (new InquiryModel())->getList(json_decode($info,true));
+        $res= (new InquiryModel())->getList(json_decode($info,true),1);
         return ExportLayuiReturn($res);
     }
 

app/Model/InquiryModel.php

@@ -23,7 +23,7 @@ class InquiryModel extends Model
     /**
      * 询价列表
      */
-    public function getList($input = [])
+    public function getList($input = [],$export = 0)
     {
         $user_id = @$input["user_id"];
         $user_name = @$input["user_name"];
@@ -128,19 +128,36 @@ class InquiryModel extends Model
             $currency_sign = $v['currency'] == 1 ? '￥' : '$';
 
             $v['target_price'] = $currency_sign . $v['target_price']; // 客户目标报价
-            //查询最低报价
-            if ($v['currency'] == 1) { //人民币
-                $quote = $QuoteModel->select("price_rmb as quote_price")->whereIn("status", QuoteMap::$status_used)->orderBy("price_rmb", "asc")->first();
-            } else { //美金
-                $quote = $QuoteModel->select("price_origin as quote_price")->whereIn("status", QuoteMap::$status_used)->orderBy("price_origin", "asc")->first();
-            }
 
-            $v['quote_price'] = @$quote["quote_price"] > 0 ? $quote["quote_price"] : "------"; //存在报价
+            #查询所有报价
+            $v['quote_price'] = "--";
+            $quote = $QuoteModel->select("currency","price_origin","price_rmb")
+                ->where("inquiry_items_id", $v["id"])
+                ->whereIn("status", QuoteMap::$status_used)
+                ->get();
+            if ($quote){
+                $quoteArr = $quote->toArray();
+                $checkPrice = 0; //rmb 为准
+                $lowerPrice = "";
+                foreach ($quoteArr as $a=>$b){
+                    $price = $b["currency"] == 1 ? $b["price_rmb"] : $b["price_origin"]*6.5;
+                    if ($checkPrice == 0){
+                        $checkPrice = $price;
+                        $lowerPrice = $b["currency"] == 1 ? "￥".$b["price_rmb"]:"$".$b["price_origin"];
+                    }elseif ($price < $lowerPrice){
+                        $checkPrice = $price;
+                        $lowerPrice = $b["currency"] == 1 ? "￥".$b["price_rmb"]:"$".$b["price_origin"];
+                    }
+                }
+                $v["quote_price"] = $lowerPrice;
+            }
 
             // 在Redis集合中检查是否有新的报价
-            $res = $Redis->SISMEMBER('frq_quote_urge', $v['id']);
-            if ($res) {
-                $v['inquiry_sn'] = $v['inquiry_sn'] . "<span style='color:red;'>&nbsp;*</span>";
+            if ($export == 0){
+                $res = $Redis->SISMEMBER('frq_quote_urge', $v['id']);
+                if ($res) {
+                    $v['inquiry_sn'] = $v['inquiry_sn'] . "<span style='color:red;'>&nbsp;*</span>";
+                }
             }
         }
         $data = $list['data'];

app/Model/QuoteModel.php

@@ -41,6 +41,8 @@ class QuoteModel extends Model
             ->paginate(@$input['limit'] ? $input["limit"] : 10, ['*'], 'p', @$input['p'] ? $input["p"] : 1)->toArray();
         if (!$list) return [20001, '没有数据'];
         foreach ($list['data'] as $k=>&$v){
+            $v["price_origin"] = "$".$v["price_origin"];
+            $v["price_rmb"] =  "￥".$v["price_rmb"];
             $v['status'] = QuoteMap::$status[$v["status"]];
             if ($v["create_name"] == "digikey"){
                 $v["create_name"] = "digikey(包装：".$v["raw_goods_packing"].")";