feat: NG-71: 会员奖金发放、级别发放、绩效奖金发放

backendApi/modules/v1/controllers/ConfigController.php

@@ -466,6 +466,7 @@ class ConfigController extends BaseController {
         ->where("CONFIG_NAME='observePeriodLimit'")
         ->asArray()
         ->one();
+
         $isSwitchUpgrade = Config::find()
         ->where("CONFIG_NAME='isOpenUpgrade'")
         ->asArray()
@@ -532,7 +533,6 @@ class ConfigController extends BaseController {
         if (Yii::$app->request->isPost) {
             return static::edit(DecLevelForm::class, Yii::t('ctx', 'successfully'), null, null, null, function () {
                 DeclarationLevel::updateToCache();
-                // Log::adminHandle('添加会员级别', 1);
             });
         }
         return static::notice(Yii::t('ctx', 'illegalRequest'), 405);
@@ -548,7 +548,6 @@ class ConfigController extends BaseController {
         if (Yii::$app->request->isPost) {
             return static::edit(DecLevelForm::class, Yii::t('ctx', 'successfully'), null, null, null, function () {
                 DeclarationLevel::updateToCache();
-                // Log::adminHandle('编辑报单级别参数', 1);
             });
         }
         $oneData = DeclarationLevel::find()->where('ID=:ID', [':ID' => $id])->asArray()->one();
@@ -564,7 +563,6 @@ class ConfigController extends BaseController {
     public function actionDecLevelDelete() {
         return static::delete(DeclarationLevel::class, '', function ($selected) {
             DeclarationLevel::updateToCache();
-            // Log::adminHandle('删除报单级别', 1);
         });
     }
 
@@ -594,7 +592,6 @@ class ConfigController extends BaseController {
         if (Yii::$app->request->isPost) {
             return static::edit(EmployLevelForm::class, Yii::t('ctx', 'successfully'), null, null, null, function () {
                 EmployLevel::updateToCache();
-                // Log::adminHandle('添加会员聘级', 1);
             });
         }
         // 获取所有聘级，以供选择

backendApi/modules/v1/controllers/SiteController.php

@@ -24,9 +24,7 @@ class SiteController extends BaseController
 {
     public $modelClass = User::class;
     public function behaviors() {
-        $behaviors = parent::behaviors();
-        //$behaviors['contentNegotiator']['formats']['text/html'] = Response::FORMAT_JSON;
-        return $behaviors;
+        return parent::behaviors();
     }
 
 
@@ -69,8 +67,10 @@ class SiteController extends BaseController
     public function actionBaseInfo(){
         // 会员级别
         $decLevels = Cache::getDecLevelConfig();
-        // 管理星级
+        // 荣衔级别
         $empLevels = Cache::getEmpLevelConfig();
+        // Elite级别
+        $eliteLevels = Cache::getEliteLevelConfig();
         // 注册类型
         $regTypes = Cache::getRegType();
         // 交易类型
@@ -106,6 +106,7 @@ class SiteController extends BaseController
         return [
             'decLevels' => $decLevels,
             'empLevels' => $empLevels,
+            'eliteLevels' => $eliteLevels,
             'regTypes' => $regTypes,
             'dealTypes' => $dealTypes,
             'systems' => $systems,

backendApi/modules/v1/controllers/UserController.php

@@ -126,7 +126,8 @@ class UserController extends BaseController
             'LAST_DEC_LV_NAME' => 'U.LAST_DEC_LV',
             'EMP_LV_NAME' => 'U.EMP_LV',
             'LAST_EMP_LV_NAME' => 'U.LAST_EMP_LV',
-            'CROWN_LV_NAME' => 'U.CROWN_LV',
+            'ELITE_LV_NAME' => 'U.ELITE_LV',
+            'LAST_ELITE_LV_NAME' => 'U.LAST_ELITE_LV',
             'REC_USER_NAME' => 'RU.USER_NAME',
             'CON_USER_NAME' => 'CU.USER_NAME',
             'SPOUSE_NAME' => 'U.SPOUSE_NAME',

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

@@ -6,6 +6,7 @@ use common\helpers\http\BackendToFrontendApi;
 use common\libs\dataList\DataListInterface;
 use common\models\Countries;
 use common\models\DecRole;
+use common\models\EliteLevel;
 use common\models\EmployLevel;
 use common\models\Language;
 use common\models\OpenBank;
@@ -87,6 +88,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
     public function getColumn(){
         $decLevelConfig = Cache::getDecLevelConfig();
         $empLevelConfig = Cache::getEmpLevelConfig();
+        $eliteLevelConfig = Cache::getEliteLevelConfig();
         $decRoleConfig = DecRole::getAllData();
         $openBankConfig = OpenBank::getAllOpenBank();
         $regionConfig = Cache::getRegionConfig();
@@ -197,6 +199,30 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                         'tag'=>['type'=>'warning', 'size' => 'small', 'class'=>'no-border']
                     ],
                 ],
+                'ELITE_LV_NAME' => [
+                    'header' => Yii::t('ctx', 'highestElite'),
+                    'headerOther' => [
+                        'width' => '190',
+                    ],
+                    'value' => function($row) use($eliteLevelConfig) {
+                        return $eliteLevelConfig[$row['EMP_LV']]['LEVEL_NAME'] ?? $eliteLevelConfig[EliteLevel::getDefaultLevelId()]['LEVEL_NAME'];
+                    },
+                    'valueOther' => [
+                        'tag'=>['type'=>'warning', 'size' => 'small', 'class'=>'no-border']
+                    ],
+                ],
+                'LAST_ELite_LV_NAME' => [
+                    'header' => Yii::t('ctx', 'latestElite'),
+                    'headerOther' => [
+                        'width' => '190',
+                    ],
+                    'value' => function($row) use($eliteLevelConfig) {
+                        return $eliteLevelConfig[$row['LAST_EMP_LV']]['LEVEL_NAME'] ?? $eliteLevelConfig[EliteLevel::getDefaultLevelId()]['LEVEL_NAME'];
+                    },
+                    'valueOther' => [
+                        'tag'=>['type'=>'warning', 'size' => 'small', 'class'=>'no-border']
+                    ],
+                ],
                 'REC_USER_NAME_ACTUAL' => [
                     'header' => Yii::t('ctx', 'recommendationNo'),
                     'headerOther' => ['width' => '140'],
@@ -351,6 +377,10 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                 'DEC_LV_NAME'=> ['name'=> Yii::t('ctx', 'currentMemberLevel'), 'other'=> 'decLevel'],
                 'EMP_LV_NAME'=> ['name'=> Yii::t('ctx', 'highestDirector'), 'other'=> 'empLevel'],
                 'LAST_EMP_LV_NAME'=> ['name'=> Yii::t('ctx', 'latestDirector'), 'other'=> 'empLevel'],
+
+                'ELITE_LV_NAME'=> ['name'=> Yii::t('ctx', 'highestElite'), 'other'=> 'eliteLevel'],
+                'LAST_ELITE_LV_NAME'=> ['name'=> Yii::t('ctx', 'latestElite'), 'other'=> 'eliteLevel'],
+
                 'MOBILE'=> ['name'=> Yii::t('ctx', 'phoneNumber')],
                 'DEC_USER_NAME'=> ['name'=> Yii::t('ctx', 'stockistCode')],
                 'IS_DEC'=> ['name'=> Yii::t('ctx', 'stockistOrNot'), 'other'=> 'yesOrNo'],

common/messages/zh-CN/ctx.php

@@ -177,6 +177,7 @@ return [
     'recommendedMemberLevel' => '推荐会员级别',
     'highestDirector' => '最高管理星级',
     'highestCrown' => '最高皇冠星级',
+    'highestElite' => '最高Elite级别',
     "joiningPeriod" => '加入期数',
     'modelListAtlasUserName' => '会员编号',
     'modelListAtlasDepth' => '深度',
@@ -565,6 +566,7 @@ return [
     'currentAdjustmentDate' => '实时调整日期',
     'PCMemberLevel' => '结算时会员级别',
     'latestDirector' => '最新管理星级',
+    'latestElite' => '最新Elite级别',
     'latestCrown' => '最新皇冠星级',
     'recommendationNo' => '推荐人编号',
     'recommendedName' => '推荐人姓名',