|
|
@@ -56,11 +56,14 @@ class PaymentOrderService extends BaseService
|
|
|
if (isset($search['member_id']) && !empty($search['member_id'])) {
|
|
|
$where[] = ['payment_orders.member_id', '=', $search['member_id']];
|
|
|
}
|
|
|
- if (isset($search['type']) && !empty($search['type'])) {
|
|
|
- $where[] = ['payment_orders.type', '=', $search['type']];
|
|
|
- }
|
|
|
if (isset($search['channel']) && !empty($search['channel'])) {
|
|
|
$where[] = ['payment_orders.channel', '=', $search['channel']];
|
|
|
+ if ($search['channel'] == 'rgcz') {
|
|
|
+ $search['type'] = 3;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (isset($search['type']) && !empty($search['type'])) {
|
|
|
+ $where[] = ['payment_orders.type', '=', $search['type']];
|
|
|
}
|
|
|
if (isset($search['order_no']) && !empty($search['order_no'])) {
|
|
|
$where[] = ['payment_orders.order_no', '=', $search['order_no']];
|
|
|
@@ -77,9 +80,6 @@ class PaymentOrderService extends BaseService
|
|
|
if (isset($search['payment_type']) && $search['payment_type'] != '') {
|
|
|
$where[] = ['payment_orders.payment_type', '=', $search['payment_type']];
|
|
|
}
|
|
|
- if (isset($search['channel']) && $search['channel'] != '') {
|
|
|
- $where[] = ['payment_orders.channel', '=', $search['channel']];
|
|
|
- }
|
|
|
return $where;
|
|
|
}
|
|
|
|