Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Project.php

@@ -67,12 +67,14 @@ class Project extends \app\BaseController
                 "projectNo"=>$projectNo,
                 "platform_id"=>$platform,
                 "khNo"=>$khNo,
+                "companyNo"=>$companyNo,
                 "project_name"=>$name,
                 "budget_total"=>$budget_total,
                 "use_desc"=>$use_desc,
                 "low_rate"=>$low_rate,
                 "creater"=>$creater,
                 "createrid"=>$createrid,
+                "arrtime"=>$arrtime,
                 "status"=>1,
                 "is_del"=>0,
                 "addtime"=>date("Y-m-d H:i:s"),
@@ -230,7 +232,9 @@ class Project extends \app\BaseController
             $value['platform_name']=isset($info['platform_name'])?$info['platform_name']:"";
             $value['platform_code']=isset($info['platform_code'])?$info['platform_code']:"";
             $khinfo = Db::name("customer_info")->where(["companyNo"=>$value['khNo']])->find();
-            $value['khName'] = isset($khinfo['CompanyName'])?$khinfo['CompanyName']:"";
+            $value['khName'] = isset($khinfo['companyName'])?$khinfo['companyName']:"";
+            $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
+            $value['company'] = isset($company['company'])?$company['company']:"";
             $data[]=$value;
         }
         return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);
@@ -275,9 +279,9 @@ class Project extends \app\BaseController
         $info['platform_name']=isset($plat['platform_name'])?$plat['platform_name']:"";
         $info['platform_code']=isset($plat['platform_code'])?$plat['platform_code']:"";
 
-        $khinfo = Db::name("customer_info")->where(["companyNo"=>$plat['khNo']])->find();
-        $info['khName'] = isset($khinfo['CompanyName'])?$khinfo['CompanyName']:"";
-        $company = Db::name("business")->where(["companyNo"=>$plat['companyNo']])->find();
+        $khinfo = Db::name("customer_info")->where(["companyNo"=>$info['khNo']])->find();
+        $info['khName'] = isset($khinfo['companyName'])?$khinfo['companyName']:"";
+        $company = Db::name("business")->where(["companyNo"=>$info['companyNo']])->find();
         $info['company'] = isset($company['company'])?$company['company']:"";
 
         $ladder = Db::name("project_info")->where(['projectNo'=>$projectNo,"is_del"=>0])->select()->toArray();
@@ -490,4 +494,72 @@ class Project extends \app\BaseController
             return error_show(1004,"利润率修改失败");
         }
     }
+
+    public function   order(){
+        $id = isset($this->post['id'])&& $this->post['id']!=="" ? intval($this->post['id']):"";
+        if($id==""){
+            return error_show(1004,"参数id不能为空");
+        }
+        $backinfo = Db::name("project_feedback")->where(["id"=>$id,"is_del"=>0])->find();
+        if($backinfo==false){
+            return error_show(1004,"未找到数据");
+        }
+        $prject = Db::name("project")->where(["projectNo"=>$backinfo['projectNo'],"is_del"=>0])->find();
+        if($prject==false) {
+            return error_show(1004, "未找到项目数据");
+        }
+        $send_type =isset($this->post['send_type'])&&$this->post['send_type']!=""? intval($this->post['send_type']):"";
+        if($send_type==""){
+            return error_show(1004,"参数send_type不能为空");
+        }
+            if($send_type==1){
+                $va = isset($this->post['order_addr']) && $this->post['order_addr'] !== "" ? $this->post['order_addr'] : "";
+                if ($va == "") {
+                    return error_show(1002, "参数order_addr不能为空");
+                }
+            }
+            $plat = Db::name("platform")->where(["id"=>$prject['platform_id']])->find();
+            $token = isset($this->post['token'])&& $this->post['token']!=="" ? trim($this->post['token']):"";
+            if($token==""){
+                return error_show(1004,"参数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'] : "";
+            $ri = isset($apply_id["data"]['nickname']) ? $apply_id["data"]['nickname'] : "";
+        $orderCode = makeNo("CX");
+        $data = [
+            "orderCode" => $orderCode,
+            "good_code" => $backinfo['spuCode'],
+            "customer_code" => $prject['khNo'],
+            "good_name" => $backinfo['good_name'],
+            "good_num" => $backinfo['num'],
+            "order_type" =>3,
+            "item_code"=>isset($plat['platform_code'])? $plat['platform_code']:"",
+            "good_type"=>1,
+            "apply_id" => $rm,
+            "apply_name" => $ri,
+            "origin_price" =>$backinfo['nake_price'],
+            "sale_price" => $backinfo['sale_price'],
+            "post_fee" => 0,
+            "status" => 0,
+            "supplierNo" =>$prject['companyNo'],
+            "send_num" => 0,
+            "zxNo"=>$backinfo['pgNo'],
+            "wsend_num" => $backinfo['num'],
+            "send_type" => $send_type,
+            "send_status" => 1,
+            "is_del" => 0,
+            "addtime" => date("Y-m-d H:i:s"),
+            "updatetime" => date("Y-m-d H:i:s"),
+            'total_price' => $backinfo['sale_price'] * $backinfo['num'],
+        ];
+        $datainfo = Db::name('sale')->insert($data, true);
+        if($datainfo>0){
+
+        }
+
+    }
 }

app/admin/controller/Suppler.php

@@ -136,6 +136,7 @@ class Suppler extends BaseController
                 "legaler"=>$legaler,
                 "addr"=>$addr,
                 "is_del"=>0,
+                "remark"=>'',
                 "ticket_type"=>$ticket_type,
                 "addtime"=>date('Y-m-d H:i:s'),
                 "updatetime"=>date("Y-m-d H:i:s"),
@@ -189,7 +190,7 @@ class Suppler extends BaseController
                     return error_show(1002, "添加失败");
                 }
                 Db::commit();
-                return error_show(0,"添加成功") ;
+                return error_show(0,"添加成功",["id"=>$join]) ;
             }else{
                 Db::rollback();
                 return error_show(1002,"添加失败");