1

app/Model/InquiryModel.php

@@ -145,31 +145,11 @@ class InquiryModel extends Model
                 ->where("inquiry_items_id", $v["id"])
                 ->where("inquiry_items_id", $v["id"])
                 ->whereIn("status", QuoteMap::$status_used)
                 ->whereIn("status", QuoteMap::$status_used)
                 ->orderby("status","desc")
                 ->orderby("status","desc")
-                ->get();
+                ->orderby("price_rmb","asc")
+                ->first();
             if ($quote){
             if ($quote){
-                $quoteArr = $quote->toArray();
-                $checkPrice = 0; //rmb 为准
-                $lowerPrice = "";
-                foreach ($quoteArr as $a=>$b){
-
-                    if ($b["status"] == 3){ #已确认
-                        $lowerPrice = $b["currency"] == 1 ? "￥".$b["price_rmb"]:"$".$b["price_origin"];
-                        break;
-                    }
-                    if ($b["status"] == 2){ #已选中
+                $b = $quote->toArray();
                 $lowerPrice = $b["currency"] == 1 ? "￥".$b["price_rmb"]:"$".$b["price_origin"];
                 $lowerPrice = $b["currency"] == 1 ? "￥".$b["price_rmb"]:"$".$b["price_origin"];
-                        break;
-                    }
-
-                    $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;
                 $v["quote_price"] = $lowerPrice;
             }
             }
 
 

app/Model/QuoteModel.php

@@ -39,8 +39,10 @@ class QuoteModel extends Model
         $list = $this
         $list = $this
             ->where("inquiry_items_id",$input["inquiry_items_id"])
             ->where("inquiry_items_id",$input["inquiry_items_id"])
             ->orderBy('status','desc')
             ->orderBy('status','desc')
+            ->orderBy('price_rmb','asc')
             ->whereNotIn("status",[-1,0])
             ->whereNotIn("status",[-1,0])
-            ->paginate(@$input['limit'] ? $input["limit"] : 10, ['*'], 'p', @$input['p'] ? $input["p"] : 1)->toArray();
+            ->paginate(@$input['limit'] ? $input["limit"] : 10, ['*'], 'p', @$input['p'] ? $input["p"] : 1)
+            ->toArray();
         if (!$list) return [20001, '没有数据'];
         if (!$list) return [20001, '没有数据'];
         foreach ($list['data'] as $k=>&$v){
         foreach ($list['data'] as $k=>&$v){
             $v["price_origin"] = $v["currency"] == 2 ? "$".$v["price_origin"] : "--";
             $v["price_origin"] = $v["currency"] == 2 ? "$".$v["price_origin"] : "--";