فهرست منبع

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

kevinElken 10 ماه پیش
والد
کامیت
87f157fc0e
1فایلهای تغییر یافته به همراه5 افزوده شده و 4 حذف شده
  1. 5 4
      backendApi/modules/v1/controllers/ShopController.php

+ 5 - 4
backendApi/modules/v1/controllers/ShopController.php

@@ -184,16 +184,17 @@ class ShopController extends BaseController {
         $adminId = Yii::$app->getUser()->getUserInfo()['id'];
         $adminCountry = AdminCountry::getCountry($adminId);
 
-        foreach ($countries as &$country) {
+        foreach ($countries as $key => $country) {
             if (!in_array($country, $adminCountry)) {
+                unset($countries[$key]);
                 continue;
             }
 
             // 货币
-            $country['LOCAL_CURRENCY_NAME'] = $currencies[$country['LOCAL_CURRENCY_ID']]['NAME'] ?? '';
-            $country['CURRENCY_PRODUCT_RATE'] = $currenciesConversions[$country['LOCAL_CURRENCY_ID']]['PRODUCT_RATE'] ?? 0;
+            $countries[$key]['LOCAL_CURRENCY_NAME'] = $currencies[$country['LOCAL_CURRENCY_ID']]['NAME'] ?? '';
+            $countries[$key]['CURRENCY_PRODUCT_RATE'] = $currenciesConversions[$country['LOCAL_CURRENCY_ID']]['PRODUCT_RATE'] ?? 0;
             // 商品属性
-            $country['SHOP_GOODS_NATURE'] = ShopGoodsNature::findAllAsArray('GOODS_ID=:GOODS_ID AND COUNTRY_ID=:COUNTRY_ID', [':GOODS_ID' => $id, ':COUNTRY_ID' => $country['ID']]);
+            $countries[$key]['SHOP_GOODS_NATURE'] = ShopGoodsNature::findAllAsArray('GOODS_ID=:GOODS_ID AND COUNTRY_ID=:COUNTRY_ID', [':GOODS_ID' => $id, ':COUNTRY_ID' => $country['ID']]);
         }
 
         $data['SHOP_GOODS_NATURE'] = $countries;