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

app/admin/controller/After.php

@@ -226,13 +226,15 @@ class After extends \app\BaseController
         $out =Db::name("order_out")->where(["outCode"=>$info['outCode']])->find();
         $info['out_num'] = isset($out['send_num'])?$out['send_num']:'';
 //        $customer = Db::name("customer_info")->where(["companyNo"=>$info['customer_code']])->find();
+        if($info['return_wsm']!=''){
+            $wsmcode = Db::name("warehouse_info")
+                ->alias("a")
+                ->leftJoin("supplier b","a.supplierNo=b.code")
+                ->where(["a.wsm_code"=>$info['return_wsm']])
+                ->field("a.name as wsm_name,b.name,b.code,a.wsm_code,a.contactor_name,a.position,a.mobile,a.addrs_code,a.addr,a.companyNo")
+                ->find();
+        }
 
-        $wsmcode = Db::name("warehouse_info")
-            ->alias("a")
-            ->leftJoin("supplier b","a.supplierNo=b.code")
-            ->where(["a.wsm_code"=>$info['return_wsm']])
-            ->field("a.name as wsm_name,b.name,b.code,a.wsm_code,a.contactor_name,a.position,a.mobile,a.addrs_code,a.addr,a.companyNo")
-            ->find();
         $info['wsm_code'] =isset($wsmcode['wsm_code']) ? $wsmcode['wsm_code']:"";
         $info['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
         $info['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
@@ -244,11 +246,15 @@ class After extends \app\BaseController
         $info['can']=$int;
 
         //仓库的联系人、职位、电话、省市区和地址
-        $info['contactor_name'] = $wsmcode['contactor_name'];//联系人
-        $info['position'] = $wsmcode['position'];//职位
-        $info['mobile'] = $wsmcode['mobile'];//电话
-        $info['addrs_code'] = json_decode($wsmcode['addrs_code'], true);//省市区编码
-        $info['addr'] = $wsmcode['addr'];//地址
+       isset($wsmcode['contactor_name'])?  $info['contactor'] =$wsmcode['contactor_name']:'';//联系人
+       isset($wsmcode['mobile'])?  $info['mobile'] =$wsmcode['mobile']:'';//联系人
+       isset($wsmcode['addrs_code'])?  $info['addr_code'] =$wsmcode['addrs_code']:'';//联系人
+       isset($wsmcode['addr'])?  $info['addr'] =$wsmcode['addr']:'';//联系人
+       isset($wsmcode['contactor_name'])?  $info['contactor'] =$wsmcode['contactor_name']:'';//联系人
+//        $info['position'] = $wsmcode['position'];//职位
+//        $info['mobile'] = $wsmcode['mobile'];//电话
+//        $info['addrs_code'] = json_decode($wsmcode['addrs_code'], true);//省市区编码
+//        $info['addr'] = $wsmcode['addr'];//地址
         $info['spuCode'] = $orderinfo['good_code'];//地址
         $info['skuCode'] = $orderinfo['skuCode'];//地址
 

app/admin/controller/Consult.php

@@ -1369,17 +1369,20 @@ class Consult extends Base
             ("zxNo");
             $where[] = ['zxNo','in',$zxlist];
         }
+        $is_own = isset($this->post['is_own']) ? intval($this->post['is_own']) : "0";
+        if($is_own==1){
+             $token = isset($this->post['token']) ? trim($this->post['token']) : "";
+            if($token==""){
+                return error_show(101,'token不能为空');
+            }
+            $apply_id =GetUserInfo($token);
+            if(empty($apply_id)||$apply_id['code']!=0){
+                return error_show(1002,"申请人数据不存在");
+            }
+            $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
+            $where[]=['createrid',"=",$rm];
+        }
 
-//        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
-//        if($token==""){
-//            return error_show(101,'token不能为空');
-//        }
-//        $apply_id =GetUserInfo($token);
-//        if(empty($apply_id)||$apply_id['code']!=0){
-//            return error_show(1002,"申请人数据不存在");
-//        }
-//        $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
-//        $where[]=['createrid',"=",$rm];
         $count = Db::name('consult_bids')->where($where)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
@@ -1456,14 +1459,19 @@ class Consult extends Base
         if($token==''){
             return error_show(102,"参数token不能为空");
         }
-//        $user =GetUserInfo($token);
-//        if(empty($user)||$user['code']!=0){
-//            return error_show(105,"用户数据不存在");
-//        }
-
-//        $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
-//        $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
-//        $where[] = ["createrid","=",$createrid];
+        $is_own = isset($this->post['is_own']) ? intval($this->post['is_own']) : "0";
+        if($is_own==1){
+            $token = isset($this->post['token']) ? trim($this->post['token']) : "";
+            if($token==""){
+                return error_show(101,'token不能为空');
+            }
+            $apply_id =GetUserInfo($token);
+            if(empty($apply_id)||$apply_id['code']!=0){
+                return error_show(1002,"申请人数据不存在");
+            }
+            $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
+            $where[]=['createrid',"=",$rm];
+        }
         $list =Db::name('consult_bids')->where($where)->select();
         $data=[];
         foreach ($list as $value){