Commit b2a093bf authored by zhuwei's avatar zhuwei

优化 收款列表

parent 76835cd8
...@@ -81,7 +81,7 @@ class Collection extends Basic ...@@ -81,7 +81,7 @@ class Collection extends Basic
} }
if (empty($this->params['excel'])) { if (empty($this->params['excel'])) {
$field = 'a.id,a.father_id,a.order_id,a.create_time,c.user_name,c.user_phone,a.money,a.real_money,a.pay_type,a.house_number,a.type,d.internal_title,d.internal_address,a.source'; $field = 'a.id,a.father_id,a.order_id,a.create_time,c.user_name,c.user_phone,a.money,a.real_money,a.pay_type,a.house_number,a.type,d.internal_title,d.internal_address,a.source,a.transaction_fee';
$data['data']['list'] = $order->getAddPayLogOrderListLmit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where); $data['data']['list'] = $order->getAddPayLogOrderListLmit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
$data['data']['total'] = $order->getAddPayLogOrderListLmitTotal($where); $data['data']['total'] = $order->getAddPayLogOrderListLmitTotal($where);
$data['data']['money_total'] = $order->getMoneyTotal(); //总额 $data['data']['money_total'] = $order->getMoneyTotal(); //总额
...@@ -91,13 +91,13 @@ class Collection extends Basic ...@@ -91,13 +91,13 @@ class Collection extends Basic
} else { } else {
$pageNo = 1; $pageNo = 1;
$pageSize = 50000; //最多5万条数据 $pageSize = 50000; //最多5万条数据
$field = 'a.create_time,c.user_name,c.user_phone,e.name,e.phone,f.store_name,g.district_name,a.money,a.real_money,a.type,a.pay_type,d.internal_address,a.house_number,a.source'; $field = 'a.create_time,c.user_name,c.user_phone,e.name,e.phone,f.store_name,g.district_name,a.money,a.real_money,a.transaction_fee,a.type,a.pay_type,d.internal_address,a.house_number,a.source';
$data = $order->getAddPayLogOrderListLmit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where); $data = $order->getAddPayLogOrderListLmit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
$data = $this->numberTransitionString($data); $data = $this->numberTransitionString($data);
$export = new ExportExcelUntil(); $export = new ExportExcelUntil();
$title = [ '收款时间', '客户姓名', '客户手机号', '约带看人姓名', '约带看人手机号', '约带看人所属门店', '约带看人所属部门', '收款金额(元)', '实付金额(元)', '入账类型','入账方式','商铺地址','商铺号' ]; $title = [ '收款时间', '客户姓名', '客户手机号', '约带看人姓名', '约带看人手机号', '约带看人所属门店', '约带看人所属部门', '收款金额(元)', '实付金额(元)', '手续费(元)', '入账类型','入账方式','商铺地址','商铺号' ];
$export->exportTable('收款记录', $data, 9, '收款记录', $title); $export->exportTable('收款记录', $data, 9, '收款记录', $title);
} }
...@@ -120,6 +120,11 @@ class Collection extends Basic ...@@ -120,6 +120,11 @@ class Collection extends Basic
} }
$where_["id"] = $params["collection_id"]; $where_["id"] = $params["collection_id"];
$where_["real_money"] = $params["real_money"]; $where_["real_money"] = $params["real_money"];
if(!isset($params["transaction_fee"]) || $params["transaction_fee"] <= 0){
$where_["transaction_fee"] = $params["transaction_fee"];
}
$order = new OPayLogModel(); $order = new OPayLogModel();
$id = $order->updatePayLog($where_); $id = $order->updatePayLog($where_);
if($id > 0 ){ if($id > 0 ){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment