Merge branch 'version1.5' into dev_wf

app/admin/controller/Version.php

@@ -443,10 +443,11 @@ class Version extends BaseController
             return error_show(1004,"未找到发货单地址信息");
         }
         $orderinfo =Db::name("sale")->where(["orderCode"=>$outinfo["orderCode"],"is_del"=>0])
-        ->field("good_code,good_name,addtime")->find();
+        ->field("good_code,good_name,addtime,order_type")->find();
         if($orderinfo==false){
             return error_show(1004,"未找到订单信息");
         }
+
         $postdata=[];
         if($outinfo['post_code']!=''){
             $postCode = explode(",",$outinfo['post_code']);
@@ -455,6 +456,12 @@ class Version extends BaseController
                 $postdata=json_decode($postinfo['post_data'],true);
             }
         }
+         if($orderinfo['order_type']==3){
+                                $good=Db::name("consult_bids")->where(["spuCode"=>$orderinfo['good_code'],"is_del"=>0])->find();
+
+                            }else{
+                                $good=Db::name("good")->where(["spuCode"=>$orderinfo['good_code'],"is_del"=>0])->find();
+                            }
         $outinfo['addr'] = $addrinfo['addr'];
         $outinfo['contactor'] = $addrinfo['contactor'];
         $outinfo['mobile'] = $addrinfo['mobile'];
@@ -463,6 +470,7 @@ class Version extends BaseController
         $outinfo['good_code'] = $orderinfo['good_code'];
         $outinfo['order_time'] = $orderinfo['addtime'];
         $outinfo['post_data'] = $postdata;
+        $outinfo['good_img'] = isset($good['good_img'])&&$good['good_img']!=""?trim($good['good_img']):"";
         return app_show(0,"获取成功",$outinfo);
     }
 }