ad

app/admin/controller/Consult.php

@@ -196,6 +196,10 @@ class Consult extends BaseController
         if($platform_code===""){
             return error_show(1002,"参数platform_code不能为空");
         }
+        $ladder = isset($this->post['ladder'])&&!empty($this->post['ladder']) ? $this->post['ladder']:"";
+        if($ladder==""){
+            return error_show(1005,"参数ladder不能为空");
+        }
         $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
         if($token==''){
             return error_show(1005,"参数token不能为空");
@@ -228,157 +232,196 @@ class Consult extends BaseController
         ];
         $zx = Db::name("consult_order")->insert($data);
         if($zx){
-            return  app_show(0,"新建成功",["zxNo"=>$zxNo]);
-        }else{
-            return error_show(1004,"新建失败");
-        }
-    }
-
-    public function zxadd(){
-        $good_name = isset($this->post['good_name'])&&$this->post['good_name']!==""?trim($this->post['good_name']):"";
-        if($good_name===""){
-            return error_show(1004,"参数good_name不能为空");
-        }
-        $zxNo = isset($this->post['zxNo'])&&$this->post['zxNo']!==""?trim($this->post['zxNo']):"";
-        if($zxNo===""){
-            return error_show(1004,"参数zxNo不能为空");
-        }
-
-        $cat_id = isset($this->post['cat_id'])&&$this->post['cat_id']!==""?intval($this->post['cat_id']):"";
-        if($cat_id===""){
-            return error_show(1004,"参数cat_id不能为空");
-        }
-        $arrival_time = isset($this->post['arrival_time'])&&$this->post['arrival_time']!==""?$this->post['arrival_time']
-            :"";
-        if($arrival_time===""){
-            return error_show(1004,"参数arrival_time不能为空");
-        }
-        $good_img = isset($this->post['good_img'])&&$this->post['good_img']!==""?trim($this->post['good_img']):"";
-        if($good_img===""){
-            return error_show(1004,"参数good_img不能为空");
-        }
-        $is_custom = isset($this->post['is_custom'])&&$this->post['is_custom']!==""?intval($this->post['is_custom']):"";
-        if($is_custom===""){
-            return error_show(1004,"参数is_custom不能为空");
-        }
-        $unit = isset($this->post['unit'])&&$this->post['unit']!==""?trim($this->post['unit']):"";
-        if($unit===""){
-            return error_show(1004,"参数unit不能为空");
-        }
-        $brand_id = isset($this->post['brand_id'])&&$this->post['brand_id']!==""?intval($this->post['brand_id']):"";
-        if($brand_id===""){
-            return error_show(1004,"参数brand_id不能为空");
-        }
-        $material = isset($this->post['material'])&&$this->post['material']!==""?trim($this->post['material']):"";
-        if($material===""){
-            return error_show(1004,"参数material不能为空");
-        }
-        $color = isset($this->post['color'])&&$this->post['color']!==""?trim($this->post['color']):"";
-        if($color===""){
-            return error_show(1004,"参数color不能为空");
-        }
-        $cost_desc = isset($this->post['cost_desc'])&&$this->post['cost_desc']!==""?trim($this->post['cost_desc']):"";
-        if($cost_desc===""){
-            return error_show(1004,"参数cost_desc不能为空");
-        }
-        $model = isset($this->post['model'])&&$this->post['model']!==""?trim($this->post['model']):"";
-        if($model===""){
-            return error_show(1004,"参数model不能为空");
-        }
-
-        $is_addrs = isset($this->post['is_addrs'])&&$this->post['is_addrs']!==""?intval($this->post['is_addrs']):"";
-        if($is_addrs===""){
-            return error_show(1004,"参数is_addrs不能为空");
-        }
-
-        $metal_id = isset($this->post['metal_id'])&&$this->post['metal_id']!==""?trim($this->post['metal_id']):"";
-        if($metal_id===""){
-            return error_show(1004,"参数metal_id不能为空");
-        }
-        if($metal_id==0){
-            $config = isset($this->post['config'])&&!empty($this->post['config'])?$this->post['config']:"";
-            if($config===""){
-                return error_show(1004,"参数config不能为空");
-            }
-            $other_config = isset($this->post['other_config'])&&$this->post['other_config']!==""?trim($this->post['other_config'])
-                :"";
-            if($other_config===""){
-                return error_show(1004,"参数other_config不能为空");
-            }
-            $specs_weight = isset($this->post['specs_weight'])&&$this->post['specs_weight']!==""?floatval($this->post['specs_weight']):"";
-            if($specs_weight===""){
-                return error_show(1004,"参数specs_weight不能为空");
-            }
-            $gold_price = isset($this->post['gold_price'])&&$this->post['gold_price']!==""?floatval($this->post['gold_price']):"";
-            if($gold_price===""){
-                return error_show(1004,"参数gold_price不能为空");
-            }
-
-        }
-        $budget_price = isset($this->post['budget_price'])&&$this->post['budget_price']!==""?floatval($this->post['budget_price']):"";
-        if($budget_price===""){
-            return error_show(1004,"参数budget_price不能为空");
-        }
-        $num = isset($this->post['num'])&&$this->post['num']!==""?intval($this->post['num']):"";
-        if($num===""){
-            return error_show(1004,"参数num不能为空");
-        }
-        $use_desc = isset($this->post['use_desc'])&&$this->post['use_desc']!==""?trim($this->post['use_desc']):"";
-        if($use_desc===""){
-            return error_show(1004,"参数use_desc不能为空");
-        }
-        $remark = isset($this->post['remark'])&&$this->post['remark']!==""?trim($this->post['remark']):"";
-        if($remark===""){
-            return error_show(1004,"参数remark不能为空");
-        }
-
-        Db::startTrans();
-        try{
+            foreach ($ladder as $value){
                 $infoNo=makeNo("INF");
                 $info=[
                     "infoNo"=>$infoNo,
                     "zxNo"=>$zxNo,
                     "spuCode"=>"",
-                    "good_name"=>$good_name,
-                    "good_img"=>$good_img,
-                    "cat_id"=>$cat_id,
-                    "unit"=>$unit,
-                    "brand_id"=>$brand_id,
-                    "arrival_time"=>$arrival_time,
-                    "model"=>$model,
-                    "color"=>$color,
-                    "material"=>$material,
-                    "cost_desc"=>$cost_desc,
-                    "is_addrs"=>$is_addrs,
-                    "is_custom"=>$is_custom,
-                    "metal_id"=>$metal_id,
-                    "config"=>isset($config)?$config:"",
-                    "other_config"=>isset($other_config)?$other_config:"",
-                    "specs_weight"=>isset($specs_weight)?$specs_weight:0,
-                    "gold_price"=>isset($gold_price)?$gold_price:0,
-                    "budget_price"=>$budget_price,
-                    "num"=>$num,
-                    "use_desc"=>$use_desc,
-                    "remark"=>$remark,
+                    "good_name"=>$value['good_name'],
+                    "good_img"=>$value['good_img'],
+                    "cat_id"=>$value['cat_id'],
+                    "unit"=>$value['unit'],
+                    "brand_id"=>$value['brand_id'],
+                    "arrival_time"=>$value['arrival_time'],
+                    "model"=>$value['model'],
+                    "color"=>$value['color'],
+                    "material"=>$value['material'],
+                    "cost_desc"=>$value['cost_desc'],
+                    "is_addrs"=>$value['is_addrs'],
+                    "is_custom"=>$value['is_custom'],
+                    "metal_id"=>$value['metal_id'],
+                    "config"=>isset($value['config'])?$value['config']:"",
+                    "other_config"=>isset($value['other_config'])?$value['other_config']:"",
+                    "specs_weight"=>isset($value['specs_weight'])?$value['specs_weight']:"0",
+                    "gold_price"=>isset($value['gold_price'])?$value['gold_price']:"0",
+                    "budget_price"=>$value['budget_price'],
+                    "num"=>$value['num'],
+                    "use_desc"=>$value['use_desc'],
+                    "remark"=>$value['remark'],
                     "status"=>0,
                     "is_del"=>0,
                     "addtime"=>date("Y-m-d H:i:s"),
                     "updatetime"=>date("Y-m-d H:i:s")
                 ];
                 $up = Db::name("consult_info")->insert($info);
-                if($up){
-                    Db::commit();
-                    return app_show(0,"添加成功",["infoNo"=>$infoNo]);
-                }else{
+                if(!$up){
                     Db::rollback();
                     return error_show(1004,'添加失败');
                 }
-        }catch (\Exception $e){
-            Db::rollback();
-            return error_show(1004,$e->getMessage());
+            }
+
+            return  app_show(0,"新建成功",["zxNo"=>$zxNo]);
+        }else{
+            return error_show(1004,"新建失败");
         }
     }
 
+//    public function zxadd(){
+//        $good_name = isset($this->post['good_name'])&&$this->post['good_name']!==""?trim($this->post['good_name']):"";
+//        if($good_name===""){
+//            return error_show(1004,"参数good_name不能为空");
+//        }
+//        $zxNo = isset($this->post['zxNo'])&&$this->post['zxNo']!==""?trim($this->post['zxNo']):"";
+//        if($zxNo===""){
+//            return error_show(1004,"参数zxNo不能为空");
+//        }
+//
+//        $cat_id = isset($this->post['cat_id'])&&$this->post['cat_id']!==""?intval($this->post['cat_id']):"";
+//        if($cat_id===""){
+//            return error_show(1004,"参数cat_id不能为空");
+//        }
+//        $arrival_time = isset($this->post['arrival_time'])&&$this->post['arrival_time']!==""?$this->post['arrival_time']
+//            :"";
+//        if($arrival_time===""){
+//            return error_show(1004,"参数arrival_time不能为空");
+//        }
+//        $good_img = isset($this->post['good_img'])&&$this->post['good_img']!==""?trim($this->post['good_img']):"";
+//        if($good_img===""){
+//            return error_show(1004,"参数good_img不能为空");
+//        }
+//        $is_custom = isset($this->post['is_custom'])&&$this->post['is_custom']!==""?intval($this->post['is_custom']):"";
+//        if($is_custom===""){
+//            return error_show(1004,"参数is_custom不能为空");
+//        }
+//        $unit = isset($this->post['unit'])&&$this->post['unit']!==""?trim($this->post['unit']):"";
+//        if($unit===""){
+//            return error_show(1004,"参数unit不能为空");
+//        }
+//        $brand_id = isset($this->post['brand_id'])&&$this->post['brand_id']!==""?intval($this->post['brand_id']):"";
+//        if($brand_id===""){
+//            return error_show(1004,"参数brand_id不能为空");
+//        }
+//        $material = isset($this->post['material'])&&$this->post['material']!==""?trim($this->post['material']):"";
+//        if($material===""){
+//            return error_show(1004,"参数material不能为空");
+//        }
+//        $color = isset($this->post['color'])&&$this->post['color']!==""?trim($this->post['color']):"";
+//        if($color===""){
+//            return error_show(1004,"参数color不能为空");
+//        }
+//        $cost_desc = isset($this->post['cost_desc'])&&$this->post['cost_desc']!==""?trim($this->post['cost_desc']):"";
+//        if($cost_desc===""){
+//            return error_show(1004,"参数cost_desc不能为空");
+//        }
+//        $model = isset($this->post['model'])&&$this->post['model']!==""?trim($this->post['model']):"";
+//        if($model===""){
+//            return error_show(1004,"参数model不能为空");
+//        }
+//
+//        $is_addrs = isset($this->post['is_addrs'])&&$this->post['is_addrs']!==""?intval($this->post['is_addrs']):"";
+//        if($is_addrs===""){
+//            return error_show(1004,"参数is_addrs不能为空");
+//        }
+//
+//        $metal_id = isset($this->post['metal_id'])&&$this->post['metal_id']!==""?trim($this->post['metal_id']):"";
+//        if($metal_id===""){
+//            return error_show(1004,"参数metal_id不能为空");
+//        }
+//        if($metal_id==0){
+//            $config = isset($this->post['config'])&&!empty($this->post['config'])?$this->post['config']:"";
+//            if($config===""){
+//                return error_show(1004,"参数config不能为空");
+//            }
+//            $other_config = isset($this->post['other_config'])&&$this->post['other_config']!==""?trim($this->post['other_config'])
+//                :"";
+//            if($other_config===""){
+//                return error_show(1004,"参数other_config不能为空");
+//            }
+//            $specs_weight = isset($this->post['specs_weight'])&&$this->post['specs_weight']!==""?floatval($this->post['specs_weight']):"";
+//            if($specs_weight===""){
+//                return error_show(1004,"参数specs_weight不能为空");
+//            }
+//            $gold_price = isset($this->post['gold_price'])&&$this->post['gold_price']!==""?floatval($this->post['gold_price']):"";
+//            if($gold_price===""){
+//                return error_show(1004,"参数gold_price不能为空");
+//            }
+//
+//        }
+//        $budget_price = isset($this->post['budget_price'])&&$this->post['budget_price']!==""?floatval($this->post['budget_price']):"";
+//        if($budget_price===""){
+//            return error_show(1004,"参数budget_price不能为空");
+//        }
+//        $num = isset($this->post['num'])&&$this->post['num']!==""?intval($this->post['num']):"";
+//        if($num===""){
+//            return error_show(1004,"参数num不能为空");
+//        }
+//        $use_desc = isset($this->post['use_desc'])&&$this->post['use_desc']!==""?trim($this->post['use_desc']):"";
+//        if($use_desc===""){
+//            return error_show(1004,"参数use_desc不能为空");
+//        }
+//        $remark = isset($this->post['remark'])&&$this->post['remark']!==""?trim($this->post['remark']):"";
+//        if($remark===""){
+//            return error_show(1004,"参数remark不能为空");
+//        }
+//
+//        Db::startTrans();
+//        try{
+//                $infoNo=makeNo("INF");
+//                $info=[
+//                    "infoNo"=>$infoNo,
+//                    "zxNo"=>$zxNo,
+//                    "spuCode"=>"",
+//                    "good_name"=>$good_name,
+//                    "good_img"=>$good_img,
+//                    "cat_id"=>$cat_id,
+//                    "unit"=>$unit,
+//                    "brand_id"=>$brand_id,
+//                    "arrival_time"=>$arrival_time,
+//                    "model"=>$model,
+//                    "color"=>$color,
+//                    "material"=>$material,
+//                    "cost_desc"=>$cost_desc,
+//                    "is_addrs"=>$is_addrs,
+//                    "is_custom"=>$is_custom,
+//                    "metal_id"=>$metal_id,
+//                    "config"=>isset($config)?$config:"",
+//                    "other_config"=>isset($other_config)?$other_config:"",
+//                    "specs_weight"=>isset($specs_weight)?$specs_weight:0,
+//                    "gold_price"=>isset($gold_price)?$gold_price:0,
+//                    "budget_price"=>$budget_price,
+//                    "num"=>$num,
+//                    "use_desc"=>$use_desc,
+//                    "remark"=>$remark,
+//                    "status"=>0,
+//                    "is_del"=>0,
+//                    "addtime"=>date("Y-m-d H:i:s"),
+//                    "updatetime"=>date("Y-m-d H:i:s")
+//                ];
+//                $up = Db::name("consult_info")->insert($info);
+//                if($up){
+//                    Db::commit();
+//                    return app_show(0,"添加成功",["infoNo"=>$infoNo]);
+//                }else{
+//                    Db::rollback();
+//                    return error_show(1004,'添加失败');
+//                }
+//        }catch (\Exception $e){
+//            Db::rollback();
+//            return error_show(1004,$e->getMessage());
+//        }
+//    }
+
     public function zxinfo(){
         $infoNo= isset($this->post['infoNo'])&&$this->post['infoNo']!=""?trim($this->post['infoNo']):"";
         if($infoNo==""){

app/admin/controller/Project.php

@@ -222,6 +222,14 @@ class Project extends \app\BaseController
         if($up!==''){
             $where[]=["budget_total","<=",$up];
         }
+        $companyNo = isset($this->post['companyNo'])&&$this->post['companyNo']!=="" ? trim($this->post['companyNo']):"";
+        if($companyNo!==''){
+            $where[]=["companyNo","like","%$companyNo%"];
+        }
+        $platform_id = isset($this->post['platform_id'])&&$this->post['platform_id']!=="" ? intval($this->post['platform_id']):"";
+        if($platform_id!==''){
+            $where[]=["platform_id","=",$platform_id];
+        }
         $count = Db::name('project')->where($where)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
@@ -495,7 +503,7 @@ class Project extends \app\BaseController
         }
     }
 
-    public function   order(){
+    public function order(){
         $id = isset($this->post['id'])&& $this->post['id']!=="" ? intval($this->post['id']):"";
         if($id==""){
             return error_show(1004,"参数id不能为空");

app/admin/controller/Salezx.php

@@ -19,14 +19,6 @@ class Salezx extends \app\BaseController
     public function create(){
         $token = isset($this->post['token']) && $this->post['token'] !=="" ?trim($this->post['token']):"";
         $orderCode=makeNo("CX");
-        $zxNo=isset($this->post['zxNo']) && $this->post['zxNo'] !=="" ?trim($this->post['zxNo']):"";
-        if($zxNo==''){
-            return error_show(1004,"参数zxNo不能为空");
-        }
-        $zxinfo = Db::name("consult")->where(["zxNo"=>$zxNo,"is_del"=>0])->find();
-        if($zxinfo==false){
-            return error_show(1004,"未找到咨询单数据");
-        }
         $customer_code= $this->post['customer_code'] && $this->post['customer_code'] !=="" ? trim($this->post['customer_code']) :"";
         if($customer_code==""){
             return error_show(1002,"客户code不能为空");
@@ -169,74 +161,11 @@ class Salezx extends \app\BaseController
         }catch(\Exception $e){
             Db::rollback();
             return error_show(1005,$e->getMessage());
-        }
-    }
 
-    /**咨询新建商品
-     * @param $data
-     * @return bool
-     */
-    public function addGood($data){
-        $isgood = Db::name("good")->where(["good_code"=>"GD-".$data["cpNo"]])->find();
-        if($isgood){
-            return true;
-        }
-        $good=[
-            "good_code"=>"GD-".$data["cpNo"],
-            "item"=>'咨询订单',
-            "good_name"=>$data["cpName"],
-            "good_desc"=>$data["desc"],
-            "brand"=>$data["brank"],
-            "original_price"=>$data["sale_fee"],
-            "cg_saler"=>$data["saler"],
-            "good_type"=>$data["zxtype"],
-            "unit"=>$data["unit"],
-            "good_addr"=>$data["addr"],
-            "gys_code"=>$data["gysNo"],
-            "market_fee"=>$data["sale_fee"],
-            "is_online"=>'产品上线',
-            "sort_f"=>$data["cat_f"],
-            "sort_s"=>$data["cat_s"],
-            "cat_id"=>$data["cat_id"],
-            "status"=>1,
-            "is_del"=>0,
-            "addtime"=>date("Y-m-d H:i:s"),
-            "updatetime"=>date("Y-m-d H:i:s")
-        ];
-        $insert = Db::name("good")->insert($good);
-        if($insert){
-            $st = ["order_code"=>$data["cpNo"],"status"=>1,"action_remark"=>'',"action_type"=>"create"];
-            ActionLog::logAdd($this->post['token'],$st,"resign_info",1,$st);
-            $type=[
-                "type_code"=>$data['cpNo'],
-                "good_code"=>"GD-".$data["cpNo"],
-                "color"=>$data["color"],
-                "material"=>$data["material"],
-                "attribute"=>$data["model"],
-                "specs"=>$data["specs"],
-                "is_diff"=>$data["is_diff"],
-                "cert_fee"=>$data["cert_fee"],
-                "packing_fee"=>$data["package_fee"],
-                "mark_fee"=>$data["mark_fee"],
-                "cost_fee"=>$data["bare_fee"],
-                "logistics_fee"=>$data["delivery_fee"],
-                "logistics"=>$data["delivery_day"],
-                "min_num"=>$data["min_num"],
-                "unit_price"=>$data["sale_price"],
-                "status"=>1,
-                "is_del"=>0,
-                "addtime"=>date("Y-m-d H:i:s"),
-                "updatetime"=>date("Y-m-d H:i:s"),
-            ];
-            $ert = Db::name("good_type")->insert($type);
-            if($ert){
-                $sti = ["order_code"=>$data["cpNo"],"status"=>1,"action_remark"=>'',"action_type"=>"create"];
-                ActionLog::logAdd($this->post['token'],$sti,"resign_info",1,$sti);
-                return true;
-            }
-        }
-        return false;
     }
+    }
+
+
 
     public function edit(){
         $token = isset($this->post['token']) && $this->post['token'] !=="" ?trim($this->post['token']):"";