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

app/admin/controller/Consult.php

@@ -772,6 +772,7 @@ class Consult extends Base
         $config = isset($this->post['config'])&&$this->post['config']!=""? $this->post['config']:"";
         $other_config = isset($this->post['other_config'])&&$this->post['other_config']!=""? $this->post['other_config']:"";
         $weight = isset($this->post['weight'])&&$this->post['weight']!=""? floatval($this->post['weight']):"";
+        $good_weight = isset($this->post['good_weight'])&&$this->post['good_weight']!=""? floatval($this->post['good_weight']):"";
         $demo_fee = isset($this->post['demo_fee'])&&$this->post['demo_fee']!=""? floatval($this->post['demo_fee']):"";
         $delivery_fee = isset($this->post['delivery_fee'])&&$this->post['delivery_fee']!=""? floatval($this->post['delivery_fee']):"";
         $open_fee = isset($this->post['open_fee'])&&$this->post['open_fee']!=""? floatval($this->post['open_fee']):"";
@@ -824,6 +825,7 @@ class Consult extends Base
             "config"=>$config,
             "other_config"=>$other_config,
             "weight"=>$weight,
+            "good_weight"=>$good_weight,
             "is_diff"=>$is_diff,
             "demo_fee"=>$demo_fee,
             "delivery_fee"=>$delivery_fee,
@@ -1144,6 +1146,7 @@ class Consult extends Base
                 "before_rate"=>$info['cost_fee'],
                 "after_rate"=>$info['cost_fee'],
                 "after_price"=>$bargain_price,
+                "exam_info"=>"",
                 "status"=>1,
                 "is_del"=>0,
                 "creater"=>$creater,
@@ -1184,9 +1187,27 @@ class Consult extends Base
         if($status==''){
             return error_show(1005,"参数status不能为空");
         }
+        $remark = isset($this->post['remark'])&& $this->post['remark']!=""?trim($this->post['remark']):"";
+        if($remark==""){
+            return error_show(1004,"参数remark不能为空");
+        }
+        $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
+        if($token==''){
+            return error_show(1005,"参数token不能为空");
+        }
+        $user =GetUserInfo($token);
+        if(empty($user)||$user['code']!=0){
+            return error_show(1002,"用户数据不存在");
+        }
+        $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
+        $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         Db::startTrans();
         try{
+            $examinfo = isset($info['exam_info'])&&$info['exam_info']!="" ? json_decode($info['exam_info'],true):[];
+            $examinfo[]=["status"=>$status,"remark"=>$remark,"createrid"=>$createrid,"creater"=>$creater];
             $info['status'] =$status;
+            $info['remark'] =$remark;
+            $info['exam_info']=json_encode($examinfo) ;
             $info['updatetime'] =date("Y-m-d H:i:s");
             $up =Db::name("bargain_order")->save($info);
             if($up){
@@ -1240,6 +1261,7 @@ class Consult extends Base
         $info['good_img'] = isset($bidinfos['good_img'])?$bidinfos['good_img']:"";
         $info['brand_id'] = isset($bidinfos['brand_id'])?$bidinfos['brand_id']:"";
         $info['good_num'] = isset($consultinfos['num'])?$consultinfos['num']:"";
+        $info['exam_info'] = isset($info['exam_info'])&&$info['exam_info']!=""?json_encode($info['exam_info']):"";
         if($bidinfos['brand_id']!=0){
             $info['brand_id'] = $bidinfos['brand_id'];
             $brand=Db::name("brand")->where(["id"=>$bidinfos['brand_id']])->find();
@@ -1268,11 +1290,12 @@ class Consult extends Base
             "cost_fee"=>$bidinfos["cost_fee"],
             "num"=>$bidinfoe["num"],
         ];
-//            if($bidinfos['is_gold_price']==1){
-//                $price = GoldPrice($god, $budget/100);
-//            }else{
-//                $price = GoodPrice($god, $budget/100);
-//            }
+        $info['gold_price']=0;
+            if($bidinfos['is_gold_price']==1 &&$bidinfos['metal_id']>0){
+                $gold = Db::name("gold_price1")->where(["type"=>$bidinfos["metal_id"],"is_del"=>0,"status"=>1])->order("addtime desc")
+                    ->find();
+                $info['gold_price'] =$gold['price'];
+            }
         $info['cost_desc'] =$bidinfos['cost_desc'];
         $info['work_day'] =$bidinfos['work_day'];
         $info['delivery_day'] =$bidinfos['delivery_day'];

app/admin/controller/Sale.php

@@ -406,6 +406,10 @@ class Sale extends BaseController
                         Db::rollback();
                         return error_show(1002,"咨询订单创建失败");
                     }
+                    foreach ($order as $val){
+
+                    }
+
                 }else{
                     Db::rollback();
                     return error_show(1002,"咨询订单创建失败");