diff --git a/Application/Home/Controller/FinanceController.class.php b/Application/Home/Controller/FinanceController.class.php index 24015b034..cb7da8c13 100644 --- a/Application/Home/Controller/FinanceController.class.php +++ b/Application/Home/Controller/FinanceController.class.php @@ -2,6 +2,7 @@ namespace Home\Controller; +use Admin\Model\WithdrawModel; use Base\Model\Model; use OT\DataDictionary; use Base\Repository\PromoteRepository; @@ -395,6 +396,7 @@ class FinanceController extends BaseController $begTime = strtotime(date('Y-m-d', strtotime($initBegTime))); $endTime = strtotime(date('Y-m-d', strtotime($initEndTime))) + 3600 * 24; $status = ''; + $settlementType = intval(I('settlement_type', 0)); $parameter['p'] = $page; $parameter['row'] = $row; @@ -419,8 +421,11 @@ class FinanceController extends BaseController $map['status'] = $status; } } + if (!empty($settlementType)) { + $map['settlement_type'] = $settlementType; + } - $data = $model->field('id, widthdraw_number, create_time, settlement_begin_time, settlement_end_time, sum_money, status, respond, transfer_proof, op_id, op_type, last_op_id, last_op_type') + $data = $model->field('id, widthdraw_number, create_time, settlement_begin_time, settlement_end_time, sum_money, status, respond, transfer_proof, op_id, op_type, last_op_id, last_op_type, settlement_type') ->where($map) ->order('id desc') ->page($page, $row) @@ -439,6 +444,7 @@ class FinanceController extends BaseController $list['last_op_id'] = $this->getOpIdByType($list['last_op_id'], $list['last_op_type']); $list['op_type'] = getPromoteWithdrawOpType($list['op_type']); $list['last_op_type'] = getPromoteWithdrawOpType($list['last_op_type']); + $list['settlement_type_text'] = WithdrawModel::$settlementTypeList[$list['settlement_type']] ?? '未知'; switch ($list['status']) { case -2: $list['status_name'] = '' . $list['status_name'] . ''; @@ -454,6 +460,8 @@ class FinanceController extends BaseController $page = set_pagination($count, $row, $parameter); + $settlementTypeList = WithdrawModel::$settlementTypeList; + $this->assign('listData', $data); $this->assign('count', $count); $this->assign('initBegTime', $initBegTime); @@ -462,6 +470,7 @@ class FinanceController extends BaseController $this->assign('_page', $page); $this->assign('meta_title', $metaTitle); $this->assign('modelList', $modelList); + $this->assign('settlementTypeList', $settlementTypeList); $this->display(); } diff --git a/Application/Home/View/default/Finance/settlementDtl.html b/Application/Home/View/default/Finance/settlementDtl.html index f8aecb696..dbb999a1b 100644 --- a/Application/Home/View/default/Finance/settlementDtl.html +++ b/Application/Home/View/default/Finance/settlementDtl.html @@ -143,8 +143,8 @@ 订单总额 直充 内充 - 分成比例(直充|内充) - 收益 + + 充值时间 订单状态 @@ -170,8 +170,8 @@ {$vo.pay_amount} 0.00 - {$vo.selle_ratio}%|{$vo.selle_ratio}% - {$vo.income} + + {$vo.pay_time} {$vo.selle_status} @@ -184,8 +184,8 @@ {$total.pay_amount} {$total.direct_pay_amount} {$total.inner_pay_amount} - -- - {$total.income} + + -- -- diff --git a/Application/Home/View/default/Finance/withdrawRecord.html b/Application/Home/View/default/Finance/withdrawRecord.html index 7bd43e1ef..88b4d3225 100644 --- a/Application/Home/View/default/Finance/withdrawRecord.html +++ b/Application/Home/View/default/Finance/withdrawRecord.html @@ -97,6 +97,15 @@ value="{:I('widthdraw_number','')}"> +
+ +
+
@@ -151,6 +160,7 @@ 提现日期 结算开始日期 结算截止日期 + 提现模式 操作人 操作人类型 最后操作人 @@ -175,6 +185,7 @@ {$vo.create_time} {$vo.settlement_begin_time} {$vo.settlement_end_time} + {$vo.settlement_type_text} {$vo.op_id} {$vo.op_type} {$vo.last_op_id} @@ -226,6 +237,7 @@