Parcourir la source

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

wufeng il y a 2 ans
Parent
commit
932e52e277
1 fichiers modifiés avec 11 ajouts et 0 suppressions
  1. 11 0
      app/admin/controller/Consult.php

+ 11 - 0
app/admin/controller/Consult.php

@@ -244,6 +244,8 @@ class Consult extends Base
     }
 
 
+    
+
     public function zxinfo(){
         $infoNo= isset($this->post['infoNo'])&&$this->post['infoNo']!=""?trim($this->post['infoNo']):"";
         if($infoNo==""){
@@ -394,6 +396,10 @@ class Consult extends Base
         if($remark==""){
             return error_show(1003,"参数remark不能为空");
         }
+        $endtime = isset($this->post['endtime'])&& $this->post['endtime']!="" ? trim($this->post['endtime']):"";
+        if($endtime==""){
+            return error_show(1003,"参数endtime不能为空");
+        }
         if($metal_id!=0){
             if($config==""){
                 return error_show(1003,"参数config不能为空");
@@ -427,6 +433,7 @@ class Consult extends Base
         $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         $bidlist = Db::name("consult_bids")->where(["infoNo"=>$zxinfo['infoNo'],"is_del"=>0])->select();
+        Db::startTrans();
         try{
             $innew =makeNo("IF");
             $info=[
@@ -488,6 +495,10 @@ class Consult extends Base
                     Db::rollback();
                     return error_show(1004,"反馈商品更新失败");
                 }
+
+                //更新consule_order记录
+                Db::name('consult_order')->where('zxNo',$zxinfo['zxNo'])->update(['endtime'=>$endtime,'updatetime'=>date('Y-m-d H:i:s')]);
+
                 Db::commit();
                 return app_show(0,"咨询新建成功",["infoNo"=>$innew]);
             }