Procházet zdrojové kódy

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

kevinElken před 10 měsíci
rodič
revize
84f541199d

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

@@ -186,6 +186,7 @@ class ShopController extends BaseController {
 
         foreach ($countries as &$country) {
             if (!in_array($country['ID'], $adminCountry)) {
+                $data['SHOP_GOODS_NATURE'][] = [];
                 continue;
             }
 
@@ -194,9 +195,11 @@ class ShopController extends BaseController {
             $country['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']]);
+
+            $data['SHOP_GOODS_NATURE'][] = $country;
         }
 
-        $data['SHOP_GOODS_NATURE'] = $countries;
+//        $data['SHOP_GOODS_NATURE'] = $countries;
 
         return static::notice(
             [