Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/Consult.php

@@ -544,9 +544,11 @@ class Consult extends Base
         }
         $pgNo = isset($this->post['pgNo'])&& $this->post['pgNo']!="" ? trim($this->post['pgNo']):"";
         $use_desc = isset($this->post['use_desc'])&& $this->post['use_desc']!="" ? trim($this->post['use_desc']):"";
-//        if($use_desc==""){
-//            return error_show(1003,"参数use_desc不能为空");
-//        }
+		$isbids = isset($this->post['isbids'])&& $this->post['isbids']!="" ? intval($this->post['isbids']):"1";
+		if($isbids==0){
+			$zxorder = Db::name("consult_order")->where(["zxNo"=>$zxinfo['zxNo']])->value("is_project",0);
+			if($zxorder==1)return error_show(1003,"项目类型咨询单不可进行此项编辑");
+		}
         $remark = isset($this->post['remark'])&& $this->post['remark']!="" ? trim($this->post['remark']):"";
         if($remark==""){
             return error_show(1003,"参数remark不能为空");
@@ -569,14 +571,6 @@ class Consult extends Base
                 return error_show(1003,"参数gold_price不能为空");
             }
         }
-//        $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
-//        if($token==''){
-//            return error_show(102,"参数token不能为空");
-//        }
-//        $user =GetUserInfo($token);
-//        if(empty($user)||$user['code']!=0){
-//            return error_show(105,"用户数据不存在");
-//        }
         $specinfo=[];
         foreach ($specin as $v){
             $spec =Db::name("specs")->where(["id"=>$v['specid']])->find();
@@ -585,9 +579,6 @@ class Consult extends Base
             $v['spec_value_name']=isset($spec_value['spec_value'])?$spec_value['spec_value']:"";
             $specinfo[]=$v;
         }
-        $createrid= $this->uid;//isset($user["data"]['id']) ?  $user["data"]['id'] : "";
-        $creater= $this->uname;//isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
-        $bidlist = Db::name("consult_bids")->where(["infoNo"=>$zxinfo['infoNo'],"is_del"=>0])->select()->toArray();
         Db::startTrans();
         try{
             $innew =makeNo("IF");
@@ -644,37 +635,34 @@ class Consult extends Base
 //                    "order_id" => 0,
 //                    "order_status" => 1
 //                ]);
+				if($isbids==1){
+					 $bidlist = Db::name("consult_bids")->where(["infoNo"=>$zxinfo['infoNo'],"is_del"=>0])->select()->toArray();
+				                if (!empty($bidlist)){
+				                    foreach ($bidlist as $value){
+				                        unset($value['id']);
+				                        $value['infoNo']=$innew;
+				                        $value['bidNo']=makeNo("BD");
+				                        $value['spuCode']=makeNo("SKU");
+				                        $value['status'] =0;
+				                        $value['updatetime'] =date("Y-m-d H:i:s");
+				                        $in = Db::name("consult_bids")->insert($value);
+				                        if($in==false)throw  new \Exception("反馈商品新建失败");
+				                        ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname], [
+				                            "order_code" => $innew,//咨询单详情编号
+				                            "status" => 1,//这里的status是之前的值
+				                            "action_remark" => '',//备注
+				                            "action_type" => "create"//新建create，编辑edit，更改状态status
+				                        ], "FKD", 1, $this->post);
+				                    }
+				                }
+				}
 
-                if (!empty($bidlist)){
-                    foreach ($bidlist as $value){
-                        unset($value['id']);
-                        $value['infoNo']=$innew;
-                        $value['bidNo']=makeNo("BD");
-                        $value['spuCode']=makeNo("SKU");
-                        $value['status'] =0;
-                        $value['updatetime'] =date("Y-m-d H:i:s");
-                        $in = Db::name("consult_bids")->insert($value);
-                        if($in==false){
-                            Db::rollback();
-                            return error_show(1004,"反馈商品新建失败");
-                        }
-                        ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname], [
-                            "order_code" => $innew,//咨询单详情编号
-                            "status" => 1,//这里的status是之前的值
-                            "action_remark" => '',//备注
-                            "action_type" => "edit"//新建create，编辑edit，更改状态status
-                        ], "FKD", 1, $this->post);
-                    }
-                }
                 $zxinfo["bargain_status"] =1;
                 $zxinfo["status"] =6;
                 $zxinfo["bargain_code"] =$innew;
                 $zxinfo["updatetime"] =date("Y-m-d H:i:s");
                 $bar=Db::name("consult_info")->save($zxinfo);
-                if($bar==false){
-                    Db::rollback();
-                    return error_show(1004,"反馈商品更新失败");
-                }else{
+                if($bar==false)throw  new \Exception("反馈商品更新失败");
                     //修改状态，添加待办
                     ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname], [
                         "order_code" => $zxinfo['infoNo'],//咨询单详情编号
@@ -682,16 +670,11 @@ class Consult extends Base
                         "action_remark" => '',//备注
                         "action_type" => "edit"//新建create，编辑edit，更改状态status
                     ], "ZXD", $zxinfo['status'], $zxinfo);
-                }
+
 
                 //更新consule_order记录
                 $op = Db::name('consult_order')->where('zxNo',$zxinfo['zxNo'])->update(['endtime'=>$endtime, 'updatetime'=>date('Y-m-d H:i:s')]);
-                if($op==false){
-                    Db::rollback();
-                    return error_show(1004,'咨询单结束时间更新失败');
-                }
-
-
+                if($op==false)throw  new \Exception("咨询单结束时间更新失败");
                 //维护台账记录
                 $insert_standing_book_data=[
                     'standBookNo'=>makeNo('IO'),
@@ -709,8 +692,6 @@ class Consult extends Base
                 }
 
                 Db::name('standing_book')->insert($insert_standing_book_data);
-
-
                 Db::commit();
                 return app_show(0,"咨询新建成功",["infoNo"=>$innew]);
             }
@@ -2616,5 +2597,4 @@ class Consult extends Base
         return app_show(0, "获取成功", ['count' => $count, 'list' => $data]);
     }
 
-
 }