ad

app/admin/controller/Customer.php

@@ -33,10 +33,11 @@ class Customer extends BaseController
 
         $data =[];
         foreach ($list as $key=>$value){
-            $total_fee = Db::name("invoice_pool")->where([["status","=",5],["is_del","=",0],["type_check","=",2],
-                ["trade_status","in",[1,2]],["wtrade_fee",">",0],["inv_in","=",$value['companyNo']]])->sum("wtrade_fee");
-            $value["trade_inv"]=$total_fee;
-            $value["trade_inv_status"]=$total_fee>0 ? 1 :0;
+            $total_fee= Db::name("invoice_pool")->where([["inv_in","=",$value['companyNo'],["status","<=",3],
+            ["is_del","=",0]]])->field("sum(ainv_fee) as ainv_fee,sum(winv_fee) as winv_fee,sum(inv_value) as total_fee")->find();
+            $value['ainv_fee'] = $total_fee['ainv_fee']??0;
+            $value['winv_fee'] = $total_fee['winv_fee']??0;
+            $value['total_fee'] = $total_fee['total_fee']??0;
             $data[]=$value;
         }
         return app_show(0,"获取成功",['list'=>$data,"count"=>$count]);
@@ -59,10 +60,10 @@ class Customer extends BaseController
             return error_show(1004,"未找到客户数据");
         }
 
-        $trade = Db::name("trade_pool")->where([["companyNo","=",$companyNo],["is_del","=",0]])->field("sum(order_fee) as aorder_fee,sum(worder_fee) as worder_fee,sum(inv_fee) as inv_fee,sum(winv_fee) as winv_fee")
-         ->find();
-        $inv = Db::name("invoice_pool")->where([["inv_in","=",$companyNo],["is_del","=",0]])->field("sum(aorder_fee) as aorder_fee,sum(worder_fee) as worder_fee,sum(atrade_fee) as atrade_fee,sum(wtrade_fee) as wtrade_fee")
-            ->find();
+//        $trade = Db::name("trade_pool")->where([["companyNo","=",$companyNo],["is_del","=",0]])->field("sum(order_fee) as aorder_fee,sum(worder_fee) as worder_fee,sum(inv_fee) as inv_fee,sum(winv_fee) as winv_fee")
+//         ->find();
+//        $inv = Db::name("invoice_pool")->where([["inv_in","=",$companyNo],["is_del","=",0]])->field("sum(aorder_fee) as aorder_fee,sum(worder_fee) as worder_fee,sum(atrade_fee) as atrade_fee,sum(wtrade_fee) as wtrade_fee")
+//            ->find();
         $order = Db::name("qrd_info")->where([["customerNo","=",$companyNo]])->field("sum(apay_fee) as apay_fee,sum(wpay_fee) as wpay_fee,sum(ainv_fee) as ainv_fee,sum(winv_fee) as winv_fee")
             ->find();
         array_walk($order,function (&$value){
@@ -70,21 +71,19 @@ class Customer extends BaseController
                 $value=0;
            }
         });
-        array_walk($inv,function (&$value){
-            if(is_null($value)){
-                $value=0;
-            }
-        });
-        array_walk($trade,function (&$value){
-            if(is_null($value)){
-                $value=0;
-            }
-        });
-        $balance = $order["apay_fee"] - $order["ainv_fee"];
-        $order["trade_inv"]=$balance >0 ?$balance :0 ;
-        $order["inv_trade"]= $balance <0 ? $order["ainv_fee"]-$order["apay_fee"] :0;
-        $data=["trade"=>$trade,"inv"=>$inv,"order"=>$order];
-        return app_show(0,"获取成功",$data);
+//        array_walk($inv,function (&$value){
+//            if(is_null($value)){
+//                $value=0;
+//            }
+//        });
+//        array_walk($trade,function (&$value){
+//            if(is_null($value)){
+//                $value=0;
+//            }
+//        });
+
+
+        return app_show(0,"获取成功",$order);
     }
 
     /**