ソースを参照

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

kevinElken 10 ヶ月 前
コミット
4cb121f7c7
1 ファイル変更10 行追加9 行削除
  1. 10 9
      backendApi/modules/v1/controllers/SiteController.php

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

@@ -188,11 +188,6 @@ class SiteController extends BaseController
                 $adminCountry = AdminCountry::getCountry($adminId);
 
                 $countries = array_filter($countries, fn($country) => in_array($country['ID'], $adminCountry));
-                foreach ($countries as $key => $country) {
-                    if (!in_array($country['ID'], $adminCountry)) {
-                        unset($countries[$key]);
-                    }
-                }
             }
         }
 
@@ -203,10 +198,16 @@ class SiteController extends BaseController
         $currenciesConversions = CurrencyConversions::getFromCache();
         $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;
-        }
+//        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);
 
         return static::notice(['data' => $countries]);
     }