123

app/admin/controller/Exclusive.php

@@ -102,24 +102,87 @@ class Exclusive extends Base
     }
 
     public function query(){
-        $where =[["is_del","=",0]];
-        $cat_name=isset($this->post['name']) && $this->post['name'] !==""? trim($this->post['name']) :"";
-        if($cat_name!==""){
-            $where[]=['name',"like","%$cat_name%"];
+//        $where =[["is_del","=",0]];
+//        $cat_name=isset($this->post['name']) && $this->post['name'] !==""? trim($this->post['name']) :"";
+//        if($cat_name!==""){
+//            $where[]=['name',"like","%$cat_name%"];
+//        }
+//        $pid=isset($this->post['pid']) && $this->post['pid'] !==""? intval($this->post['pid']) :"";
+//        if($pid!==""){
+//            $where[]=['pid',"=",$pid];
+//        }
+//        $status=isset($this->post['status']) && $this->post['status'] !==""? intval($this->post['status']) :"";
+//        if($status!==""){
+//            $where[]=['status',"=",$status];
+//        }
+//        $level=isset($this->post['level']) && $this->post['level'] !==""? intval($this->post['level']) :"";
+//        if($level!==""){
+//            $where[]=['level',"=",$level];
+//        }
+//        $list = Db::name("exclusive")->where($where)->select();
+//        return app_show(0,"获取成功",$list);
+//        $id = isset($this->post['id']) && $this->post['id'] !=="" ? intval($this->post['id']) :"";
+//        if($id==""){
+//            return error_show(1002,"参数id不能为空");
+//        }
+//        $idinfo = Db::name('exclusive')->where(['id'=>$id])->find();
+//        if($idinfo==""){
+//            return error_show(1002,"未找到数据");
+//        }
+//        return app_show(0,"获取成功",$idinfo);
+    }
+    public function edit(){
+        $id = isset($this->post['id']) && $this->post['id'] !=="" ? intval($this->post['id']):"";
+        if($id==""){
+            return error_show(1004,"参数id不能为空");
         }
-        $pid=isset($this->post['pid']) && $this->post['pid'] !==""? intval($this->post['pid']) :"";
-        if($pid!==""){
-            $where[]=['pid',"=",$pid];
+        $info = Db::name('exclusive')->where(['id'=>$id,'is_del'=>0])->find();
+        if($info==""){
+            return error_show(1002,"未找到数据");
         }
-        $status=isset($this->post['status']) && $this->post['status'] !==""? intval($this->post['status']) :"";
-        if($status!==""){
-            $where[]=['status',"=",$status];
+        $name = isset($this->post['name'])&&$this->post['name']!=""? trim($this->post['name']):"";
+        if($name==""){
+            return error_show(1004,"参数name不能为空");
+        }
+        $pid =isset($this->post['pid'])&&$this->post['pid']!=="" ? intval($this->post['pid']):0;
+        $level=1;
+        $search = $name;
+        if($pid!==0){
+            $parent= Db::name("exclusive")->where(["id"=>$pid,"is_del"=>0])->find();
+            if($parent==false){
+                return error_show(1003,"父级数据未找到");
+            }
+            $search=$parent['search']."/".$name;
+            $level=$parent['level']+1;
+        }
+        $data=[
+            "id"=>$id,
+            "name"=>$name,
+            "pid"=>$pid,
+            "level"=>$level,
+            "search"=>$search,
+            "status"=>0,
+            "is_del"=>0,
+            "updatetime"=>date("Y-m-d H:i:s")
+        ];
+        $in =Db::name("exclusive")->save($data);
+        if($in){
+            return app_show(0,"编辑成功");
+        }else{
+            return error_show(1003,"编辑失败");
         }
-        $level=isset($this->post['level']) && $this->post['level'] !==""? intval($this->post['level']) :"";
-        if($level!==""){
-            $where[]=['level',"=",$level];
+    }
+    public function delete(){
+        $id = isset($this->post['id']) && $this->post['id'] !==""? intval($this->post['id']) :"";
+        $info = Db::name('exclusive')->where(["is_del"=>0,'id'=>$id])->find();
+        if($info==false){
+            return error_show(1002,"未找到数据");
+        }
+        $supp= Db::name('exclusive')->update(['id'=>$id,'is_del'=>1,"updatetime"=>date("Y-m-d H:i:s")]);
+        if($supp){
+            return error_show(0,"删除成功");
+        }else{
+            return error_show(1002,"删除失败");
         }
-        $list = Db::name("exclusive")->where($where)->select();
-        return app_show(0,"获取成功",$list);
     }
 }

app/admin/controller/Project.php

@@ -384,6 +384,7 @@ class Project extends Base
             $value['metal_name'] = isset($nobel[$good['metal_id']])?$nobel[$good['metal_id']]:"";
             $value['is_gold_price'] = isset($good['is_gold_price'])?$good['is_gold_price']:"0";
             $value['config'] = isset($good['config'])?$good['config']:"";
+            $value['other_config'] = isset($good['other_config'])?$good['other_config']:"";
             $value['weight'] = isset($good['weight'])?$good['weight']:"";
             $value['is_diff'] = isset($good['is_diff'])?$good['is_diff']:"0";
             $value['demo_fee'] = isset($good['demo_fee'])?$good['demo_fee']:"0";

app/admin/controller/Suppler.php

@@ -96,7 +96,7 @@ class Suppler extends BaseController
         $warehouse= isset($this->post['warehouse']) && $this->post['warehouse']!==""?trim($this->post['warehouse']) :"";
         $pay_day= isset($this->post['pay_day']) && $this->post['pay_day']!==""?trim($this->post['pay_day']) :"";
         $scope= isset($this->post['scope']) && $this->post['scope']!==""?trim($this->post['scope']) :"";
-        $status= isset($this->post['status']) && $this->post['status']!==""?intval($this->post['status']) :"0";
+       // $status= isset($this->post['status']) && $this->post['status']!==""?intval($this->post['status']) :"1";
         //$registertime= isset($this->post['registertime']) && $this->post['registertime']!==""?
         // $this->post['registertime'] :"";
         $supplier_img = isset($this->post['supplier_img']) && $this->post['supplier_img'] !=="" ? trim($this->post['supplier_img']):"";
@@ -113,9 +113,6 @@ class Suppler extends BaseController
         if($position==""){
             return error_show(1002,"参数position不能为空");
         }
-//        if($registercode==""){
-//            return error_show(1002,"参数registercode不能为空");
-//        }
         Db::startTrans();
         try{
             $data=[
@@ -136,12 +133,12 @@ class Suppler extends BaseController
                 "warehouse"=>$warehouse,
                 "pay_day"=>$pay_day,
                 "scope"=>$scope,
-                "status"=>$status,
                 "code"=>$tr,
                 "type"=>$type,
                 "nature"=>$nature,
                 "legaler"=>$legaler,
                 "addr"=>$addr,
+                "status"=>1,
                 "is_del"=>0,
                 "remark"=>'',
                 "ticket_type"=>$ticket_type,
@@ -160,7 +157,6 @@ class Suppler extends BaseController
             if($supplier_img!==""){
                 $ocr=new Ocr();
                 $datwa =  $ocr->query("",$supplier_img);
-                // var_dump($data);
                 if($datwa['code']==0 && isset($datwa['data']['result'])){
                         $license = $datwa['data']['result'];
                         $data['legaler']= isset($license['legal_representative'])?$license['legal_representative']:"";
@@ -169,18 +165,22 @@ class Suppler extends BaseController
                         $data['scope']= isset($license['business_scope'])?$license['business_scope']:"";
                         $data['capital']= isset($license['registered_capital'])?$license['registered_capital']:"";
                         $data['nature']= isset($license['type'])?$license['type']:"";
+                        $data['registercode']= isset($license['registration_number'])?$license['registration_number']:"";
                         $data['status']=1;
                         if($name!=$license['name']){
                             $data['remark']="企业名称与营业执照不匹配";
                             $data['status']=0;
+                            $data['ocr_status']=1;
                         }
-                        if($registercode!=$license['registration_number']){
+                        if($registercode!=$license['registration_number'] && $registercode!=""){
                             $data['remark'].="企业名称与营业执照不匹配";
                             $data['status']=0;
+                            $data['ocr_status']=1;
                         }
                 }else{
                     $data['remark']="营业执照识别失败";
                     $data['status']=0;
+                    $data['ocr_status']=2;
                 }
             }
             $join = Db::name('supplier')->insert($data,true);
@@ -409,18 +409,22 @@ class Suppler extends BaseController
                     $data['scope']= isset($license['business_scope'])?$license['business_scope']:"";
                     $data['capital']= isset($license['registered_capital'])?$license['registered_capital']:"";
                     $data['nature']= isset($license['type'])?$license['type']:"";
+                    $data['registercode']=isset($license['registration_number'])? $license['registration_number']:"";//12356
                     $data['status']=1;
                     if($name!=$license['name']){
                         $data['remark']="企业名称与营业执照不匹配";
                         $data['status']=0;
+                        $data['ocr_status']=1;
                     }
-                    if($registercode!=$license['registration_number']){
+                    if($registercode!=$license['registration_number']&&$registercode!=''){
                         $data['remark'].="企业名称与营业执照不匹配";
                         $data['status']=0;
+                        $data['ocr_status']=1;
                     }
                 }else{
                     $data['remark']="营业执照识别失败";
                     $data['status']=0;
+                    $data['ocr_status']=2;
                 }
             }
             $join = Db::name('supplier')->where(['id'=>$id,'is_del'=>0])->save($data);

app/admin/route/app.php

@@ -442,7 +442,7 @@ Route::rule("projectfeeddel","admin/Project/feeddel");
 Route::rule("exclulist","admin/Exclusive/list");
 Route::rule("excluadd","admin/Exclusive/add");
 Route::rule("exclustatus","admin/Exclusive/status");
-Route::rule("excluquery","admin/Exclusive/qurey");
+Route::rule("excluquery","admin/Exclusive/query");
 Route::rule("excludel","admin/Exclusive/delete");
-
+Route::rule("excluedit","admin/Exclusive/edit");