|
@@ -98,15 +98,17 @@ class refill_balance
|
|
|
if ($type == 'system') {
|
|
|
$mod_refill = Model('refill_order');
|
|
|
$item = $mod_refill->table('refill_order')->field('order_id,order_time')->order('order_id asc')->find();
|
|
|
+ $time = $item['order_time'] ?? time();
|
|
|
} elseif ($type == 'merchant') {
|
|
|
$mod_refill = Model('refill_order');
|
|
|
$item = $mod_refill->table('refill_order')->field('order_id,order_time')->where(['mchid' => $cid])->order('order_id asc')->find();
|
|
|
+ $time = $item['order_time'] ?? time();
|
|
|
} else {
|
|
|
$mod_refill = Model('vr_order');
|
|
|
$item = $mod_refill->table('vr_order')->field('order_id,add_time')->where(['store_id' => $cid])->order('order_id asc')->find();
|
|
|
+ $time = $item['order_time'] ?? time();
|
|
|
}
|
|
|
|
|
|
- $time = $item['order_time'] ?? time();
|
|
|
return $time;
|
|
|
}
|
|
|
|
|
@@ -184,7 +186,7 @@ class refill_balance
|
|
|
$merchant_time = $this->merchant_paytime_finder($cid, $start);
|
|
|
$transfer_detail = $this->merchant_evidence_stat($cid, $merchant_time, $end);
|
|
|
|
|
|
- $provider_time = $this->provider_paytime_finder(0, $start);
|
|
|
+ $provider_time = $this->provider_paytime_finder($cid, $start);
|
|
|
$out = $this->provider_amount_stat(0, $provider_time, $end);
|
|
|
$cname = 'system';
|
|
|
|
|
@@ -211,7 +213,7 @@ class refill_balance
|
|
|
}
|
|
|
|
|
|
if($start == 0) {
|
|
|
- $start = min($start,$pay_time);
|
|
|
+ $start = min($refill_time,$pay_time);
|
|
|
}
|
|
|
|
|
|
$accumuter = function ($parent_id)
|