Przeglądaj źródła

feat: EK-879: 【AE】管理员增加“Country”属性,根据所选国家限制登录后所显示的奖金、余额等数据(二期).

kevinElken 9 miesięcy temu
rodzic
commit
510ee34f80

+ 2 - 2
backendApi/modules/v1/controllers/BonusController.php

@@ -2107,7 +2107,7 @@ class BonusController extends BaseController {
                 return "'" . addslashes($item) . "'";
             }, $adminCountry);
 
-            $condition .= " AND CU.COUNTRY_ID IN (" . implode(',', $quotedAdminCountry) . ")";
+            $condition .= " AND UI.COUNTRY_ID IN (" . implode(',', $quotedAdminCountry) . ")";
         }
 
         $listObj = new BalanceList();
@@ -2139,7 +2139,7 @@ class BonusController extends BaseController {
                 return "'" . addslashes($item) . "'";
             }, $adminCountry);
 
-            $condition .= " AND CU.COUNTRY_ID IN (" . implode(',', $quotedAdminCountry) . ")";
+            $condition .= " AND UI.COUNTRY_ID IN (" . implode(',', $quotedAdminCountry) . ")";
         }
 
         $form = new BonusExportForm();

+ 1 - 1
backendApi/modules/v1/models/lists/bonus/BalanceList.php

@@ -42,7 +42,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
                 ['LEFT JOIN', UserWallet::tableName() . ' AS UW', 'UW.USER_ID=UB.USER_ID'],
                 ['LEFT JOIN', UserInfo::tableName() . ' AS I', 'I.USER_ID=UB.USER_ID'],
                 ['LEFT JOIN', "(SELECT USER_ID,SUM(AMOUNTS) AS AMOUNTS FROM AR_USER_PERFORMANCE WHERE STATUS_ID<30 GROUP BY USER_ID) UP", 'UW.USER_ID=UP.USER_ID'],
-                ['INNER JOIN', Countries::tableName() . ' AS C', 'CU.COUNTRY_ID=C.ID'],
+                ['INNER JOIN', Countries::tableName() . ' AS C', 'UI.COUNTRY_ID=C.ID'],
             ],
             'orderBy' => 'UB.CREATED_AT ASC, UB.ID ASC',
             'page' => $this->page,

+ 1 - 1
backendApi/modules/v1/models/lists/bonus/PerfOrderList.php

@@ -80,7 +80,7 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                 'DEC_TYPE' => [
                     'header' =>  Yii::t('ctx', 'saleType'), // 业绩单类型
                     'headerOther' => [
-                        'width' => '150',
+                        'width' => '160',
                     ],
                     'value' => function($row){
                         $decTypes = [