|
@@ -110,9 +110,7 @@ class refill_orderControl extends SystemControl
|
|
|
$this->RefillOrderExport($condition);
|
|
|
}
|
|
|
$merchants = [];
|
|
|
-
|
|
|
- $merchant_list = Model('merchant')->table('merchant,member')->join('inner')->on('member.member_id=merchant.admin_id')
|
|
|
- ->field('merchant.*')->where(['mchid'=>['egt',0]])->order('available_predeposit desc,merchant_state asc,mchid desc')->limit(1000)->master(true)->select();
|
|
|
+ $merchant_list = Model('')->table('merchant')->limit(1000)->order('name asc')->select();
|
|
|
foreach ($merchant_list as $value) {
|
|
|
$merchants[$value['mchid']] = $value;
|
|
|
}
|