|
@@ -72,12 +72,12 @@ class refill_successfulControl extends SystemControl
|
|
|
}
|
|
|
$chnameData = array_unique($chname);
|
|
|
sort($chnameData);
|
|
|
- $result['chname'] = $chnameData;
|
|
|
+
|
|
|
if ($type == 'system') {
|
|
|
$merchants = [];
|
|
|
$merchant_list = Model('')->table('merchant')->limit(1000)->field('mchid,name,company_name,time_out')->select();
|
|
|
- foreach ($merchant_list as $value) {
|
|
|
- $merchants[$value['mchid']] = $value;
|
|
|
+ foreach ($merchant_list as $merchant) {
|
|
|
+ $merchants[$merchant['mchid']] = $merchant;
|
|
|
}
|
|
|
foreach ($chnameData as $mchid) {
|
|
|
$merchant_name = $merchants[$mchid]['company_name'] == '' ? $merchants[$mchid]['name'] : $merchants[$mchid]['company_name'];
|
|
@@ -85,6 +85,16 @@ class refill_successfulControl extends SystemControl
|
|
|
}
|
|
|
asort($mchname);
|
|
|
$result['chname'] = $mchname;
|
|
|
+ } else {
|
|
|
+ $providers = [];
|
|
|
+ $provider_list = $this->providers();
|
|
|
+ foreach ($provider_list as $provider) {
|
|
|
+ $providers[$provider['name']] = $provider;
|
|
|
+ }
|
|
|
+ foreach ($chnameData as $provider_name) {
|
|
|
+ $store_names[$provider_name] = $providers[$provider_name]['store_name'];
|
|
|
+ }
|
|
|
+ $result['chname'] = $store_names;
|
|
|
}
|
|
|
$amountData = array_unique($amount);
|
|
|
sort($amountData);
|