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

app/admin/controller/Purchin.php

@@ -356,7 +356,7 @@ class Purchin extends BaseController
             $info['updatetime'] = date("Y-m-d H:i:s");
             $up =Db::name("purchease_in")->save($info);
             if($up){
-                ActionLog::logAdd($this->post['token'],$order,"rkd",2,$this->post);
+                ActionLog::logAdd($this->post['token'],$order,"RKD",2,$this->post);
                 $process=["order_code"=>$info['wsm_in_code'],"order_id"=>$info['id'],"order_status"=>$info['status'],"order_type"=>'RKD'];
                 ProcessOrder::AddProcess($this->post['token'],$process);
                 if(!empty($error_list)){

app/admin/controller/Sale.php

@@ -2563,6 +2563,8 @@ class Sale extends Base
         $codeinfo['contactor'] = isset($addr['contactor']) ? $addr['contactor'] : "";
         $codeinfo['mobile'] = isset($addr['mobile']) ? $addr['mobile'] : "";
         $codeinfo['can'] = $int;
+        $orderReturn = Db::name("order_return")->where(["outCode"=>$outCode,"is_del"=>0])->order("id desc")->find();
+        $codeinfo['order_return'] = $orderReturn ;
         return app_show(0, "获取成功", $codeinfo);
     }
 

app/admin/model/ProcessOrder.php

@@ -10,8 +10,8 @@ class ProcessOrder extends \think\Model
         $user = GetUserInfo($token);
         $uid = isset($user['data']['id']) ? $user['data']['id'] :0;
         $name = isset($user['data']['nickname']) ? $user['data']['nickname'] :'';
-        $conf =Config::get("process");
-        $action = isset($conf[$order['order_type']]) ? $conf[$order['order_type']]:[];
+       // $conf =Config::get("process");
+        //$action = isset($conf[$order['order_type']]) ? $conf[$order['order_type']]:[];
 
         $data=[
             "order_type"=>$order['order_type'],