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

app/admin/controller/Consult.php

@@ -767,11 +767,14 @@ class Consult extends Base
                                 $count = Db::name("project_info")->where(["projectNo"=>$projectinfo['projectNo'],"status"=>1])
                                     ->count();
                                 if($count==0){
-                                    $proc =Db::name("project")->where(["projectNo"=>$projectinfo['projectNo'],"status"=>1])->save
-                                    (["status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
-                                    if($proc==false){
-                                        Db::rollback();
-                                        return error_show(1006,"项目反馈失败");
+                                    $projetc =Db::name("project")->where(["projectNo"=>$projectinfo['projectNo'],"status"=>1])->find();
+                                    if($projetc!=false){
+                                        $proc =Db::name("project")->where(["projectNo"=>$projectinfo['projectNo'],"status"=>1])->save
+                                        (["status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
+                                        if($proc==false){
+                                            Db::rollback();
+                                            return error_show(1006,"项目反馈失败");
+                                        }
                                     }
                                 }
                             }

app/admin/controller/Sale.php

@@ -965,6 +965,19 @@ class Sale extends Base
                 Db::rollback();
                 return error_show(1002, "项目订单生成失败");
             }
+            $consult =Db::name('consult_order')->where(["projectNo"=>$project['projectNo']])->find();
+            if($consult!=false){
+                $up=Db::name("consult_info")->where(['zxNo'=>$consult['zxNo'],"is_del"=>0,"status"=>1])->select()
+                    ->toArray();
+                if(!empty($up)){
+                    $staar=Db::name("consult_info")->where(['zxNo'=>$consult['zxNo'],"is_del"=>0,"status"=>1])->save
+                    (["status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
+                    if($staar==false){
+                        Db::rollback();
+                        return error_show(1002, "项目咨询单招标结束失败");
+                    }
+                }
+            }
             Db::commit();
             return app_show(0, "咨询订单生成成功");
         }catch (\Exception $e){