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

app/admin/controller/Consult.php

@@ -2173,6 +2173,10 @@ class Consult extends Base
         $data=[];
         foreach ($list as $value){
             $value['can']= isset($value['cat_id']) && $value['cat_id'] !=0 ? made($value['cat_id']):[];
+              $cat =Db::name("cat")->where(["id"=>$value['cat_id']])->find();
+              $budget = isset($cat['order_rate']) ? $cat['order_rate']:0;
+               $value['original_price']=sprintf("%.2f",$value['budget_price']* (1 -$budget/100));
+
             $brand = Db::name("brand")->where(['id'=>$value['brand_id']])->find();
             $value['brand_name']= isset($brand['brand_name']) && $brand['brand_name']!='' ? $brand['brand_name']:"";
             $value['khname']="";

app/admin/controller/Sale.php

@@ -6,6 +6,7 @@ use app\admin\model\GoodLog;
 use app\admin\model\ProcessOrder;
 use Exception;
 use think\App;
+use think\facade\Cache;
 use think\facade\Db;
 use app\admin\model\ActionLog;
 use think\facade\Validate;
@@ -3621,6 +3622,7 @@ class Sale extends Base
                 }
                 $good_data[] = ['good_log_code' =>$outCode, "stock_id" =>$stokc['id'], "type" => 2,'stock'=>$outinfo['send_num'],"stock_name" => "wait_out_stock"];
                 GoodLog::LogAdd($this->post['token'],$good_data,"CKD");
+                Cache::push("outCode",$outCode);
                 Db::commit();
                 return app_show(0,"发货成功");
             }else{