feat: EK-2806: 会员端Promo和banner图增加分国家设置.

backendApi/modules/v1/controllers/AdController.php

@@ -9,9 +9,9 @@ namespace backendApi\modules\v1\controllers;
 
 use backendApi\modules\v1\models\Admin;
 use backendApi\modules\v1\models\AdminCountry;
+use backendApi\modules\v1\models\lists\ad\IndexList;
 use common\helpers\Cache;
 use common\helpers\Form;
-use common\helpers\Log;
 use common\models\Ad;
 use common\models\AdLocation;
 use common\models\Article;
@@ -95,14 +95,8 @@ class AdController extends BaseController
             $condition .= ' AND AD.COUNTRY_ID IN (' . implode(',', $placeholders) . ')';
         }
 
-        $data = Ad::lists($condition, $params, [
-            'select' => 'AD.*,ADC.NAME AS COUNTRY_NAME, ADC.CODE AS COUNTRY_CODE',
-            'from' => Ad::tableName().' AS AD',
-            'join' => [
-                ['INNER JOIN', Countries::tableName() . ' AS ADC', 'ADC.ID=AD.COUNTRY_ID'],
-            ],
-            'orderBy' => 'AD.STATUS DESC,AD.SORT DESC,AD.CREATED_AT ASC',
-        ]);
+        $obj = new IndexList();
+        $data = $obj->getList(['condition' => $condition, 'params' => $params]);
 
         $data['allLocation'] = AdLocation::getAllLocation();
         $data['countries'] = $countries;

backendApi/modules/v1/models/lists/ad/IndexList.php

@@ -1,5 +1,5 @@
 <?php
-namespace backendApi\modules\v1\models\lists\article;
+namespace backendApi\modules\v1\models\lists\ad;
 
 use backendApi\modules\v1\models\Admin;
 use backendApi\modules\v1\models\AdminCountry;
@@ -24,12 +24,12 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
     {
         $this->condition .= '';
         $this->listData = Ad::lists($this->condition, $this->params, [
-            'select' => 'ART.ID,ART.TITLE,ART.CID,ART.COUNTRY_ID,ART.STATUS,ART.SORT,ART.CREATED_AT,,ADC.NAME AS COUNTRY_NAME, ADC.CODE AS COUNTRY_CODE',
-            'from' => Ad::tableName().' AS ART',
+            'select' => 'AD.*,ADC.NAME AS COUNTRY_NAME, ADC.CODE AS COUNTRY_CODE',
+            'from' => Ad::tableName().' AS AD',
             'join' => [
-                ['INNER JOIN', Countries::tableName() . ' AS ADC', 'ADC.ID=ART.COUNTRY_ID'],
+                ['INNER JOIN', Countries::tableName() . ' AS ADC', 'ADC.ID=AD.COUNTRY_ID'],
             ],
-            'orderBy' => 'ART.SORT ASC,ART.CREATED_AT DESC',
+            'orderBy' => 'AD.STATUS DESC,AD.SORT DESC,AD.CREATED_AT ASC',
         ]);
     }