新增接口：获取当前账号所能看到平台

供应商升级为业务公司、业务公司编辑两种情况下优化联系方式和地址
业务公司同步到结算平台优化

app/admin/controller/Business.php

@@ -197,14 +197,14 @@ class Business extends Base
     public function edit()
     {
 
-        $param = $this->request->only(['id', 'inv_addr', 'inv_bank', 'inv_bankNo', 'mobile','invoice_title'], 'post', 'trim');
+        $param = $this->request->only(['id', 'inv_addr', 'inv_bank', 'inv_bankNo', 'invoice_mobile','invoice_title'], 'post', 'trim');
 
         $val = Validate::rule([
             'id' => 'require|number|gt:0',
             'inv_addr' => 'require|max:255',
             'inv_bank' => 'require|max:255',
             'inv_bankNo' => 'require|max:255',
-            'mobile' => 'require|max:255',
+            'invoice_mobile' => 'require|max:255',
             'invoice_title' => 'require|max:255',
         ]);
 

app/admin/controller/Check.php

@@ -58,13 +58,13 @@ public function __construct(App $app)
         $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
         if ($companyNo !== "") {
             $wsmcode = Db::name("warehouse_info")->where(['companyNo' => $companyNo, "is_del" => 0])->column("wsm_code");
-            $condition[] = ["c.wsm_code", "in", $wsmcode];
+            $condtion[] = ["c.wsm_code", "in", $wsmcode];
         }
 
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
         if($relaComNo!="") {
             $wsmcode = Db::name("warehouse_info")->where(['companyNo' => $relaComNo, "is_del" => 0])->column("wsm_code");
-            $condition[] = ["c.wsm_code", "in", $wsmcode];
+            $condtion[] = ["c.wsm_code", "in", $wsmcode];
         }
 
         $stock_low = isset($this->post['stock_low']) && $this->post['stock_low'] !== "" ? intval($this->post['stock_low']) : "";

app/admin/controller/Platform.php

@@ -653,4 +653,37 @@ class Platform extends Base
         if ($insert_data) Db::name("cat_plat")->insertAll($insert_data);
 
     }
+
+    //获取当前账号所能看到平台
+    public function getPlatformListByUid()
+    {
+
+        $param = $this->request->only(['page' => 1, 'size' => 10, 'platform_code' => '', 'platform_name' => '', 'platform_type' => '', 'use_type' => ''], 'post', 'trim');
+
+        $where = [['is_del', '=', 0]];
+        if ($param['platform_code'] !== '') $where[] = ['platform_code', 'like', '%' . $param['platform_code'] . '%'];
+        if ($param['platform_name'] !== '') $where[] = ['platform_name', 'like', '%' . $param['platform_name'] . '%'];
+        if ($param['platform_type'] !== '') $where[] = ['platform_type', '=', $param['platform_type']];
+        if ($param['use_type'] !== '') $where[] = ['use_type', '=', $param['use_type']];
+
+        if ($this->level == 2) {
+            $ids = Db::name('user_platform')
+                ->where(['uid' => $this->uid, 'is_del' => 0])
+                ->value('platform');
+            $where[] = ['id', 'in', $ids];
+        }
+
+        $count = Db::name('platform')
+            ->where($where)
+            ->count('id');
+
+        $list = Db::name('platform')
+            ->field('id,platform_code,platform_name,platform_type,use_type,status')
+            ->where($where)
+            ->order('id', 'desc')
+            ->page($param['page'], $param['size'])
+            ->select()
+            ->toArray();
+        return json_show(0, '获取成功', ['count' => $count, 'list' => $list]);
+    }
 }

app/admin/controller/Sale.php

@@ -2212,6 +2212,11 @@ class Sale extends Base
             $where[] = ['s.supplierNo', "=", $supplierNo];
         }
 
+        $relaComNo = trim($this->post['relaComNo']??'');
+        if ($relaComNo !== "") {
+            $where[] = ['s.supplierNo', "=", $relaComNo];
+        }
+
 //        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] !== "" ? trim($this->post['relaComNo']) : "";
 //        if ($relaComNo !== '') $where[] = ['s.customer_code', '=', $relaComNo];
 
@@ -3261,6 +3266,10 @@ class Sale extends Base
         if ($customer_code != "") {
             $where[] = ['c.customer_code', "like", "%$customer_code%"];
         }
+        $relaComNo = trim($this->post['relaComNo'] ?? '');
+        if ($relaComNo !== "") {
+            $where[] = ['c.supplierNo', "=", $relaComNo];
+        }
         //  $role=$this->checkRole();
 //        if(!empty($role['write'])){
 //            $where[]=["apply_id","in",$role['write']];

app/admin/controller/WareHouse.php

@@ -246,12 +246,15 @@ class WareHouse extends Base
         $id = isset($post['id']) && $post['id']!==''?intval($post['id']): "";
         if($id===""){
           return  error_show(1004,"参数id不能为空");
-        };
+        }
         $warse = Db::name("warehouse_info")
             ->alias("a")
             ->join("warehouse_addr b ","a.wsm_code=b.wsm_code","left")
             ->where(["a.id"=>$id,"a.is_del"=>0,"a.status"=>1])
             ->field("a.id,a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.addr,a.contactor,a.contactor_name,a.mobile,a.position,a.status,a.addtime,a.companyNo,a.updatetime,a.wsm_type,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code")
+            ->withAttr('addr_code', function ($val) {
+                return json_decode($val, true);  //单独处理省市区编码
+            })
             ->findOrEmpty();
         if(empty($warse))  return error_show(1004,"未找到数据");
 
@@ -274,7 +277,7 @@ class WareHouse extends Base
 
         $warse['addrs_code'] = isset($warse['addrs_code'])&&$warse['addrs_code']!="" ? json_decode($warse['addrs_code'],true):"";
         if($warse['wsm_type']!=""){
-            $type = Db::name("warehouse_type")->where(["id"=>$warse['wsm_type']])->find();
+            $type = Db::name("warehouse_type")->field('name')->where(["id"=>$warse['wsm_type']])->findOrEmpty();
             $warse['type_name'] = isset($type['name']) ? $type['name'] :"";
         }else{
             $warse['type_name']="";

app/admin/route/app.php

@@ -439,6 +439,7 @@ Route::rule('platformedit', 'admin/Platform/edit');
 Route::rule('platforminfo', 'admin/Platform/info');
 Route::rule('platformdelete', 'admin/Platform/del');
 Route::rule('platformstatus', 'admin/Platform/status');
+Route::rule('getPlatformListByUid', 'admin/Platform/getPlatformListByUid');
 
 Route::rule('actcreate', 'admin/Activity/create');
 Route::rule('actcost', 'admin/Activity/cost');

app/command/TempHandleBusinessData.php

@@ -147,12 +147,12 @@ class TempHandleBusinessData extends Command
                         $insert[] = [
                             'companyNo' => $item['companyNo'],
                             'company_name' => $item['company'],
-                            'company_address' => $item['addr'],
+                            'company_address' => $item['inv_addr'],
                             'company_license' => $item['inv_code'],
                             'bank_name' => $item['inv_bank'],
                             'bankNo' => $item['inv_bankNo'],
                             'contector' => $item['inv_legaler'],
-                            'mobile' => $item['mobile'],
+                            'mobile' => $item['invoice_mobile'],
                             'company_img' => $item['license_img'],
                             'status' => 0,//默认禁用，需要在结算平台启用
                             'is_del' => $item['is_del'],
@@ -186,12 +186,12 @@ class TempHandleBusinessData extends Command
                     	$upda=[
                     		'id' => $exists[$item['companyNo']]['id'],
 		                    'company_name' => $item['company'],
-                            'company_address' => $item['addr'],
+                            'company_address' => $item['inv_addr'],
                             'company_license' => $item['inv_code'],
                             'bank_name' => $item['inv_bank'],
                             'bankNo' => $item['inv_bankNo'],
                             'contector' => $item['inv_legaler'],
-                            'mobile' => $item['mobile'],
+                            'mobile' => $item['invoice_mobile'],
                             'company_img' => $item['license_img'],
                             'is_del' => $item['is_del'],
                             'updatetime' => $item['updatetime'],