root 2 лет назад
Родитель
Сommit
a6228ce17a

+ 8 - 7
backendApi/modules/v1/controllers/AtlasController.php

@@ -51,7 +51,7 @@ class AtlasController extends BaseController {
         $deep = Yii::$app->request->get('deep', 2);
         $periodNum = Yii::$app->request->get('periodNum', null);
         if ($deep > 23) {
-            return static::notice('Top 23 sub members of members can be viewed at most', 400);//最多查看会员的前23层子会员
+            return static::notice(Yii::t('ctx', 'atlasViewLimitNotice'), 400);//最多查看会员的前23层子会员
         }
         $allData = UserRelation::getChildrenWithDeepAndLayer($userId, $deep, 1, $periodNum);
         return static::notice(['allData' => $allData, 'periodNum' => $periodNum]);
@@ -72,7 +72,8 @@ class AtlasController extends BaseController {
         if ($userName !== '') {
             //$oneUser = Info::getUserByUserNameFromUserInfoTable($userName);
             if (!$userId = Info::getUserIdByUserName($userName)) {
-                return static::notice('Member does not exist', 400); // 会员不存在
+                
+                return static::notice(Yii::t('ctx', 'memberDoesNotExist'), 400); // 会员不存在
             }
         } else {
             $userId = Yii::$app->params['mainUserId'];
@@ -118,7 +119,7 @@ class AtlasController extends BaseController {
             $userId = Yii::$app->params['mainUserId'];
         } else {
             if (!$userId = Info::getUserIdByUserName($userName)) {
-                return static::notice('Member does not exist', 400);//会员不存在
+                return static::notice(Yii::t('ctx', 'memberDoesNotExist'), 400);//会员不存在
             }
         }
         $listObj = new RelationList();
@@ -141,7 +142,7 @@ class AtlasController extends BaseController {
             $userId = Yii::$app->params['mainUserId'];
         } else {
             if (!$userId = Info::getUserIdByUserName($userName)) {
-                return static::notice('Member does not exist', 400); // 会员不存在
+                return static::notice(Yii::t('ctx', 'memberDoesNotExist'), 400); // 会员不存在
             }
         }
         $form = new AtlasExportForm();
@@ -162,7 +163,7 @@ class AtlasController extends BaseController {
         $periodNum = Yii::$app->request->get('periodNum', null);
         $deep = Yii::$app->request->get('deep', 2);
         if ($deep > 20) {
-            return static::notice('View the top 20 sub members of the member at most', 400);//最多查看会员的前20层子会员
+            return static::notice(Yii::t('ctx', 'atlasNetworkViewLimitNotice'), 400);//最多查看会员的前20层子会员
         }
         $allData = UserNetwork::getChildrenWithDeepAndLayer($userId, $deep, 1, $periodNum);
         return static::notice(['allData' => $allData, 'periodNum' => $periodNum]);
@@ -183,7 +184,7 @@ class AtlasController extends BaseController {
             $userId = Yii::$app->params['mainUserId'];
         } else {
             if (!$userId = Info::getUserIdByUserName($userName)) {
-                return static::notice('Member does not exist', 400);//会员不存在
+                return static::notice(Yii::t('ctx', 'memberDoesNotExist'), 400);//会员不存在
             }
         }
         $listObj = new NetworkList();
@@ -206,7 +207,7 @@ class AtlasController extends BaseController {
             $userId = Yii::$app->params['mainUserId'];
         } else {
             if (!$userId = Info::getUserIdByUserName($userName)) {
-                return static::notice('Member does not exist', 400); // 会员不存在
+                return static::notice(Yii::t('ctx', 'memberDoesNotExist'), 400); // 会员不存在
             }
         }
         $form = new AtlasExportForm();

+ 11 - 11
backendApi/modules/v1/models/lists/atlas/NetworkList.php

@@ -76,36 +76,36 @@ class NetworkList extends \common\libs\dataList\DataList implements DataListInte
                 'USER_ID' => null, // 这种传输方式主要是用于索引,因为过滤后的字段可能没有这种ID,但是一些功能的操作还需要用这种ID去关联,例如前台会员列表中的勾选批量状态管理,这里需要的就是USER_ID
                 'SEE_USER_NAME' => null,
                 'COUNT_DEEP' => [
-                    'header' => 'Number Of Layers', // 层数
+                    'header' => Yii::t('ctx', 'numberOfLayers'), // 层数
                     'headerOther' => ['width' => '140'],
                 ],
                 'USER_NAME' => [
-                    'header' => 'Placement Member Number', // 安置会员编号
-//                    'headerOther' => ['width' => '150'],
+                    'header' => Yii::t('ctx', 'placementMemberNumber'), // 安置会员编号
+                   'headerOther' => ['width' => '150'],
                 ],
                 'REAL_NAME' => [
-                    'header' => 'Placement Member Name', // 安置会员姓名
+                    'header' => Yii::t('ctx', 'placementMemberName'), // 安置会员姓名
                 ],
                 'DEC_LV_NAME' => [
-                    'header' => 'Recommended Member Level', // 推荐会员级别
+                    'header' => Yii::t('ctx', 'recommendedMemberLevel'), // 推荐会员级别
                     'headerOther' => [
                         'width' => '210',
                     ],
                 ],
                 'EMP_LV_NAME' => [
-                    'header' => 'Highest Director', // 最高管理星级
+                    'header' => Yii::t('ctx', 'highestDirector'), // 最高管理星级
                     'headerOther' => [
                         'width' => '210',
                     ],
                 ],
                 'CROWN_LV_NAME' => [
-                    'header' => 'Highest Crown', // 最高皇冠星级
+                    'header' => Yii::t('ctx', 'highestCrown'), // 最高皇冠星级
                     'headerOther' => [
                         'width' => '210',
                     ],
                 ],
                 'PERIOD_AT' => [
-                    'header' => 'Joining Period', // 加入期数
+                    'header' => Yii::t('ctx', 'joiningPeriod'), // 加入期数
                     'headerOther' => ['width' => '110'],
                 ],
             ];
@@ -120,9 +120,9 @@ class NetworkList extends \common\libs\dataList\DataList implements DataListInte
     public function getFilterTypes() {
         if (!$this->filterTypes) {
             $this->filterTypes = [
-                'userName' => ['isUserTable' => false, 'name' => 'Member Code'], // 会员编号
-                'deep' => ['isUserTable' => false, 'name' => 'Depth'], // 深度
-                'periodNum' => ['isUserTable' => false, 'name' => 'Number Of Periods'], // 期数
+                'userName' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListAtlasUserName')], // 会员编号
+                'deep' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListAtlasDepth')], // 深度
+                'periodNum' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'numberOfPeriods')], // 期数
             ];
         }
         return $this->filterTypes;

+ 11 - 11
backendApi/modules/v1/models/lists/atlas/RelationList.php

@@ -73,39 +73,39 @@ class RelationList extends \common\libs\dataList\DataList implements DataListInt
                 'USER_ID' => null, // 这种传输方式主要是用于索引,因为过滤后的字段可能没有这种ID,但是一些功能的操作还需要用这种ID去关联,例如前台会员列表中的勾选批量状态管理,这里需要的就是USER_ID
                 'SEE_USER_NAME' => null,
                 'COUNT_DEEP' => [
-                    'header' => 'Number Of Layers', // 层数
+                    'header' => Yii::t('ctx', 'numberOfLayers'), // 层数
                     'headerOther' => ['width' => '140'],
                 ],
                 'USER_NAME' => [
-                        'header' => 'Recommended Member No', // 推荐会员编号
-//                    'headerOther' => ['width' => '150'],
+                    'header' => Yii::t('ctx', 'recommendedMemberNo'), // 推荐会员编号
+                    'headerOther' => ['width' => '150'],
                 ],
                 'REAL_NAME' => [
-                    'header' => 'Name Of Recommended Member', // 推荐会员姓名
+                    'header' => Yii::t('ctx', 'nameRecommendedMember'), // 推荐会员姓名
 //                    'headerOther' => [
 //                        'width' => '120',
 //                    ],
                 ],
                 'DEC_LV_NAME' => [
-                    'header' => 'Recommended Member Level', // 推荐会员级别
+                    'header' => Yii::t('ctx', 'recommendedMemberLevel'), // 推荐会员级别
                     'headerOther' => [
                         'width' => '210',
                     ],
                 ],
                 'EMP_LV_NAME' => [
-                    'header' => 'Highest Director', // 推荐会员聘级
+                    'header' => Yii::t('ctx', 'highestDirector'), // 推荐会员聘级
                     'headerOther' => [
                         'width' => '210',
                     ],
                 ],
                 'CROWN_LV_NAME' => [
-                    'header' => 'Highest Crown ', // 推荐会员聘级
+                    'header' => Yii::t('ctx', 'highestCrown'), // 推荐会员聘级
                     'headerOther' => [
                         'width' => '210',
                     ],
                 ],
                 'PERIOD_AT' => [
-                    'header' => 'Joining Period', // 加入期数
+                    'header' => Yii::t('ctx', 'joiningPeriod'), // 加入期数
                     'headerOther' => ['width' => '110'],
                 ],
             ];
@@ -120,9 +120,9 @@ class RelationList extends \common\libs\dataList\DataList implements DataListInt
     public function getFilterTypes() {
         if (!$this->filterTypes) {
             $this->filterTypes = [
-                'userName' => ['isUserTable' => false, 'name' => 'Member Code'], // 会员编号
-                'deep' => ['isUserTable' => false, 'name' => 'Depth'], // 深度
-                'periodNum' => ['isUserTable' => false, 'name' => 'Number Of Periods'], // 期数
+                'userName' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListAtlasUserName')], // 会员编号
+                'deep' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListAtlasDepth')], // 深度
+                'periodNum' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'numberOfPeriods')], // 期数
             ];
         }
         return $this->filterTypes;

+ 17 - 0
common/messages/en-US/ctx.php

@@ -151,6 +151,23 @@ return [
     'withdrawFormBankNoInconsistent' => "Real-time bank account of the withdrawal serial number in Excel { excelBankNo } { sn }  is inconsistent with information in system { systemBankNo }",
     'withdrawFormNoExistsUser'=>'不存在该用户',
     'withdrawChkAuditStatus' => "The current status of the withdrawal  { sn }  is 【 {statusName} 】, cannot be set to【 { newStatusName }】",
+
+    # 网络功能
+    'numberOfLayers' => 'Number Of Layers',
+    'recommendedMemberNo'=>'Recommended Member No',
+    'nameRecommendedMember'=>'Name Of Recommended Member',
+    'recommendedMemberLevel' => 'Recommended Member Level',
+    'highestDirector' => 'Highest Director',
+    'highestCrown' => 'Highest Crown',
+    "joiningPeriod" => 'Joining Period',
+    'modelListAtlasUserName' => 'Member Code',
+    'modelListAtlasDepth' => 'Depth',
+    'numberOfPeriods' => 'Number Of Periods',
+    'atlasViewLimitNotice'=>'Top 23 sub members of members can be viewed at most',
+    'atlasNetworkViewLimitNotice'=>'View the top 20 sub members of the member at most',
+    'placementMemberNumber'=>'Placement Member Number',
+    'placementMemberName' => 'Placement Member Name',
+
     
     # 公用
     'amountUnit' => '₦',

+ 17 - 0
common/messages/zh-CN/ctx.php

@@ -152,6 +152,23 @@ return [
     'withdrawFormNoExistsUser'=>'不存在该用户',
     'withdrawChkAuditStatus' => "提现单{ sn }当前状态为【{statusName}】,无法设置为【{ newStatusName }】",
 
+    # 网络功能
+    'numberOfLayers' => '层数',
+    'recommendedMemberNo'=>'推荐会员编号',
+    'nameRecommendedMember'=>'推荐会员姓名',
+    'recommendedMemberLevel' => '推荐会员级别',
+    'highestDirector' => '最高管理星级',
+    'highestCrown' => '最高皇冠星级',
+    "joiningPeriod" => '加入期数',
+    'modelListAtlasUserName' => '会员编号',
+    'modelListAtlasDepth' => '深度',
+    'numberOfPeriods' => '期数',
+    'atlasViewLimitNotice'=>'最多查看会员的前23层子会员',
+    'atlasNetworkViewLimitNotice'=>'最多查看会员的前20层子会员',
+    'placementMemberNumber'=>'安置会员编号',
+    'placementMemberName' => '安置会员姓名',
+ 
+
     # 公用
     'amountUnit' => '元',
     'sceneDoesNotExist' => '场景不存在',