修正全部分页问题
This commit is contained in:
@@ -123,7 +123,7 @@ class DoctorAccountService extends BaseService
|
||||
$params['inquiry_status'] = 6; // inquiry_status:问诊订单状态(1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消)
|
||||
$params['inquiry_refund_status'] = 0; // inquiry_refund_status:问诊订单退款状态(0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭)
|
||||
|
||||
$order_inquiry = OrderInquiry:: getDoctorDateOrderInquiryPage($params, $reception_time, $fields);
|
||||
$order_inquiry = OrderInquiry:: getDoctorDateOrderInquiryPage($params, $reception_time, $fields,$page,$per_page);
|
||||
if (!empty($order_inquiry['data'])) {
|
||||
foreach ($order_inquiry['data'] as &$item) {
|
||||
$item['amount_total'] = $item['amount_total'] * 0.75;
|
||||
@@ -235,7 +235,7 @@ class DoctorAccountService extends BaseService
|
||||
$params['inquiry_status'] = 6; // inquiry_status:问诊订单状态(1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消)
|
||||
$params['inquiry_refund_status'] = 0; // inquiry_refund_status:问诊订单退款状态(0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭)
|
||||
|
||||
$order_inquiry = OrderInquiry:: getDoctorOrderInquiryPage($params, $fields);
|
||||
$order_inquiry = OrderInquiry:: getDoctorOrderInquiryPage($params, $fields,$page,$per_page);
|
||||
if (!empty($order_inquiry['data'])) {
|
||||
foreach ($order_inquiry['data'] as &$item) {
|
||||
$item['amount_total'] = $item['amount_total'] * 0.75;
|
||||
@@ -254,6 +254,8 @@ class DoctorAccountService extends BaseService
|
||||
$user_info = $this->request->getAttribute("userInfo") ?? [];
|
||||
|
||||
$year = $this->request->input('year');
|
||||
$page = $this->request->input('page',1);
|
||||
$per_page = $this->request->input('per_page',10);
|
||||
|
||||
// 获取当年开始时间
|
||||
$start_date = $year.'-1-1 00:00:00';
|
||||
@@ -265,7 +267,7 @@ class DoctorAccountService extends BaseService
|
||||
|
||||
$params = array();
|
||||
$params['doctor_id'] = $user_info['client_user_id'];
|
||||
$doctor_withdrawal = DoctorWithdrawal::getDatePage($params,$created_at_params);
|
||||
$doctor_withdrawal = DoctorWithdrawal::getDatePage($params,$created_at_params,$page,$per_page);
|
||||
if (empty($doctor_withdrawal['data'])){
|
||||
return success();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user