|
@@ -51,7 +51,7 @@ class refill_detailControl extends SystemControl
|
|
|
$this->RefillDetailExport($condition,$merchants);
|
|
|
exit;
|
|
|
}else{
|
|
|
- $list = $mod->getRefillDetailList($condition,30,'*','order_time desc', '', true);
|
|
|
+ $list = $mod->getRefillDetailList($condition,30);
|
|
|
$list = $this->DataFormat($list,$merchants);
|
|
|
}
|
|
|
|
|
@@ -84,7 +84,7 @@ class refill_detailControl extends SystemControl
|
|
|
$result = [];
|
|
|
while (true) {
|
|
|
$start = $i * 1000;
|
|
|
- $list = Model('')->table('refill_detail')->where($condition)->order('order_time desc')->limit("{$start},1000")->master(true)->select();
|
|
|
+ $list = Model('')->table('refill_detail')->where($condition)->order('order_time desc')->limit("{$start},1000")->select();
|
|
|
|
|
|
if (empty($list)) {
|
|
|
break;
|