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

app/admin/controller/Suppler.php

@@ -157,6 +157,7 @@ class Suppler extends BaseController
                 "registertime"=>date('Y-m-d H:i:s'),
                 "person"=>$person,
                 "personid"=>$personid,
+                "remark"=>""
             ];
             if($supplier_img!==""){
                 $ocr=new Ocr();
@@ -166,16 +167,16 @@ class Suppler extends BaseController
                         $license = $datwa['data']['result'];
                         $data['legaler']= isset($license['legal_representative'])?$license['legal_representative']:"";
                         $data['addr']= isset($license['address'])?$license['address']:"";
-                        $data['registertime']= isset($license['found_date'])? date("Y-m-d",strtotime(str_replace(["年","月","日"],[""],$license['found_date']))):"";
+                        $data['registertime']= isset($license['found_date'])? $license['found_date']:"";
                         $data['scope']= isset($license['business_scope'])?$license['business_scope']:"";
-                        $data['capital']= isset($license['registered_capital'])?str_replace("万元","",$license['registered_capital'])*10000:"";
+                        $data['capital']= isset($license['registered_capital'])?$license['registered_capital']:"";
                         $data['nature']= isset($license['type'])?$license['type']:"";
                         $data['status']=1;
-                        if($data['name']!=$license['name']){
+                        if($name!=$license['name']){
                             $data['remark']="企业名称与营业执照不匹配";
                             $data['status']=0;
                         }
-                        if($data['code']!=$license['registration_number']){
+                        if($registercode!=$license['registration_number']){
                             $data['remark'].="企业名称与营业执照不匹配";
                             $data['status']=0;
                         }
@@ -382,6 +383,7 @@ class Suppler extends BaseController
                 "prove_img"=>$prove_img,
                 "person"=>$person,
                 "personid"=>$personid,
+                "remark"=>""
             ];
             if($supplier_img!=="" &&$info['license_img']!=$supplier_img){
                 $ocr=new Ocr();
@@ -391,16 +393,16 @@ class Suppler extends BaseController
                     $license = $dataw['data']['result'];
                     $data['legaler']= isset($license['legal_representative'])?$license['legal_representative']:"";
                     $data['addr']= isset($license['address'])?$license['address']:"";
-                    $data['registertime']= isset($license['found_date'])? date("Y-m-d",strtotime(str_replace(["年","月","日"],[""],$license['found_date']))):"";
+                    $data['registertime']= isset($license['found_date'])? $license['found_date']:"";
                     $data['scope']= isset($license['business_scope'])?$license['business_scope']:"";
-                    $data['capital']= isset($license['registered_capital'])?str_replace("万元","",$license['registered_capital'])*10000:"";
+                    $data['capital']= isset($license['registered_capital'])?$license['registered_capital']:"";
                     $data['nature']= isset($license['type'])?$license['type']:"";
                     $data['status']=1;
-                    if($data['name']!=$license['name']){
+                    if($name!=$license['name']){
                         $data['remark']="企业名称与营业执照不匹配";
                         $data['status']=0;
                     }
-                    if($data['code']!=$license['registration_number']){
+                    if($registercode!=$license['registration_number']){
                         $data['remark'].="企业名称与营业执照不匹配";
                         $data['status']=0;
                     }