Переглянути джерело

feat: EK-856: 管理员增加“Country”属性.

kevinElken 10 місяців тому
батько
коміт
586ac52571
1 змінених файлів з 9 додано та 4 видалено
  1. 9 4
      backendApi/modules/v1/controllers/SiteController.php

+ 9 - 4
backendApi/modules/v1/controllers/SiteController.php

@@ -204,10 +204,15 @@ class SiteController extends BaseController
         $currenciesConversions = CurrencyConversions::getFromCache();
         $currenciesConversions = CurrencyConversions::getFromCache();
         $currenciesConversions = array_column($currenciesConversions, NULL, 'TO_CURRENCY_ID');
         $currenciesConversions = array_column($currenciesConversions, NULL, 'TO_CURRENCY_ID');
 
 
-        foreach ($countries as &$country) {
-            $country['LOCAL_CURRENCY_NAME'] = $currencies[$country['LOCAL_CURRENCY_ID']]['NAME'] ?? '';
-            $country['CURRENCY_PRODUCT_RATE'] = $currenciesConversions[$country['LOCAL_CURRENCY_ID']]['PRODUCT_RATE'] ?? 0;
-        }
+        $countries = array_map(fn($country) => [
+            ...$country,
+            'LOCAL_CURRENCY_NAME' => $currencies[$country['LOCAL_CURRENCY_ID']]['NAME'] ?? '',
+            'CURRENCY_PRODUCT_RATE' => $currenciesConversions[$country['LOCAL_CURRENCY_ID']]['PRODUCT_RATE'] ?? 0,
+        ], $countries);
+//        foreach ($countries as &$country) {
+//            $country['LOCAL_CURRENCY_NAME'] = $currencies[$country['LOCAL_CURRENCY_ID']]['NAME'] ?? '';
+//            $country['CURRENCY_PRODUCT_RATE'] = $currenciesConversions[$country['LOCAL_CURRENCY_ID']]['PRODUCT_RATE'] ?? 0;
+//        }
 
 
         return static::notice(['data' => $countries]);
         return static::notice(['data' => $countries]);
     }
     }