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

app/admin/controller/Project.php

@@ -499,21 +499,36 @@ class Project extends Base
                         Db::rollback();
                         return error_show(1004,"反馈商品价格不能小于初始金额");
                     }
-                    $value['sale_price'] = $price['sale_price'];
-                    $value['updatetime'] = date("Y-m-d H:i:s");
-                    $cre=Db::name("project_feedback")->save($value);
-                    if($cre==false){
-                        Db::rollback();
-                        return error_show(1004,"反馈商品价格修改失败");
+                    if($value['data_source']==2){
+                        $bids =Db::name("consult_info")->where(["pgNo"=>$value['pgNo'],"is_del"=>0])->find();
+                        if($bids==false){
+                            Db::rollback();
+                            return error_show(1004,"未找到反馈商品咨询单");
+                        }
+                        $bids["status"]=3;
+                        $bids["updatetime"]=date("Y-m-d H:i:s");
+                       $bd=Db::name("consult_info")->save($bids);
+                       if($bd==false){
+                           Db::rollback();
+                           return error_show(1004,"反馈商品咨询单更新失败");
+                       }
                     }
+//                    $value['sale_price'] = $price['sale_price'];
+//                    $value['updatetime'] = date("Y-m-d H:i:s");
+//                    $cre=Db::name("project_feedback")->save($value);
+//                    if($cre==false){
+//                        Db::rollback();
+//                        return error_show(1004,"反馈商品价格修改失败");
+//                    }
                     $temp=[];
                     $temp['planNo']=$planNo;
                     $temp['feedback_id']=$value['id'];
+                    $temp['sale_price']=$price["sale_price"];
                     $temp['status']=1;
                     $temp['is_del']=0;
                     $temp['addtime']=date("Y-m-d H:i:s");
                     $temp['updatetime']=date("Y-m-d H:i:s");
-                    $total+=$value['num']*$value['sale_price'];
+                    $total+=$value['num']*$price["sale_price"];
                     $num_t+=$value['num'];
                     $dl[]=$temp;
                 }
@@ -560,12 +575,16 @@ class Project extends Base
            return error_show(1004,"未找到项目方案信息");
        }
        $plan['feedback']=[];
-       $feedback =Db::name("project_plan_rela")->where(["planNo"=>$planNo,"is_del"=>0])->column("feedback_id");
+       $feedback =Db::name("project_plan_rela")->where(["planNo"=>$planNo,"is_del"=>0])->column("feedback_id,sale_price");
        if(!empty($feedback)){
-        $feedlist = Db::name("project_feedback")->where(["id"=>$feedback,"is_del"=>0])->select();
+           $feedid = array_column($feedback,"feedback_id");
+        $feedlist = Db::name("project_feedback")->where(["id"=>$feedid,"is_del"=>0])->select();
         if(!empty($feedlist)){
             foreach ($feedlist as $value){
+                $key =array_search($value['id'],$feedid);
+                $price = $feedback[$key]['sale_price'];
                 $value["cat_info"]=isset($value['cat_id'])&&$value['cat_id']!=""? made($value['cat_id'],[]):[];
+                $value["sale_price"]=$price;
                 $plan['feedback'][]=$value;
             }
         }
@@ -596,17 +615,21 @@ class Project extends Base
         }else{
             $where = ['projectNo'=>$projectNo,"is_del"=>0];
         }
-        $ladder = Db::name("project_plan")->where($where)->select()->toArray();
+        $ladder = Db::name("project_plan")->where($where)->order("addtime desc")->select()->toArray();
         $info=[];
         if(!empty($ladder)){
             foreach ($ladder as $value){
                 $value['feedback']=[];
-                $feedback =Db::name("project_plan_rela")->where(["planNo"=>$value['planNo'],"is_del"=>0])->column("feedback_id");
+                $feedback =Db::name("project_plan_rela")->where(["planNo"=>$value['planNo'],"is_del"=>0])->column("feedback_id,sale_price");
                 if(!empty($feedback)){
-                    $feedlist = Db::name("project_feedback")->where(["id"=>$feedback,"is_del"=>0])->select();
+                    $feedid = array_column($feedback,"feedback_id");
+                    $feedlist = Db::name("project_feedback")->where(["id"=>$feedid,"is_del"=>0])->select();
                     if(!empty($feedlist)){
                         foreach ($feedlist as $val){
+                            $key =array_search($value['id'],$feedid);
+                            $price = $feedback[$key]['sale_price'];
                             $val["cat_info"]=isset($val['cat_id'])&&$val['cat_id']!=""? made($val['cat_id'],[]):[];
+                            $val["sale_price"]=$price;
                             $value['feedback'][]=$val;
                         }
                     }

app/admin/controller/Sale.php

@@ -765,8 +765,6 @@ class Sale extends BaseController
                 $good['arrtime']=$arrtime;
                 $good['apply_id']=$rm;
                 $good['apply_name']=$ri;
-                $good['sendtype']=$value['sendtype'];
-
                 if($value['sendtype']==1){
                     if(!isset($value['addrlist'])||empty($value['addrlist'])){
                         Db::rollback();
@@ -791,7 +789,20 @@ class Sale extends BaseController
                     return error_show(1002, "项目订单生成失败");
                 }
             }
-
+            $plan['status']=2;
+            $plan['updatetime']=date("Y-m-d H:i:s");
+            $in =Db::name("project_plan")->save($plan);
+            if($in==false){
+                Db::rollback();
+                return error_show(1002, "项目订单生成失败");
+            }
+            $project["status"]=6;
+            $project['updatetime']=date("Y-m-d H:i:s");
+            $pr =Db::name("project")->save($project);
+            if($pr==false){
+                Db::rollback();
+                return error_show(1002, "项目订单生成失败");
+            }
             Db::commit();
             return app_show(0, "咨询订单生成成功");
         }catch (\Exception $e){
@@ -801,6 +812,14 @@ class Sale extends BaseController
 
     }
 
+    /**
+     * @param $data
+     * @return false
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     *
+     */
 
     public function project_zx($data){
         $goodinfo = Db::name("consult_bids")->where(["spuCode"=>$data['spuCode'],"is_del"=>0])->find();
@@ -954,7 +973,16 @@ class Sale extends BaseController
                 }
             }
         }
+        return true;
     }
+
+    /**
+     * @param $data
+     * @return bool
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
     public function project_good($data){
         $good=Db::name('good')->alias("a")->leftJoin("good_platform b","a.spuCode=b.spuCode")->where(["b
         .skuCode"=>$data['skuCode'],"a.is_del"=>0,"b.is_del"=>0])->find();

app/admin/route/app.php

@@ -450,3 +450,6 @@ Route::rule("excluquery","admin/Exclusive/query");
 Route::rule("excludel","admin/Exclusive/delete");
 Route::rule("excluedit","admin/Exclusive/edit");
 
+Route::rule("consultorder","admin/Sale/consultOrder");
+Route::rule("projectorder","admin/Sale/projectCreate");
+