wugg 2 years ago
parent
commit
81c612efe2
2 changed files with 6 additions and 2 deletions
  1. 4 2
      app/admin/controller/Project.php
  2. 2 0
      app/admin/controller/Sale.php

+ 4 - 2
app/admin/controller/Project.php

@@ -346,6 +346,7 @@ class Project extends Base
                 $nake =Db::name("good_nake")->where(["spuCode"=>$good['spuCode'],"is_del"=>0])->where([["min_num","<=",$value['num']]])
                     ->order("min_num desc")->find();
                 $good['origin_price']=$nake['nake_total'];
+                $good_img = $good['good_thumb_img'];
             }else{
                 $good=Db::name("consult_bids")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
                 $good['specinfo'] = isset($good['specinfo'])&&$good['specinfo']!=""?json_decode($good['specinfo'],
@@ -365,6 +366,7 @@ class Project extends Base
                     "cost_fee"=>$good["cost_fee"],
                     "num"=>$value["num"],
                 ];
+                $good_img = $good['good_img'];
 //                if($good['is_gold_price']==1){
 //                    $price = GoldPrice($god, 0);
 //                }else{
@@ -373,7 +375,7 @@ class Project extends Base
             }
             $nobel =\think\facade\Config::get("noble");
             $value['good_name'] = isset($good['good_name'])?$good['good_name']:"";
-            $value['good_img'] = isset($good['good_img'])?$good['good_img']:"";
+          //  $value['good_img'] = isset($good['good_img'])?$good['good_img']:"";
             $value['brand_id'] = isset($good['brand_id'])?$good['brand_id']:"";
             $brand = Db::name("brand")->where(['id'=>$value["brand_id"]])->find();
             $value['brand_name'] =isset($brand['brand_name']) ? $brand['brand_name']:"";
@@ -383,7 +385,7 @@ class Project extends Base
             $value["unit_name"]=isset($unit['unit'])?$unit['unit']:"";
             $value['cost_desc'] = isset($good['cost_desc'])?$good['cost_desc']:"";
             $value['work_day'] = isset($good['work_day'])?$good['work_day']:"";
-            $value['good_img'] = isset($good['good_img'])?$good['good_img']:"";
+            $value['good_img'] = $good_img;
             $value['expire_day'] = isset($good['expire_day'])?$good['expire_day']:"";
             $value['origin_place'] = isset($good['origin_place'])?$good['origin_place']:"";
             $value['supplierNo'] = isset($good['supplierNo'])?$good['supplierNo']:"";

+ 2 - 0
app/admin/controller/Sale.php

@@ -3033,6 +3033,8 @@ class Sale extends Base
             $price=Db::name("gold_price1")->where(["type"=>$order['noble_metal'],"status"=>1,"is_del"=>0])->order("addtime desc")->find();
 
         }
+        $supplier = Db::name("supplier")->where(["code"=>$order['supplierNo']])->find();
+        $order['supplier_name'] = isset($supplier['name']) ? $supplier['name']:"";
         $order["gold_price"] = isset($price['price'])?$price['price']:0;
         return app_show(0,"获取成功",$order);
     }