feat: NG-15: 新会员注册时增加国家与语言选项.

common/messages/en-US/app.php

@@ -191,6 +191,7 @@ return [
     'memberDoesNotInSamePlacementNetwork' => 'The member is not in the same placement network as the current user',
     'viewSubMembersMost' => 'View the top 20 sub members of the member at most',
     'upgradeMethodIncorrect' => 'The upgrade method is incorrect. Please contact the customer service personnel',
+    'upgradeNotSupport' => 'The current level does not support upgrading',
 
     'originalLoginPasswordError' => 'Original login password error',
     'originalPaymentPasswordError' => 'Original payment password error',

common/messages/zh-CN/app.php

@@ -193,6 +193,7 @@ return [
     'memberDoesNotInSamePlacementNetwork' => '会员与当前用户不再同一安置网络内',
     'viewSubMembersMost' => '最多查看会员的前20层子会员',
     'upgradeMethodIncorrect' => '升级方式不正确，请联系客服人员',
+    'upgradeNotSupport' => '当前会员级别不支持升级',
 
     'originalLoginPasswordError' => '原登录密码错误',
     'originalPaymentPasswordError' => '原支付密码错误',

common/models/DeclarationLevel.php

@@ -94,7 +94,7 @@ class DeclarationLevel extends \common\components\ActiveRecord
      */
     public static function getFromCache(){
         $data = Yii::$app->cache->get(Cache::DEC_LEVEL_CONFIG_KEY);
-//        Yii::$app->cache->delete(Cache::DEC_LEVEL_CONFIG_KEY);
+        Yii::$app->cache->delete(Cache::DEC_LEVEL_CONFIG_KEY);
         if(!$data){
             // 获取信息
             $data = static::find()->where('1=1')->orderBy('PERF ASC, CREATED_AT ASC')->indexBy('ID')->asArray()->all();
@@ -160,6 +160,10 @@ class DeclarationLevel extends \common\components\ActiveRecord
         return static::find()->where('1=1')->indexBy('ID')->orderBy('SORT ASC')->asArray()->all();
     }
 
+    public static function getData(){
+        return static::find()->where('STATUS=1')->indexBy('ID')->orderBy('SORT ASC')->asArray()->all();
+    }
+
     public static function getNextDecLv($decLvID)
     {
         $result = [];

frontendApi/modules/v1/controllers/UserController.php

@@ -248,7 +248,7 @@ class UserController extends BaseController {
         $userId = $baseInfo['ID'];
         $userDecId = $baseInfo['DEC_LV'];// 用户当前的级别
         // 获取系统中的DEC 报单级别配置
-        $decConfig = Cache::getDecLevelConfig();
+        $decConfig = DeclarationLevel::getData();
         $userDecInfo = $decConfig[$userDecId]; // 会员的级别具体信息
         $maxPerfInfo = DeclarationLevel::getMaxDecPref();
         $maxDecId = $maxPerfInfo['ID']; // 级别配置中最高级别ID
@@ -261,6 +261,11 @@ class UserController extends BaseController {
             $isMax = true;
         }
 
+        // BA级别暂时不提供升级
+        if ($userDecInfo['ID'] == '67ABC6AO8YTK2LN0E055736AECE8644D') {
+            return static::notice(Yii::t('app', 'upgradeNotSupport'), 400);
+        }
+
         // 分期的总期数
         $instalmentConfig = intval(Cache::getSystemConfig()['instalment']['VALUE'] ?? 3);
         // 查询是否有FX的分期订单
@@ -505,7 +510,6 @@ class UserController extends BaseController {
                 }
             }
 
-            // 实际推荐人必须是推荐人上级的校验
             // 实际推荐人必须是推荐人的推荐网上级
             $sqlUp =<<<SQL
             WITH recursive t_rec AS