Merge branch 'version1.5' of wugg/phpstock into master-online

app/admin/controller/Purch.php

@@ -251,6 +251,11 @@ class Purch extends Base
         $data['can'] = $int;
         $data['goodinfo'] = $goon;
         $data['purcheasediff'] = $dom;
+
+        if(isset($data['companyNo'])&&$data['companyNo']!=""){
+            $company = Db::name("business")->where(["companyNo"=>$data['companyNo']])->find();
+        }
+        $goon['company'] = isset($company['company'])?$company['company']:"";
         //$data['info'] = $var;
         $data['purcheaseback'] = $var;
         return app_show(0,"获取成功",$data);

app/admin/controller/Sale.php

@@ -999,7 +999,7 @@ class Sale extends Base
             "demo_fee"=>$goodinfo['demo_fee'],
             "good_num"=>$data['good_num'],
             "good_type"=>1,
-            "order_type"=>3,
+            "order_type"=>4,
         ];
         $datas=[
             "orderCode"=>$orderCode,