feat: NG-71: 移除皇冠星级相关配置及代码

backendApi/modules/v1/controllers/BonusController.php

@@ -891,30 +891,18 @@ class BonusController extends BaseController {
             'LAST_REAL_NAME' => 'CB.LAST_REAL_NAME',
             'LAST_DEC_LV_NAME' => 'CB.LAST_DEC_LV',
             'LAST_EMP_LV_NAME' => 'CB.LAST_EMP_LV',
-            'LAST_CROWN_LV_NAME' => 'CB.LAST_CROWN_LV',
             'LAST_MOBILE' => 'CB.LAST_MOBILE',
             'LAST_PERIOD_AT' => 'CB.LAST_PERIOD_AT',
             'LAST_CREATED_AT' => 'CB.LAST_CREATED_AT',
             'LAST_REC_USER_NAME' => 'CB.LAST_REC_USER_NAME',
             'LAST_REC_REAL_NAME' => 'CB.LAST_REC_REAL_NAME',
-//            'LAST_CON_USER_NAME' => 'CB.LAST_CON_USER_NAME',
-//            'LAST_CON_REAL_NAME' => 'CB.LAST_CON_REAL_NAME',
             'BONUS_BD' => 'CB.BONUS_BD',
             'BONUS_TG' => 'CB.BONUS_TG',
-//            'BONUS_XF' => 'CB.BONUS_XF',
-//            'BONUS_YJ' => 'CB.BONUS_YJ',
-//            'BONUS_GX' => 'CB.BONUS_GX',
-//            'BONUS_GL' => 'CB.BONUS_GL',
-            // 'BONUS_GL' => 'CB.BONUS_BS',
             'BONUS_QY' => 'CB.BONUS_QY',
-//            'BONUS_YC' => 'CB.BONUS_YC',
-//            'ORI_BONUS_STANDARD' => 'CB.ORI_BONUS_STANDARD',
             'PV_1L' => 'CB.PV_1L',
             'SURPLUS_1L' => 'CB.SURPLUS_1L',
             'PV_2L' => 'CB.PV_2L',
             'SURPLUS_2L' => 'CB.SURPLUS_2L',
-//            'PV_3L' => 'CB.PV_3L',
-//            'SURPLUS_3L' => 'CB.SURPLUS_3L',
             'CALCULATED_AT' => 'CB.CALCULATED_AT',
             'CALC_MONTH' => 'CB.CALC_MONTH',
             'BONUS_QY_MONTH' => 'CB.BONUS_QY_MONTH',
@@ -928,13 +916,8 @@ class BonusController extends BaseController {
             $params[':PERIOD_NUM'] = $periodNum;
         }
 
-//        try {
-            $listObj = new PeriodBonusList();
-            $data = $listObj->getList(['condition'=>$condition, 'params'=>$params, 'others'=>['yearMonth'=>$yearMonth]]);
-//        } catch (Exception $e) {
-//            LoggerTool::info([$e->getFile(), $e->getLine(), $e->getMessage()]);
-//            return $data;
-//        }
+        $listObj = new PeriodBonusList();
+        $data = $listObj->getList(['condition'=>$condition, 'params'=>$params, 'others'=>['yearMonth'=>$yearMonth]]);
 
         return $data;
     }

backendApi/modules/v1/controllers/UserController.php

@@ -127,7 +127,6 @@ class UserController extends BaseController
             'EMP_LV_NAME' => 'U.EMP_LV',
             'LAST_EMP_LV_NAME' => 'U.LAST_EMP_LV',
             'CROWN_LV_NAME' => 'U.CROWN_LV',
-            'LAST_CROWN_LV_NAME' => 'U.LAST_CROWN_LV',
             'REC_USER_NAME' => 'RU.USER_NAME',
             'CON_USER_NAME' => 'CU.USER_NAME',
             'SPOUSE_NAME' => 'U.SPOUSE_NAME',

backendApi/modules/v1/models/lists/atlas/NetworkList.php

@@ -82,12 +82,6 @@ class NetworkList extends \common\libs\dataList\DataList implements DataListInte
                         'width' => '210',
                     ],
                 ],
-                'CROWN_LV_NAME' => [
-                    'header' => Yii::t('ctx', 'highestCrown'), // 最高皇冠星级
-                    'headerOther' => [
-                        'width' => '210',
-                    ],
-                ],
                 'PERIOD_AT' => [
                     'header' => Yii::t('ctx', 'joiningPeriod'), // 加入期数
                     'headerOther' => ['width' => '110'],

backendApi/modules/v1/models/lists/bonus/PeriodBonusList.php

@@ -120,12 +120,6 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                         'width' => '140',
                     ],
                 ],
-                'LAST_CROWN_LV_NAME' => [
-                    'header' => \Yii::t('ctx', 'latestCrown'),//结算时会员最新皇冠星级
-                    'headerOther' => [
-                        'width' => '140',
-                    ],
-                ],
                 'LAST_MOBILE' => [
                     'header' => \Yii::t('ctx', 'phoneNumber'),//手机号码
                     'headerOther' => [
@@ -302,7 +296,6 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                 'LAST_REAL_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'memberName')], // 会员姓名
                 'LAST_DEC_LV_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'PCMemberLevel'), 'other'=> 'decLevel'], // 结算时会员级别
                 'LAST_EMP_LV_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'latestDirector'), 'other'=> 'empLevel'], // 结算时会员管理星级
-                'LAST_CROWN_LV_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'latestCrown'), 'other'=> 'crownLevel'], // 结算时会员皇冠星级
                 'LAST_MOBILE'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'phoneNumber')], // 手机号
                 'LAST_PERIOD_AT'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'joiningPeriod')], // 加入期数
                 'LAST_CREATED_AT'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'joiningDate'), 'other'=> 'date'], // 加入时间

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

@@ -351,7 +351,6 @@ 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'],
-                'LAST_CROWN_LV_NAME'=> ['name'=> Yii::t('ctx', 'latestCrown'), 'other'=> 'crownLevel'],
                 'MOBILE'=> ['name'=> Yii::t('ctx', 'phoneNumber')],
                 'DEC_USER_NAME'=> ['name'=> Yii::t('ctx', 'stockistCode')],
                 'IS_DEC'=> ['name'=> Yii::t('ctx', 'stockistOrNot'), 'other'=> 'yesOrNo'],

common/helpers/user/Balance.php

@@ -607,14 +607,6 @@ class Balance {
             }
             if (strtolower($type) == 'bonus') {
                 FlowBonus::insertOne($flowInsertData);
-//            } elseif (strtolower($type) == 'reconsume_points') {
-//                //记录和扣除期数的积分
-//                if( $amount > 0 ) {
-//                    self::addPeriodReconsumePoints($userId, $periodNum, $amount);
-//                }else {
-//                    self::deductPeriodReconsumePoints($userId, abs($amount));
-//                }
-//                FlowReconsumePoints::insertOne($flowInsertData);
             } elseif (strtolower($type) == 'exchange_points') {
                 //记录和扣除期数的积分
                 if( $amount > 0 ) {
@@ -623,19 +615,6 @@ class Balance {
                     self::deductPeriodExchangePoints($userId, abs($amount));
                 }
                 FlowExchangePoints::insertOne($flowInsertData);
-            } elseif (strtolower($type) == 'cf') {
-                FlowCF::insertOne($flowInsertData);
-            } elseif (strtolower($type) == 'lx') {
-                FlowLX::insertOne($flowInsertData);
-            } elseif (strtolower($type) == 'tourism_points') {
-                $flowInsertData['LAST_CROWN_LV'] = $userInfo['LAST_CROWN_LV'];
-                FlowTourismPoints::insertOne($flowInsertData);
-            } elseif (strtolower($type) == 'garage_points') {
-                $flowInsertData['LAST_CROWN_LV'] = $userInfo['LAST_CROWN_LV'];
-                FlowGaragePoints::insertOne($flowInsertData);
-            } elseif (strtolower($type) == 'villa_points') {
-                $flowInsertData['LAST_CROWN_LV'] = $userInfo['LAST_CROWN_LV'];
-                FlowVillaPoints::insertOne($flowInsertData);
             }
 
             unset($flowInsertData, $userInfo, $oneUserBonus);

common/helpers/user/Info.php

@@ -660,7 +660,7 @@ class Info {
      * @return array|null
      */
     public static function getLastInfo($userId){
-        $data = User::findOneAsArray('ID=:ID', [':ID' => $userId], 'LAST_DEC_LV AS DEC_LV,EMP_LV,LAST_EMP_LV,STATUS,CROWN_LV,LAST_CROWN_LV');
+        $data = User::findOneAsArray('ID=:ID', [':ID' => $userId], 'LAST_DEC_LV AS DEC_LV,EMP_LV,LAST_EMP_LV,STATUS');
         return $data;
     }
 

common/models/CalcBonus.php

@@ -13,7 +13,6 @@ use Yii;
  * @property string $LAST_REAL_NAME 结算时会员姓名
  * @property string $LAST_DEC_LV 结算时会员级别
  * @property string $LAST_EMP_LV 结算时会员聘级
- * @property string $LAST_CROWN_LV 结算时会员星级
  * @property int $LAST_STATUS 结算时状态
  * @property string $LAST_MOBILE 结算时手机号码
  * @property int $LAST_PERIOD_AT 结算时加入期数

common/models/FlowGaragePoints.php

@@ -48,7 +48,7 @@ class FlowGaragePoints extends \common\components\ActiveRecord
             [['USER_ID', 'REMARK', 'PERIOD_NUM', 'CALC_MONTH', 'P_MONTH', 'CREATED_AT'], 'required'],
             [['AMOUNT', 'TOTAL'], 'number'],
             [['IS_INCR', 'PERIOD_NUM', 'CALC_MONTH', 'CREATED_AT', 'DELETED', 'DELETED_AT', 'SORT'], 'integer'],
-            [['ID', 'USER_ID', 'CALC_ID', 'ADMIN_NAME', 'TRANSFER_SN', 'LAST_CROWN_LV'], 'string', 'max' => 32],
+            [['ID', 'USER_ID', 'CALC_ID', 'ADMIN_NAME', 'TRANSFER_SN'], 'string', 'max' => 32],
             [['REMARK'], 'string', 'max' => 255],
             [['ID'], 'unique'],
         ];

common/models/FlowVillaPoints.php

@@ -48,7 +48,7 @@ class FlowVillaPoints extends \common\components\ActiveRecord
             [['USER_ID', 'REMARK', 'PERIOD_NUM', 'CALC_MONTH', 'P_MONTH', 'CREATED_AT'], 'required'],
             [['AMOUNT', 'TOTAL'], 'number'],
             [['IS_INCR', 'PERIOD_NUM', 'CALC_MONTH', 'CREATED_AT', 'DELETED', 'DELETED_AT', 'SORT'], 'integer'],
-            [['ID', 'USER_ID', 'CALC_ID', 'ADMIN_NAME', 'TRANSFER_SN', 'LAST_CROWN_LV'], 'string', 'max' => 32],
+            [['ID', 'USER_ID', 'CALC_ID', 'ADMIN_NAME', 'TRANSFER_SN'], 'string', 'max' => 32],
             [['REMARK'], 'string', 'max' => 255],
             [['ID'], 'unique'],
         ];

common/models/User.php

@@ -38,7 +38,6 @@ use common\libs\logging\operate\valueType\Config as ValueTypeConfig;
  * @property int $DEC_CLOSED_AT 关闭时间
  * @property string $DEC_LV 报单级别
  * @property string $EMP_LV 聘级
- * @property string $CROWN_LV 星级
  * @property int $PROVINCE 省份
  * @property int $CITY 城市
  * @property int $COUNTY 县区

frontendApi/modules/v1/controllers/DashboardController.php

@@ -57,9 +57,6 @@ class DashboardController extends BaseController
             $empLvName = Cache::getEmpLevelConfig()[$baseInfo['SHOW_EMP_LV']]['LEVEL_NAME'];
         }
 
-        $crownLv = $baseInfo['CROWN_LV'];
-        $crownLvName = $baseInfo['CROWN_LV_NAME'];
-
         //会员级别
         $decLv = $baseInfo['DEC_LV'];
         $decLvName = $baseInfo['DEC_LV_NAME'];
@@ -71,7 +68,6 @@ class DashboardController extends BaseController
 
         $plist=Period::find()->select("PERIOD_NUM")->where('CALC_YEAR=:CALC_YEAR AND CALC_MONTH=:CALC_MONTH', [':CALC_YEAR'=>$curYM['CALC_YEAR'],':CALC_MONTH'=>$curYM['CALC_MONTH']])->orderBy('PERIOD_NUM ASC')->asArray()->all();
 
-        $weeks = count($plist);
         $wkrd = '';
         foreach ($plist as $k=>$v){
             if($v['PERIOD_NUM']==$periodNum){
@@ -123,14 +119,10 @@ class DashboardController extends BaseController
             'nowTime' => $nowTime,
             'empLv'=>$empLv,
             'empLvName'=>$empLvName,
-            'crownLv'=>$crownLv,
-            'crownLvName'=>$crownLvName,
             'decLv'=>$decLv,
             'decLvName'=>$decLvName,
             'slides'=>Ad::findUseSlaves()->select('ID,IMAGE,LID,TITLE,CONTENT,TYPE')->where('LID=:LID AND STATUS=1', [':LID'=>'7EFF6260A16C3CC7E053693418AC03E4'])->orderBy('SORT ASC')->asArray()->all(),
             'news'=>$news,
-//            'periodNum'=>'Period '.$periodNum.' ，'.$curYM['CALC_MONTH'].'月第'.$wkrd.'周，共'.$weeks.'周',
-//            'periodNum'=>$periodNum.', '.$wkrd.' PC of '. $monthArray[$curYM['CALC_MONTH']],
             'periodNum'=>$periodNum . ', ' . $wkrd . ' '. Yii::t('app', 'pcOf') . ' '. $monthArray[$curYM['CALC_MONTH']],
             'myRemainPv'=>$totalRemainPv,
             'activeEnd'=>$activeEnd