invlist接口优化，数据库配置

app/admin/controller/Company.php

@@ -274,18 +274,22 @@ class Company extends BaseController
         }
         $page = isset($post['page'])&& $post['page']!="" ? intval($post['page']) :1;
         $size = isset($post['size'])&& $post['size']!="" ? intval($post['size']) :10;
-        $count = Db::name("company_info")->alias("a")
-        ->leftJoin("supplier_info b","a.companyNo=b.code")
-        ->where($condition)->count();
-        $total = ceil($count/$size)>1 ? ceil($count/$size) : 1;
-        $page = $page>=$total?intval($total):$page;
-        $list = Db::name("company_info")->alias("a")
-        ->leftJoin("supplier_info b","a.companyNo=b.code")
-        ->where($condition)
-        ->field("a.*,b.name")
-        ->page($page,$size)
-        ->order("id desc")
-        ->select();
+        $count = Db::name("company_info")
+            ->alias("a")
+            ->leftJoin("supplier_info b", "a.companyNo=b.code")
+            ->where($condition)
+            ->count();
+        $total = ceil($count / $size) > 1 ? ceil($count / $size) : 1;
+        $page = $page >= $total ? intval($total) : $page;
+        $list = Db::name("company_info")
+            ->alias("a")
+            ->leftJoin("supplier_info b", "a.companyNo=b.code")
+            ->where($condition)
+            ->field("a.*,b.name")
+            ->page($page, $size)
+            ->order("id desc")
+            ->select()
+            ->toArray();
         return app_show(0,"获取成功",['list'=>$list,"count"=>$count]);
     }
 

app/admin/controller/Payment.php

@@ -1361,11 +1361,22 @@ class Payment extends BaseController
         }
         $page = isset($post['page'])&&$post['page']!="" ? intval($post['page']):1;
         $size = isset($post['size'])&&$post['size']!="" ? intval($post['size']):10;
-        $count =Db::name("pay_invoice")->alias("a")->leftJoin("pay b","a.payNo=b.payNo")->where($condition)->count();
+        $count =Db::name("pay_invoice")
+            ->alias("a")
+            ->leftJoin("pay b","a.payNo=b.payNo")
+            ->where($condition)
+            ->count();
         $total = ceil($count/$size);
         $page = $page>$total? intval($total):$page;
-        $list = Db::name("pay_invoice")->alias("a")->leftJoin("pay b","a.payNo=b.payNo")->field("a.*")->where
-        ($condition)->page($page,$size)->order("addtime desc")->select()->toArray();
+        $list = Db::name("pay_invoice")
+            ->alias("a")
+            ->leftJoin("pay b","a.payNo=b.payNo")
+            ->field("a.*")
+            ->where($condition)
+            ->page($page,$size)
+            ->order("addtime desc")
+            ->select()
+            ->toArray();
         foreach ($list as &$value){
             $invoinfo =Db::name("invoice_info")->where(["hpNo"=>$value['hpNo'],"status"=>1])->find();
             $value['buyer_name'] = $invoinfo['buyer_name']??"";
@@ -1387,7 +1398,21 @@ class Payment extends BaseController
             $value['invStatus_cn'] = $this->invStatus[$value['invStatus']]??'';
             $value['item_list'] = isset($invoinfo['item_list']) &&$invoinfo['item_list']!='' ?json_decode($invoinfo['item_list'],true):"";
         }
-        return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
+
+        //结算invlist这个接口当用payNo筛选的时候，返回列表里需要加一项统计筛选后列表的inv_subtotal_amount、total字段的和
+        $inv_subtotal_amount = $total = 0;
+        if ($payNo != '') {
+            $inv_subtotal_amount = round(array_sum(array_column($list, 'inv_subtotal_amount')), 2);
+            $total = round(array_sum(array_column($list, 'total')), 2);
+        }
+
+        return app_show(0, "获取成功", [
+            "count" => $count,
+            "list" => $list,
+            'inv_subtotal_amount' => $inv_subtotal_amount,
+            'total' => $total
+        ]);
+
     }
 
         /**发票删除

app/admin/controller/User.php

@@ -388,16 +388,24 @@ class User extends BaseController{
         if ($level == 1) return error_show(1004, '超管账号不允许设置角色');
 
 
-        if ($level == 1) {
-            $companyNo = isset($post['companyNo']) && $post['companyNo'] !== '' ? trim($post['companyNo']) : "";
-        } else {
-            $companyNo = isset($post['relaComNo']) && $post['relaComNo'] !== '' ? trim($post['relaComNo']) : "";
-        }
+//        if ($level == 1) {
+        $companyNo = isset($post['companyNo']) && $post['companyNo'] !== '' ? trim($post['companyNo']) : "";
+//        } else {
+//            $companyNo = isset($post['relaComNo']) && $post['relaComNo'] !== '' ? trim($post['relaComNo']) : "";
+//        }
+
+        $company_type = 0;
 
         if ($level== 2) {
             if ($companyNo == "") return error_show(1004, "业务公司编号不能为空");
-            $company = Db::name("supplier_info")->field('code')->where(["code" => $companyNo])->find();
+            $company = Db::name("company_info")->field('id,companyNo code,company_name name')->where(["companyNo" => $companyNo])->find();
             if ($company == false) return error_show(1004, "业务公司不存在");
+            $company_type = 1;
+        }elseif ($level==3){
+            if ($companyNo == "") return error_show(1004, "供应商编号不能为空");
+            $company = Db::name("supplier_info")->field('id,code,type,name')->where(["code" => $companyNo])->find();
+            if ($company == false) return error_show(1004, "供应商公司不存在");
+            $company_type = 2;
         }
 
 //        $isSuper = Db::name("user_role")->alias("a")
@@ -423,7 +431,7 @@ class User extends BaseController{
                     "roleid" => $post['roleid'],
                     "nickname" => $post['nickname'],
                     "companyNo" => $level == 2 ? $companyNo : '',
-                    "company_type" => $level == 2 ? ($company["type"] == 3 ? 2 : 1) : 0,
+                    "company_type" => $company_type,
                     "is_main" => $ismain ? 0 : 1,
                     "status" => 1,
                     "addtime" => date("Y-m-d H:i:s"),
@@ -436,7 +444,7 @@ class User extends BaseController{
                         [
                             "companyCode" => $company["code"],
                             "companyName" => $company["name"],
-                            "company_type" => $company["type"] == 3 ? 2 : 1,
+                            "company_type" => $company_type,
                             "is_main" => $ismain ? 0 : 1
                         ]
                     ];
@@ -454,7 +462,7 @@ class User extends BaseController{
                 $userrole['roleid'] = $post['roleid'];
                 $userrole['nickname'] = $post['nickname'];
                 $userrole['companyNo'] = $level == 2 ? $companyNo : '';
-                $userrole['company_type'] = $level == 2 ? ($company["type"] == 3 ? 2 : 1) : 0;
+                $userrole['company_type'] = $company_type;
                 $userrole['updatetime'] = date("Y-m-d H:i:s");
                 $up = Db::name("user_role")->where(["id" => $userrole['id'], "is_del" => 0])->save($userrole);
             }

config/database.php

@@ -75,5 +75,20 @@ return [
             'prefix'          => env('database.prefix1', 'wsm_'),
 
         ],
+
+        //新版采销3.0的数据库连接配置
+        'mysql_wsm3.0' => [
+            'type' => env('database.type1', 'mysql'),
+            // 服务器地址
+            'hostname' => '120.46.155.214',
+            // 数据库名
+            'database' => 'wsm_test',
+            // 用户名
+            'username' => 'root',
+            // 密码
+            'password' => 'test!@#wyht123',
+            // 数据库表前缀
+            'prefix' => 'wsm_',
+        ],
     ],
 ];