|
@@ -775,29 +775,20 @@ class merchantControl extends SystemControl
|
|
|
{
|
|
|
$model_refill_order = Model('refill_order');
|
|
|
$condition['refill_order.inner_status'] = 0;
|
|
|
- $condition['refill_order.order_time'] = ['time', [strtotime(date("Y-m-d")), strtotime(date("Y-m-d"))]];
|
|
|
- if($_GET['order_state'] == ORDER_STATE_SEND) {
|
|
|
- unset($condition['refill_order.order_time']);
|
|
|
- }
|
|
|
if (!empty($_GET['order_sn'])) {
|
|
|
$condition['refill_order.order_sn'] = $_GET['order_sn'];
|
|
|
- unset($condition['refill_order.order_time']);
|
|
|
}
|
|
|
if (!empty($_GET['mch_order'])) {
|
|
|
$condition['refill_order.mch_order'] = $_GET['mch_order'];
|
|
|
- unset($condition['refill_order.order_time']);
|
|
|
}
|
|
|
if (!empty($_GET['mchid'])) {
|
|
|
$condition['refill_order.mchid'] = $_GET['mchid'];
|
|
|
- unset($condition['refill_order.order_time']);
|
|
|
}
|
|
|
if (!empty($_GET['channel_name'])) {
|
|
|
$condition['refill_order.channel_name'] = $_GET['channel_name'];
|
|
|
- unset($condition['refill_order.order_time']);
|
|
|
}
|
|
|
if (!empty($_GET['store_id'])) {
|
|
|
$condition['vr_order.store_id'] = $_GET['store_id'];
|
|
|
- unset($condition['refill_order.order_time']);
|
|
|
}
|
|
|
if (!empty($_GET['card_type'])) {
|
|
|
if(in_array($_GET['card_type'] , ['1' , '2' , '4' , '5' , '6'])) {
|
|
@@ -812,11 +803,9 @@ class merchantControl extends SystemControl
|
|
|
}
|
|
|
if (!empty($_GET['ch_trade_no'])) {
|
|
|
$condition['refill_order.ch_trade_no'] = $_GET['ch_trade_no'];
|
|
|
- unset($condition['refill_order.order_time']);
|
|
|
}
|
|
|
if (!empty($_GET['card_no'])) {
|
|
|
$condition['refill_order.card_no'] = $_GET['card_no'];
|
|
|
- unset($condition['refill_order.order_time']);
|
|
|
}
|
|
|
if (in_array($_GET['refill_amount'], ['10', '20', '30', '50' , '100', '200', '300', '500' , '1000', '20000'])) {
|
|
|
$condition['refill_order.refill_amount'] = $_GET['refill_amount'];
|