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

backendApi/config/menu.php

@@ -265,7 +265,6 @@ return [
             ['name'=>'站点设置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'base', 'routePath'=>'config/base', 'show'=>1, 'wiki' => 'siteConfig'],
             ['name'=>'奖金设置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'bonus-opt', 'routePath'=>'config/bonus-opt', 'show'=>1, 'wiki' => 'bonusConfig'],
             ['name'=>'奖金基本配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'bonus', 'routePath'=>'config/bonus', 'show'=>0,],
-            ['name'=>'皇冠星级配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'bonus-dec-level', 'routePath'=>'config/bonus-crown-level', 'show'=>0,],
             ['name'=>'级别配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'bonus-dec-level', 'routePath'=>'config/bonus-dec-level', 'show'=>0,],
             ['name'=>'管理星级配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'bonus-emp-level', 'routePath'=>'config/bonus-emp-level', 'show'=>0,],
             ['name'=>'转账配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'transfer', 'routePath'=>'config/transfer', 'show'=>1, 'wiki' => 'transferConfig'],

backendApi/config/urlManagerRules.php

@@ -6,8 +6,6 @@
  * Time: 上午11:12
  */
 return [
-//    "<module:\w+>/<controller:[-\w]+>/<action:[-\w]+>/<id:[A-Za-z0-9]+>" => "<module>/<controller>/<action>",
-//    "<module:\w+>/<controller:[-\w]+>/<action:[-\w]+>"=>"<module>/<controller>/<action>",
     [
         'class' => 'yii\rest\UrlRule',
         'pluralize' => false,

backendApi/modules/v1/controllers/ConfigController.php

@@ -12,12 +12,7 @@ use backendApi\modules\v1\models\Admin;
 use common\helpers\Cache;
 use common\helpers\Date;
 use common\helpers\Form;
-use common\helpers\Log;
-use common\helpers\Tool;
-use common\models\CalcBonus;
 use common\models\DecRole;
-use common\models\forms\ClearDataForm;
-use common\models\forms\ConfigBonusForm;
 use common\models\forms\ConfigForm;
 use common\models\forms\ConfigPeriodForm;
 use common\models\forms\DecLevelForm;
@@ -25,28 +20,16 @@ use common\models\forms\DecRoleForm;
 use common\models\forms\RegTypeForm;
 use common\models\forms\DeclarationLevelForm;
 use common\models\forms\EmployLevelForm;
-use common\models\FlowBonus;
 use common\models\forms\OcrApiForm;
 use common\models\forms\SmsApiForm;
 use common\models\forms\SmsTemplateForm;
-use common\models\StarCrownLevelForm;
 use common\models\forms\WithdrawLevelForm;
 use common\models\OcrApi;
-use common\models\PerfCompany;
-use common\models\PerfMonth;
-use common\models\Period;
-use common\models\ReconsumePool;
 use common\models\RegType;
 use common\models\DeclarationLevel;
 use common\models\EmployLevel;
 use common\models\SmsApi;
 use common\models\SmsTemplate;
-use common\models\StarCrownLevel;
-use common\models\UserBonus;
-use common\models\UserClose;
-use common\models\UserInfo;
-use common\models\UserNetwork;
-use common\models\UserRelation;
 use common\models\WithdrawLevel;
 use Yii;
 use common\models\Config;
@@ -57,9 +40,7 @@ class ConfigController extends BaseController {
     public $modelClass = Config::class;
 
     public function behaviors() {
-        $behaviors = parent::behaviors();
-        //$behaviors['contentNegotiator']['formats']['text/html'] = Response::FORMAT_JSON;
-        return $behaviors;
+        return parent::behaviors();
     }
 
     /**
@@ -182,24 +163,6 @@ class ConfigController extends BaseController {
         }
     }
 
-    /**
-     * 修改会员星级相关的奖金配置
-     * @return mixed
-     * @throws \yii\db\Exception
-     * @throws \yii\web\HttpException
-     */
-    public function actionBonusCrownLevel() {
-        $form = new StarCrownLevelForm();
-        if (Yii::$app->request->post() && $form->load(Yii::$app->request->post(), '')) {
-            if ($form->updateBonus()) {
-                StarCrownLevel::updateToCache();
-                return static::notice(Yii::t('ctx', 'successfully'));
-            } else {
-                return static::notice(Form::formatErrorsForApi($form->getErrors()), 422);
-            }
-        }
-    }
-
     /**
      * 更新封期参数
      * @return mixed

backendApi/modules/v1/controllers/ShopController.php

@@ -235,9 +235,6 @@ class ShopController extends BaseController {
             $formModel = new ShopGoodsForm();
             $formModel->scenario = 'changeStatus';
             if ($formModel->load(\Yii::$app->request->post(), '') && $result = $formModel->changeStatus()) {
-//                foreach ($result['logs'] as $k => $value) {
-//                     Log::adminHandle('改变商品状态至' . ShopGoods::STATUS_NAME[$result['status']], 1, $k);
-//                }
                 return static::notice(\Yii::t('ctx', 'shopStatusSetSucceedNotice')); // 状态设置成功
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);

backendApi/modules/v1/controllers/UserController.php

@@ -883,9 +883,6 @@ class UserController extends BaseController
             $userInfo['CASH'] = Cash::getAvailableBalance($userInfo['ID']);
             $userInfo['RECONSUME_POINTS'] = Balance::getBalanceReconsumePoints($userInfo['ID']);
             $userInfo['EXCHANGE_POINTS'] = Balance::getBalanceExchangePoints($userInfo['ID']);
-            $userInfo['TOURISM_POINTS'] = Balance::getAccountBalance($userInfo['ID'], 'tourism_points');
-            $userInfo['GARAGE_POINTS'] = Balance::getAccountBalance($userInfo['ID'], 'garage_points');
-            $userInfo['VILLA_POINTS'] = Balance::getAccountBalance($userInfo['ID'], 'villa_points');
             return static::notice($userInfo);
         }else{
             return static::notice('Member number does not exist', 400);//会员编号不存在

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

@@ -2,25 +2,12 @@
 
 namespace backendApi\modules\v1\models\lists\atlas;
 
-use backendApi\modules\v1\models\Admin;
 use common\helpers\Cache;
-use common\helpers\Tool;
 use common\helpers\user\Info;
-use common\helpers\user\Perf;
-use common\libs\dataList\column\Price;
 use common\libs\dataList\DataListInterface;
-use common\models\CalcBonus;
 use common\models\EmployLevel;
-use common\models\PerfMonth;
 use common\models\Period;
-use common\models\StarCrownLevel;
-use common\models\UserBind;
-use common\models\UserInfo;
-use common\libs\dataList\column\DateTime;
 use common\models\UserNetwork;
-use common\models\UserRelation;
-use common\models\UserSystem;
-use common\models\UserTeamwork;
 use Yii;
 
 class NetworkList extends \common\libs\dataList\DataList implements DataListInterface {

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

@@ -2,23 +2,12 @@
 
 namespace backendApi\modules\v1\models\lists\atlas;
 
-use backendApi\modules\v1\models\Admin;
 use common\helpers\Cache;
-use common\helpers\Tool;
 use common\helpers\user\Info;
-use common\libs\dataList\column\Price;
 use common\libs\dataList\DataListInterface;
-use common\models\CalcBonus;
 use common\models\EmployLevel;
 use common\models\Period;
-use common\models\StarCrownLevel;
-use common\models\UserBind;
-use common\models\UserInfo;
-use common\libs\dataList\column\DateTime;
-use common\models\UserNetwork;
 use common\models\UserRelation;
-use common\models\UserSystem;
-use common\models\UserTeamwork;
 use Yii;
 
 class RelationList extends \common\libs\dataList\DataList implements DataListInterface {

backendApi/modules/v1/models/lists/shop/GoodsList.php

@@ -40,7 +40,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                 'ID' => null,
                 'GOODS_NAME' => [
                     'header' => \Yii::t('ctx', 'shopListProductName'), // 商品名称
-//                    'headerOther' => ['width' => '200'],
+                    'headerOther' => ['width' => '200'],
                 ],
                 'GOODS_NO' => [
                     'header' => \Yii::t('ctx', 'shopListProductsCode'), // 商品编号

backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -118,7 +118,6 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                     'value' => function ($row) {
                         return $this->getOrderStatus()[$row['STATUS']]['label'] ?? '';
-                        // return \Yii::$app->params['orderStatus'][$row['STATUS']]['label'] ?? '';
                     },
                 ],
                 'SKU_CODE' => [
@@ -141,9 +140,6 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                         'width' => '150',
                     ],
                 ],
-                'TEL' => [
-                    'header' => \Yii::t('ctx', 'shopOrderListContactTwo'), // 联系方式2
-                ],
                 'COUNTRY' => [
                     'header' => \Yii::t('ctx', 'country'), // 国家
                 ],
@@ -217,15 +213,15 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                     'headerOther' => ['width' => '190'],
                 ],
-                'DELIVERY_AT' => [
-                    'header' => \Yii::t('ctx', 'shopOrderListDeliveryTime'), // 发货时间
-                    'value' => function ($row) {
-                        return (new DateTime([
-                            'value' => $row['DELIVERY_AT'],
-                        ]))->result();
-                    },
-                    'headerOther' => ['width' => '190'],
-                ],
+//                'DELIVERY_AT' => [
+//                    'header' => \Yii::t('ctx', 'shopOrderListDeliveryTime'), // 发货时间
+//                    'value' => function ($row) {
+//                        return (new DateTime([
+//                            'value' => $row['DELIVERY_AT'],
+//                        ]))->result();
+//                    },
+//                    'headerOther' => ['width' => '190'],
+//                ],
                 'BUY_NUMS' => [
                     'header' => \Yii::t('ctx', 'shopOrderListQty'), // 数量
                     'headerOther' => ['width' => '100'],
@@ -328,14 +324,14 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                         ];
                     },
                 ],
-                'EXPRESS_COMPANY' => [
-                    'header' => \Yii::t('ctx', 'shopOrderListCourierCompany'), // 快递公司
-                    'headerOther' => ['width' => '190'],
-                ],
-                'ORDER_TRACK_NO' => [
-                    'header' => \Yii::t('ctx', 'shopOrderListCourierNumber'), // 快递单号
-                    'headerOther' => ['width' => '200'],
-                ],
+//                'EXPRESS_COMPANY' => [
+//                    'header' => \Yii::t('ctx', 'shopOrderListCourierCompany'), // 快递公司
+//                    'headerOther' => ['width' => '190'],
+//                ],
+//                'ORDER_TRACK_NO' => [
+//                    'header' => \Yii::t('ctx', 'shopOrderListCourierNumber'), // 快递单号
+//                    'headerOther' => ['width' => '200'],
+//                ],
                 'EXPRESS_TYPE' => [
                     'header' => \Yii::t('ctx', 'shopOrderListShippingMethod'), // 发货方式
                     'headerOther' => ['width' => '150'],
@@ -362,7 +358,6 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                         'width' => '130',
                     ],
                     'value' => function ($row) {
-                        // return \Yii::$app->params['deliveryStatus'][$row['DELIVERY_STATUS']]['label'] ?? '';
 
                        return $this->getDeliveryStatus()[$row['DELIVERY_STATUS']]['label'] ?? '';
                     },

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

@@ -3,21 +3,16 @@ namespace backendApi\modules\v1\models\lists\user;
 
 use common\helpers\Cache;
 use common\helpers\http\BackendToFrontendApi;
-use common\helpers\user\Info;
 use common\libs\dataList\DataListInterface;
 use common\models\Countries;
 use common\models\DecRole;
 use common\models\EmployLevel;
 use common\models\Language;
 use common\models\OpenBank;
-use common\models\Region;
-use common\models\StarCrownLevel;
 use common\models\User;
 use common\models\UserInfo;
 use common\libs\dataList\column\DateTime;
 use common\libs\dataList\column\YesNo;
-use common\models\UserNetwork;
-use common\models\UserSystem;
 use Yii;
 
 class IndexList extends \common\libs\dataList\DataList implements DataListInterface
@@ -35,7 +30,6 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
      */
     public function dataHandle()
     {
-//        $this->condition .= ' AND UN.USER_ID=UI.USER_ID AND UN.PARENT_UID=UI.CON_UID';
         $this->condition .= '';
         $this->listData = User::lists($this->condition, $this->params, [
             'select' => 'U.*,
@@ -57,7 +51,6 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
             'from' => User::tableName() . ' AS U',
             'join' => [
                 ['LEFT JOIN', UserInfo::tableName() . ' AS UI', 'UI.USER_ID=U.ID'],
-//                ['LEFT JOIN', UserNetwork::tableName() . ' AS UN', 'UI.USER_ID=UN.USER_ID'],
                 ['LEFT JOIN', User::tableName() . ' AS CU', 'UI.CON_UID=CU.ID'],
                 ['LEFT JOIN', User::tableName() . ' AS RU', 'UI.REC_UID=RU.ID'],
                 ['LEFT JOIN', User::tableName() . ' AS DU', 'U.DEC_ID=DU.ID'],
@@ -220,7 +213,6 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     'header' => Yii::t('ctx', 'placementName'),
                     'headerOther' => ['width' => '190'],
                 ],
-//                '
                 'MOBILE' => [
                     'header' => Yii::t('ctx', 'phoneNumber'),
                     'value' => function($row) {
@@ -359,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'],
-                'CROWN_LV_NAME'=> ['name'=> Yii::t('ctx', 'highestCrown'), 'other'=> 'crownLevel'],
                 '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')],

common/helpers/Cache.php

@@ -22,12 +22,9 @@ use common\models\EmployLevel;
 use common\models\Region;
 use common\models\RegType;
 use common\models\SmsApi;
-use common\models\SmsTemplate;
-use common\models\StarCrownLevel;
 use common\models\User;
 use common\models\UserNetwork;
 use common\models\UserRelation;
-use common\models\WithdrawLevel;
 use Yii;
 use backendApi\modules\v1\models\Admin;
 use common\models\UserInfo;

common/helpers/bonus/BonusCalc.php

@@ -17,17 +17,9 @@ use common\models\CalcBonus;
 use common\models\CalcBonusBD;
 use common\models\CalcBonusBS;
 use common\models\CalcBonusQuarter;
-use common\models\CalcBonusBT;
-use common\models\CalcBonusCF;
-use common\models\CalcBonusFL;
-use common\models\CalcBonusFW;
-use common\models\CalcBonusFX;
 use common\models\CalcBonusGarage;
 use common\models\CalcBonusGL;
 use common\models\CalcBonusGX;
-use common\models\CalcBonusHB;
-use common\models\CalcBonusLS;
-use common\models\CalcBonusLX;
 use common\models\CalcBonusQY;
 use common\models\CalcBonusStandard;
 use common\models\CalcBonusTG;
@@ -39,29 +31,18 @@ use common\models\CalcBonusYC;
 use common\models\CalcBonusYJ;
 use common\models\CalcMonthBonusUser;
 use common\models\Config;
-use common\models\FlowDeductZR;
 use common\models\Order;
 use common\models\OrderGoods;
-use common\models\OrderShop;
 use common\models\PerfCompany;
 use common\models\PerfMonth;
 use common\models\PerfPeriod;
 use common\models\Period;
-use common\models\ResendQY;
 use common\models\DeclarationLevel;
 use common\models\DecOrder;
 use common\models\EmployLevel;
-use common\models\FlowBonus;
-use common\models\PerfActiveUser;
 use common\models\ScoreMonth;
 use common\models\ShopGoods;
-use common\models\StarCrownLevel;
-use common\models\User;
-use common\models\UserInfo;
-use common\models\UserPerf;
-use SebastianBergmann\CodeCoverage\Report\PHP;
 use yii\base\BaseObject;
-use yii\base\Exception;
 use yii\base\StaticInstanceTrait;
 use yii\helpers\Json;
 use yii\db\Query;
@@ -1291,14 +1272,6 @@ class BonusCalc extends BaseObject {
                 $deductData = $this->deduct($userId, $teamBonus);
 
                 // 取小腿值
-                $payLeg = min([$perfArr['SURPLUS_1L'], $perfArr['SURPLUS_2L']]);
-                // 计算荣衔星级
-                $starCrown = StarCrownLevel::getStarCrown($payLeg);
-
-                // 是否活跃
-                $isActive = $this->_isPerfActive($userId);
-                $oriBonus = $isActive ? $teamBonus : 0;
-                $lastCrownLv = $isActive ? $starCrown['ID'] : StarCrownLevel::getDefaultLevelId();
 
                 //团队奖流水
                 $insertBonusData[] = [
@@ -3573,13 +3546,7 @@ class BonusCalc extends BaseObject {
         $standardBonus = CalcCache::standardBonus($userId, $this->_periodNum);
         $baseInfo = CalcCache::getUserInfo($userId, $this->_periodNum);
         $perfData = CalcCache::nowPeriodPerf($userId, $this->_periodNum);
-        $tourismBonus = CalcCache::tourismBonus($userId, $this->_periodNum);
-        $garageBonus = CalcCache::garageBonus($userId, $this->_periodNum);
-        $villaBonus = CalcCache::villaBonus($userId, $this->_periodNum);
         $nowDirectorLv = $baseInfo['EMP_LV'];
-//        if($this->_isCalcMonth){
-//            $empLv = $this->nowMonthPerfData($userId)['LAST_EMP_LV'];
-//        }
         $pervSurplusPerf = CalcCache::surplusPerf($userId, $this->_periodNum);
         // 星级
         $starCrownLv = CalcCache::getUserStarCrown($userId, $this->_periodNum);

common/helpers/bonus/BonusSend.php

@@ -16,19 +16,14 @@ use common\helpers\Tool;
 use common\helpers\user\Balance;
 use common\helpers\user\Info;
 use common\helpers\user\Reconsume;
-use common\helpers\user\Status;
 use common\libs\api\sms\SmsApi;
-use common\libs\swoole\Process;
 use common\models\DealType;
 use common\models\FlowRemainPv;
 use common\models\PerfPeriod;
-use common\models\DecOrder;
 use common\models\EmployLevel;
-use common\models\StarCrownLevel;
 use common\models\UserBonus;
 use common\models\UserPerfMonthUpdate;
 use common\models\UserPeriodPoints;
-use common\models\UserWallet;
 use common\models\UserInfo;
 use common\models\UserPerf;
 use common\models\UserPerfUpdate;
@@ -36,18 +31,13 @@ use common\models\UserTeamwork;
 use common\models\YearHighestEmpLv;
 use common\models\Order;
 use common\models\RemainPv;
-use common\models\forms\OrderForm;
 use yii\base\BaseObject;
 use yii\base\StaticInstanceTrait;
 use common\helpers\Cache;
 use common\helpers\Date;
 use common\models\CalcBonus;
-use common\models\CalcBonusBD;
 use common\models\CalcBonusBS;
-use common\models\CalcBonusGX;
 use common\models\CalcBonusQY;
-use common\models\CalcBonusTG;
-use common\models\FlowBonus;
 use common\models\PerfActiveUser;
 use common\models\PerfMonth;
 use common\models\User;
@@ -637,135 +627,15 @@ class BonusSend extends BaseObject {
         return true;
     }
 
-    /**
-     * 更新用户星级
-     * @param int $offset
-     * @return bool
-     */
-    public function updateCrownLevel(int $offset = 0)
-    {
-        $starCrownLv = StarCrownLevel::getIdConvertLevelSortCache();
-//        $allData = CalcBonusQY::findUseDbCalc()
-        $allData = CalcBonusQY::find()
-            ->yearMonth($this->_calcYearMonth)
-            ->where(
-                'CALC_MONTH=:CALC_MONTH AND PERIOD_NUM=:PERIOD_NUM',
-                [
-                    ':CALC_MONTH' => $this->_calcYearMonth,
-                    ':PERIOD_NUM' =>$this->_periodNum
-                ]
-            )
-            ->orderBy('CREATED_AT DESC')
-            ->groupBy('USER_ID')
-            ->offset($offset)
-            ->limit($this->_limit)
-            ->all();
-
-        $defaultCrownLv = StarCrownLevel::getDefaultLevelId();
-        if ($allData) {
-            $transaction = Yii::$app->db->beginTransaction();
-            try {
-                foreach ($allData as $data) {
-                    // 默认级别不更新
-                    if( $data['LAST_CROWN_LV'] === $defaultCrownLv ) continue;
-
-                    $modernCrownLv = $data['LAST_CROWN_LV'];   // 本期计算出的最新级别
-
-                    $user = CalcCache::getUserInfo($data['USER_ID'], $this->_periodNum);
-                    $originCrownLv = $user['CROWN_LV']; // 用户的历史最高crown级别
-                    $originCrownLvSort = $starCrownLv[$originCrownLv]; // 历史最高crown级别值
-                    $modernCrownLvSort = $starCrownLv[$modernCrownLv]; // 当前计算的crown级别值
-                    if ($modernCrownLvSort > $originCrownLvSort) {
-                        $columns = [
-                            'CROWN_LV' => $data['LAST_CROWN_LV'],
-                            'LAST_CROWN_LV' => $data['LAST_CROWN_LV'],
-                            'LAST_CROWN_LV_UPDATED_AT' => time(),
-                            'LAST_CROWN_LV_UPDATED_PERIOD' => $this->_periodNum,
-                        ];
-                    } else {
-                        $columns = [
-                            'LAST_CROWN_LV' => $data['LAST_CROWN_LV'],
-                            'LAST_CROWN_LV_UPDATED_AT' => time(),
-                            'LAST_CROWN_LV_UPDATED_PERIOD' => $this->_periodNum,
-                        ];
-                    }
-
-                    User::updateAll($columns, 'ID = :USER_ID', [':USER_ID' => $data['USER_ID']]);
-                    User::deleteBaseInfoFromRedis($data['USER_ID']);
-                    unset($data);
-                }
-                $transaction->commit();
-            } catch (Exception $e) {
-                $transaction->rollBack();
-                $this->addError('updateStarCrownLevel', '更新StartCrown失败，原因：' . $e->getMessage());
-                return false;
-            }
-            unset($transaction, $allData);
-            return $this->updateCrownLevel($offset + $this->_limit);
-        }
-
-        // 刷新会员CrownLv为0
-        User::updateAll([
-            'LAST_CROWN_LV' => '',
-            'LAST_CROWN_LV_UPDATED_AT' => time(),
-            'LAST_CROWN_LV_UPDATED_PERIOD' => $this->_periodNum,
-        ], 'LAST_CROWN_LV_UPDATED_PERIOD < :PERIOD_NUM AND LAST_CROWN_LV <> ""' , [':PERIOD_NUM' => $this->_periodNum]);
-        User::deleteAllBaseInfoFromRedis();
-
-        return true;
-    }
-
-    // /**
-    //  * 更新会员聘级
-    //  * @param int $offset
-    //  * @return bool
-    //  * @throws \yii\db\Exception
-    //  */
-    // public function updateEmpLevel(int $offset = 0) {
-    //     if ($this->_isCalcMonth) {
-    //         $allData = PerfMonth::findUseDbCalc()->yearMonth($this->_calcYearMonth)->where('CALC_MONTH=:CALC_MONTH', [':CALC_MONTH' => $this->_calcYearMonth])->offset($offset)->limit($this->_limit)->all();
-    //         //@todo 用户级别不变则不更新
-    //         $defaultEmpLv = EmployLevel::getDefaultLevelId();
-    //         if ($allData) {
-    //             $transaction = Yii::$app->db->beginTransaction();
-    //             try {
-    //                 foreach ($allData as $data) {
-    //                     //@todo 用户级别不变则不更新
-    //                     if( $data['LAST_EMP_LV'] === $defaultEmpLv ) continue;
-
-    //                     User::updateAll(['EMP_LV' => $data['LAST_EMP_LV']], 'ID=:USER_ID', [':USER_ID' => $data['USER_ID']]);
-    //                     User::deleteBaseInfoFromRedis($data['USER_ID']);
-    //                     unset($data);
-    //                 }
-    //                 $transaction->commit();
-    //             } catch (Exception $e) {
-    //                 $transaction->rollBack();
-    //                 $this->addError('updateEmpLevel', '更新聘级失败，原因：' . $e->getMessage());
-    //                 return false;
-    //             }
-    //             unset($transaction, $allData, $defaultEmpLv);
-    //             return $this->updateEmpLevel($offset + $this->_limit);
-    //         }
-    //         unset($allData);
-    //     }
-    //     return true;
-    // }
-
     // 更活跃会员,将is_send改成1
     public function updateActiveUser() {
-        try {
-            $ret = PerfActiveUser::updateAll(
-                ['IS_SENT' => 1],
-                'PERIOD_NUM=:PERIOD_NUM AND IS_SENT=:IS_SENT',
-                ['IS_SENT'=>0, 'PERIOD_NUM'=>$this->_periodNum]
-            );
-
-            return $ret;
-        } catch(Exception $e) {
+        $ret = PerfActiveUser::updateAll(
+            ['IS_SENT' => 1],
+            'PERIOD_NUM=:PERIOD_NUM AND IS_SENT=:IS_SENT',
+            ['IS_SENT'=>0, 'PERIOD_NUM'=>$this->_periodNum]
+        );
 
-            $this->addError('updateActiveUser', '更新活跃会员业绩期处理状态失败，原因：' . $e->getMessage());
-            return false;
-        }
+        return $ret;
     }
 
     /**
@@ -775,7 +645,6 @@ class BonusSend extends BaseObject {
      * @throws \yii\db\Exception
      */
     public function updateUserPerf(int $offset = 0) {
-//        $allData = PerfPeriod::findUseDbCalc()
         $allData = PerfPeriod::find()
             ->yearMonth($this->_calcYearMonth)->where('PERIOD_NUM=:PERIOD_NUM', [':PERIOD_NUM' => $this->_periodNum])->orderBy('ID ASC')->offset($offset)->limit($this->_limit)->all();
         if ($allData) {
@@ -783,11 +652,9 @@ class BonusSend extends BaseObject {
             try {
                 foreach ($allData as $data) {
                     $isUpdate = false;
-//                    if (UserPerf::findUseDbCalc()
                     if (UserPerf::find()
                         ->where('USER_ID=:USER_ID', [':USER_ID' => $data['USER_ID']])->exists()) {
                         // 判断本期是否已经更新过业绩
-//                        if (!UserPerfUpdate::findUseDbCalc()
                         if (!UserPerfUpdate::find()
                             ->yearMonth($this->_calcYearMonth)->where('USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM', [':USER_ID' => $data['USER_ID'], ':PERIOD_NUM' => $this->_periodNum])->exists()) {
                             $isUpdate = true;

common/helpers/bonus/CalcCache.php

@@ -8,26 +8,17 @@
 
 namespace common\helpers\bonus;
 
-use common\components\Redis;
 use common\helpers\Cache;
-use common\helpers\Date;
 use common\helpers\user\Info;
 use common\models\CalcBonus;
 use common\models\PerfMonth;
-use common\models\PerfPeriod;
 use common\models\Period;
 use common\models\DeclarationLevel;
 use common\models\DecRole;
 use common\models\EmployLevel;
-use common\models\StarCrownLevel;
 use common\models\User;
 use common\models\UserBonus;
-use common\models\UserNetwork;
 use common\models\UserPerf;
-use common\models\UserRelation;
-use common\models\RemainPv;
-use common\models\Order;
-use common\models\forms\OrderForm;
 use Yii;
 use common\models\UserInfo;
 use yii\helpers\Json;
@@ -90,7 +81,6 @@ class CalcCache {
     const REDIS_KEY_PREFIX_GX_BONUS_DEEP_TWO_LIST_DATA = 'calc:gxBonusDeepTwoListData_';
     const REDIS_KEY_PREFIX_YC_BONUS_LIST_DATA = 'calc:ycBonusListData_';
     const REDIS_KEY_PREFIX_FW_BONUS_LIST_DATA = 'calc:fwBonusListData_';
-    const REDIS_KEY_PREFIX_BONUS_CROWN_CROWN_LIST_DATA = 'calc:bonusStarCrownListData_';
 
     //@todo
     const REDIS_KEY_PREFIX_REPAIR_SURPLUS_PERF = 'calc:repairSurplusPerf_';
@@ -149,7 +139,6 @@ class CalcCache {
         Yii::$app->redis->del(self::REDIS_KEY_PREFIX_HAS_MONTH_BONUS_USER . $periodNum);
         Yii::$app->redis->del(self::REDIS_KEY_PREFIX_HAS_MONTH_BONUS_USER_POOL . $periodNum);
         Yii::$app->redis->del(self::REDIS_KEY_PREFIX_FW_BONUS_LIST_DATA . $periodNum);
-        Yii::$app->redis->del(self::REDIS_KEY_PREFIX_BONUS_CROWN_CROWN_LIST_DATA . $periodNum);
     }
 
     /**
@@ -165,7 +154,6 @@ class CalcCache {
      * @param $periodNum
      */
     public static function clearAll($periodNum) {
-        //Yii::$app->redis->del(Yii::$app->redis->keys('calc*'));
         Yii::$app->redis->del(self::REDIS_KEY_PREFIX_USER . $periodNum);
         Yii::$app->redis->del(self::REDIS_KEY_PREFIX_USER_ACTIVE . $periodNum);
         Yii::$app->redis->del(self::REDIS_KEY_PREFIX_USER_INFO . $periodNum);
@@ -216,7 +204,6 @@ class CalcCache {
         Yii::$app->redis->del(self::REDIS_KEY_PREFIX_GX_BONUS_DEEP_TWO_LIST_DATA . $periodNum);
         Yii::$app->redis->del(self::REDIS_KEY_PREFIX_YC_BONUS_LIST_DATA . $periodNum);
         Yii::$app->redis->del(self::REDIS_KEY_PREFIX_FW_BONUS_LIST_DATA . $periodNum);
-        Yii::$app->redis->del(self::REDIS_KEY_PREFIX_BONUS_CROWN_CROWN_LIST_DATA . $periodNum);
     }
 
     /**
@@ -229,11 +216,8 @@ class CalcCache {
     public static function addUsers($periodNum, $offset = 0, $limit = self::LIMIT) {
         // 修复USER_INFO表里面已经没有PERIOD_NUM了
         $allData = UserInfo::findUseDbCalc()->from(UserInfo::tableName(). 'AS UI')->select('UI.USER_ID,U.STATUS')->leftJoin(User::tableName() . 'AS U', 'U.ID=UI.USER_ID')->where('1=1')->orderBy('UI.RELATION_DEEP DESC,UI.ID DESC')->offset($offset)->limit($limit)->asArray()->all();
-        //$allData = User::findUseDbShopCalc()->select('ID AS USER_ID')->where('PERIOD_AT<=:PERIOD_AT AND IS_UNION=0 AND DELETED=0', [':PERIOD_AT' => $periodNum])->offset($offset)->limit($limit)->asArray()->all();
-//        print_r($allData);
         if ($allData) {
             foreach ($allData as $data) {
-//                if(User::find()->where('ID=:ID',[':ID'=>$data['USER_ID']])->exists()) continue;
                 // 会员ID加入缓存
                 $cacheKey = self::REDIS_KEY_PREFIX_USER . $periodNum;
                 $value = $data['USER_ID'];
@@ -610,32 +594,6 @@ class CalcCache {
         return $userYcBonusData ? Json::decode($userYcBonusData, true) : [];
     }
 
-    /**
-     * 会员星级加入缓存
-     * @param $userId
-     * @param $periodNum
-     * @param $crownCrown
-     */
-    public static function addUserStarCrown($userId, $periodNum, $starCrown) {
-        // 先从已存在的会员池里面获取
-        $data = Yii::$app->redis->hget(self::REDIS_KEY_PREFIX_BONUS_CROWN_CROWN_LIST_DATA . $periodNum, $userId);
-        if (!$data) {
-            Yii::$app->redis->hset(self::REDIS_KEY_PREFIX_BONUS_CROWN_CROWN_LIST_DATA . $periodNum, $userId, $starCrown);
-        }
-
-        unset($userId, $periodNum, $saveData, $isset);
-    }
-
-    /**
-     * 获取会员星级信息
-     * @param $userId
-     * @param $periodNum
-     * @return array
-     */
-    public static function getUserStarCrown($userId, $periodNum) {
-        return Yii::$app->redis->hget(self::REDIS_KEY_PREFIX_BONUS_CROWN_CROWN_LIST_DATA . $periodNum, $userId);
-    }
-
     /**
      * 加入有复销业绩的会员列表
      * @param $userId
@@ -800,16 +758,14 @@ class CalcCache {
                 throw new \Exception('用户信息表数据不存在,userId:'.$userId);
             }
             // 在获取商城库的会员的级别信息和是否报单中心的会员
-            $userShopInfo = User::find()->select('REAL_NAME,LAST_DEC_LV,DEC_LV,EMP_LV,CROWN_LV,IS_DEC,DEC_ID,DEC_ROLE_ID,STATUS,PERIOD_AT,MOBILE,CREATED_AT,SUB_COM_ID,PROVINCE,CITY,COUNTY,DEC_PROVINCE,DEC_CITY,DEC_COUNTY,IS_DIRECT_SELLER,SUB_COM_LEADER')->where('ID=:ID', [':ID' => $userId])->asArray()->one();
+            $userShopInfo = User::find()->select('REAL_NAME,LAST_DEC_LV,DEC_LV,EMP_LV,IS_DEC,DEC_ID,DEC_ROLE_ID,STATUS,PERIOD_AT,MOBILE,CREATED_AT,SUB_COM_ID,PROVINCE,CITY,COUNTY,DEC_PROVINCE,DEC_CITY,DEC_COUNTY,IS_DIRECT_SELLER,SUB_COM_LEADER')->where('ID=:ID', [':ID' => $userId])->asArray()->one();
             if ( !$userShopInfo ) {
                 throw new \Exception('用户表数据不存在,userId:'.$userId);
             }
             $userInfo['REAL_NAME'] = $userShopInfo['REAL_NAME'];
-//            $userInfo['DEC_LV'] = $userShopInfo['DEC_LV'];
             //先用last_dec_lv
             $userInfo['DEC_LV'] = $userShopInfo['LAST_DEC_LV'];
             $userInfo['EMP_LV'] = $userShopInfo['EMP_LV'];
-            $userInfo['CROWN_LV'] = $userShopInfo['CROWN_LV'];
             $userInfo['IS_DEC'] = $userShopInfo['IS_DEC'];
             $userInfo['DEC_ID'] = $userShopInfo['DEC_ID'];
             $userInfo['DEC_ROLE_ID'] = $userShopInfo['DEC_ROLE_ID'];
@@ -830,17 +786,8 @@ class CalcCache {
             $userInfo['REC_REAL_NAME'] = isset($userInfo['REC_UID']) && $userInfo['REC_UID'] ? Info::getUserRealNameByUserId($userInfo['REC_UID']) : '';
             $userInfo['CON_USER_NAME'] = isset($userInfo['CON_UID']) && $userInfo['CON_UID'] ? Info::getUserNameByUserId($userInfo['CON_UID']) : '';
             $userInfo['CON_REAL_NAME'] = isset($userInfo['CON_UID']) && $userInfo['CON_UID'] ? Info::getUserRealNameByUserId($userInfo['CON_UID']) : '';
-//            $userInfo['REC_USER_NAME'] = '';
-//            $userInfo['REC_REAL_NAME'] = '';
-//            $userInfo['CON_USER_NAME'] = '';
-//            $userInfo['CON_REAL_NAME'] = '';
-//            $userInfo['LOCATION'] = 1;
+
             unset($userShopInfo);
-//            if( isset($userInfo['CON_UID']) && $userInfo['CON_UID'] ) {
-//                if ($networkParent = UserNetwork::findOneAsArray('USER_ID=:USER_ID', [':USER_ID' => $userId])) {
-//                    $userInfo['LOCATION'] = $networkParent['RELATIVE_LOCATION'];
-//                }
-//            }
 
             if (!$userInfo['DEC_LV']) {
                 $userInfo['DEC_LV'] = DeclarationLevel::getDefaultLevelId();
@@ -848,9 +795,6 @@ class CalcCache {
             if (!$userInfo['EMP_LV']) {
                 $userInfo['EMP_LV'] = EmployLevel::getDefaultLevelId();
             }
-            if (!$userInfo['CROWN_LV']) {
-                $userInfo['CROWN_LV'] = StarCrownLevel::getDefaultLevelId();
-            }
             $data = Json::encode($userInfo);
             Yii::$app->redis->hset($key, $userId, $data);
             unset($userInfo, $key, $userId, $periodNum);

common/helpers/bonus/PerfCalc.php

@@ -1540,7 +1540,7 @@ class PerfCalc {
                 $parentUid = $toInfo['REC_UID'];
             }
             unset($toInfo);
-            if( !$parentUid ) self::LOOP_FINISH;
+            if( !$parentUid )
 
             CalcCache::hasEmpLevelNum($parentUid, $this->_periodNum, [$parentRecUserId => [$resultLevel['ID'] => 1]]);
             //每次记录上次的USER_ID

common/helpers/user/Info.php

@@ -9,30 +9,23 @@
 namespace common\helpers\user;
 
 
-use common\components\ActiveQuery;
 use common\components\ActiveRecord;
 use common\helpers\Cache;
-use common\helpers\LoggerTool;
 use common\helpers\Tool;
 use common\models\BaUser;
 use common\models\BaUserInfo;
-use common\models\Config;
 use common\models\Countries;
 use common\models\PerfMonth;
 use common\models\PerfPeriod;
 use common\models\Period;
 use common\models\DeclarationLevel;
-use common\models\DecRole;
 use common\models\EmployLevel;
 use common\models\OpenBank;
 use common\models\Region;
-use common\models\StarCrownLevel;
 use common\models\User;
 use common\models\UserBonus;
 use common\models\UserInfo;
 use common\models\UserNetwork;
-use common\models\UserRelation;
-use common\models\UserSystem;
 use common\models\UserWallet;
 use Yii;
 use yii\base\Exception;
@@ -153,7 +146,6 @@ class Info {
         if (!$data['DEC_LV']) $data['DEC_LV'] = DeclarationLevel::getDefaultLevelId();
         if (!$data['LAST_DEC_LV']) $data['LAST_DEC_LV'] = DeclarationLevel::getDefaultLevelId();
         if (!$data['EMP_LV']) $data['EMP_LV'] = EmployLevel::getDefaultLevelId();
-        if (!$data['CROWN_LV']) $data['CROWN_LV'] = StarCrownLevel::getDefaultLevelId();
         return $data;
     }
 
@@ -233,7 +225,6 @@ class Info {
                     if (!$data['DEC_LV']) $data['DEC_LV'] = DeclarationLevel::getDefaultLevelId();
                     if (!$data['LAST_DEC_LV']) $data['LAST_DEC_LV'] = DeclarationLevel::getDefaultLevelId();
                     if (!$data['EMP_LV']) $data['EMP_LV'] = EmployLevel::getDefaultLevelId();
-                    if (!$data['CROWN_LV']) $data['CROWN_LV'] = StarCrownLevel::getDefaultLevelId();
                     if (!$data['HIGHEST_EMP_LV']) $data['HIGHEST_EMP_LV'] = EmployLevel::getDefaultLevelId();
                     return $data;
                 }else{

common/models/CalcBonusQY.php

@@ -73,9 +73,4 @@ class CalcBonusQY extends \common\components\ActiveRecord
             'MANAGE_TAX' => '管理费',
         ];
     }
-
-    public function getStarCrown()
-    {
-        return $this->hasOne(StarCrownLevel::class, ['ID' => 'LAST_CROWN_LV']);
-    }
 }

common/models/StarCrownLevelForm.php

@@ -1,72 +0,0 @@
-<?php
-
-namespace common\models;
-
-use common\components\Model;
-use common\helpers\Form;
-use common\libs\logging\operate\AdminOperate;
-use common\models\DeclarationLevel;
-use common\models\StarCrownLevel;
-
-/**
- * Login form
- */
-class StarCrownLevelForm extends Model
-{
-
-    public function init()
-    {
-        parent::init();
-        $this->adminOperateLogger = new AdminOperate([
-            'fetchClass' => StarCrownLevel::class,
-        ]);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [];
-    }
-
-    /**
-     * 更新星级奖金
-     * @return bool
-     * @throws \yii\db\Exception
-     */
-    public function updateBonus()
-    {
-        $beforeData = StarCrownLevel::getBonusConfig();
-        $this->adminOperateLogger->saveBeforeContent=$beforeData;
-
-        $postData = \Yii::$app->request->post('data');
-        $transaction = \Yii::$app->db->beginTransaction();
-        try {
-            foreach ($postData as $value) {
-                $crownLevelModel = StarCrownLevel::findOne(['ID' => $value['ID']]);
-                if ($crownLevelModel) {
-                    $crownLevelModel->TOURISM_PERCENT = $value['TOURISM_PERCENT'];
-                    $crownLevelModel->GARAGE_PERCENT = $value['GARAGE_PERCENT'];
-                    if (!$crownLevelModel->save()) {
-                        throw new \Exception(Form::formatErrorsForApi($crownLevelModel->getErrors()));
-                    }
-                }
-            }
-            $transaction->commit();
-        } catch (\Exception $e) {
-            $transaction->rollBack();
-            $this->addError('updateBonus', $e->getMessage());
-            return null;
-        }
-
-        $afterData = StarCrownLevel::getBonusConfig();
-        $this->adminOperateLogger->saveAfterContent = $afterData;
-        unset($beforeData,$afterData);
-
-        $this->adminOperateLogger->clean()->save([
-            'optType' => '更新星级奖金配置',
-        ]);
-        return true;
-    }
-}

common/models/User.php

@@ -283,8 +283,6 @@ class User extends \common\components\ActiveRecord
      *  观望期：自加入算起2个月
      *  例子:2022年5月14日加入， 观望期至2022年7月31日。
      *  true为是观察期用户  false为不是观察期用户
-     * @param $addAt 用户的加入时间
-     * @param $month 观察期月份限制 系统初始化为2个月
      */
     public static function checkIsObserve($addAt, $month) {
         if (empty($month)) {
@@ -295,7 +293,7 @@ class User extends \common\components\ActiveRecord
         $lastDay = date("t", strtotime($appendMonth));  // 获取指定月的最后一天
         $eTime = strtotime($appendMonth.'-'.$lastDay);
 
-        return time() < $eTime ? true : false;
+        return time() < $eTime;
     }
 
     // 获取用户报单PV总和
@@ -350,9 +348,7 @@ class User extends \common\components\ActiveRecord
             'NATION_ID' => \Yii::$app->params['nation'][$userInfo['NATION']]['id']??'',
             'REAL_NAME' => $userInfo['REAL_NAME'],
             'ID_CARD' => $userInfo['ID_CARD'],
-//            'ID_CARD' => Tool::hideIdCard($userInfo['ID_CARD']),
             'MOBILE' => $userInfo['MOBILE'],
-//            'MOBILE' => Tool::hideMobile($userInfo['MOBILE']),
             'AVATAR' => $userInfo['AVATAR'],
             'VERIFIED' => $userInfo['VERIFIED'],
             'IS_UNION' => $userInfo['IS_UNION'],
@@ -365,12 +361,10 @@ class User extends \common\components\ActiveRecord
             'BANK_ADDRESS' => $userInfo['BANK_ADDRESS'],
             'DEC_LV' => $userInfo['DEC_LV'] ?? DeclarationLevel::getDefaultLevelId(),
             'EMP_LV' => $userInfo['EMP_LV'] ?? EmployLevel::getDefaultLevelId(),
-            'CROWN_LV' => $userInfo['CROWN_LV'] ?? StarCrownLevel::getDefaultLevelId(),
             'PROVINCE' => $userInfo['PROVINCE'],
             'CITY' => $userInfo['CITY'],
             'COUNTY' => $userInfo['COUNTY'],
             'BANK_NO' => $userInfo['BANK_NO'],
-//            'BANK_NO' => Tool::hideBankNo($userInfo['BANK_NO']),
             'EMAIL' => $userInfo['EMAIL'] ?? '',
             'COUNTRY_ID' => $userInfo['COUNTRY_ID'],
             'LANGUAGE_ID' => $userInfo['LANGUAGE_ID'],

console/controllers/ToolController.php

@@ -8,49 +8,23 @@
  */
 namespace console\controllers;
 
-use common\helpers\bonus\BonusSend;
 use common\helpers\bonus\CalcCache;
 use common\helpers\Cache;
-use common\helpers\DataBak;
 use common\helpers\Date;
-use common\helpers\Form;
 use common\helpers\LoggerTool;
-use common\helpers\ocr\OcrApi;
 use common\helpers\Tool;
 use common\helpers\user\Balance;
-use common\libs\api\sms\SmsApi;
-use common\libs\swoole\RPCApi;
-use common\models\CalcBonus;
 use common\models\CalcBonusBS;
-use common\models\CalcBonusFX;
 use common\models\CalcBonusQY;
-use common\models\CalcBonusYC;
 use common\models\DealType;
 use common\models\EmployLevel;
-use common\models\FlowBonus;
-use common\models\FlowRemainPv;
-use common\models\forms\ClearDataForm;
-use common\models\forms\DeclarationLoopForm;
-use common\models\forms\UserForm;
-use common\models\Order;
-use common\models\PerfMonth;
-use common\models\PerfOrder;
-use common\models\PerfPeriod;
 use common\models\Period;
-use common\models\ReconsumePool;
-use common\models\ReconsumePoolFlow;
-use common\models\DecOrder;
 use common\models\Region;
-use common\models\RemainPv;
-use common\models\StarCrownLevel;
 use common\models\User;
 use common\models\UserInfo;
-use common\models\UserNetwork;
-use common\models\UserRelation;
 use Yii;
 use yii\base\Exception;
 use yii\db\Expression;
-use yii\db\Query;
 
 class ToolController extends BaseController
 {
@@ -241,7 +215,6 @@ class ToolController extends BaseController
     public function actionUpdateEmpLevel()
     {
         $periodNum = 134;
-        $period = Period::findOneAsArray('PERIOD_NUM=:PERIOD_NUM', [':PERIOD_NUM' => $periodNum]);
 
         $empLv = EmployLevel::getIdConvertLevelSortCache();
         $allData = CalcBonusBS::find()
@@ -304,101 +277,6 @@ class ToolController extends BaseController
         User::deleteAllBaseInfoFromRedis();
     }
 
-    public function actionUpdateCrownLevel()
-    {
-        $periodNum = 134;
-        $period = Period::findOneAsArray('PERIOD_NUM=:PERIOD_NUM', [':PERIOD_NUM' => $periodNum]);
-
-        $starCrownLv = StarCrownLevel::getIdConvertLevelSortCache();
-        $allData = CalcBonusQY::find()
-            ->where('PERIOD_NUM=:PERIOD_NUM', [':PERIOD_NUM' => $periodNum])
-            ->orderBy('CREATED_AT DESC')
-            ->groupBy('USER_ID')
-            ->limit(10000)
-            ->all();
-
-        $defaultCrownLv = StarCrownLevel::getDefaultLevelId();
-        if ($allData) {
-            $transaction = Yii::$app->db->beginTransaction();
-            try {
-                foreach ($allData as $data) {
-                    // 默认级别不更新
-                    if( $data['LAST_CROWN_LV'] === $defaultCrownLv ) continue;
-
-                    $modernCrownLv = $data['LAST_CROWN_LV'];   // 本期计算出的最新级别
-
-                    $user = CalcCache::getUserInfo($data['USER_ID'], $periodNum);
-                    $originCrownLv = $user['CROWN_LV']; // 用户的历史最高crown级别
-                    $originCrownLvSort = $starCrownLv[$originCrownLv]; // 历史最高crown级别值
-                    $modernCrownLvSort = $starCrownLv[$modernCrownLv]; // 当前计算的crown级别值
-                    if ($modernCrownLvSort > $originCrownLvSort) {
-                        $columns = [
-                            'CROWN_LV' => $data['LAST_CROWN_LV'],
-                            'LAST_CROWN_LV' => $data['LAST_CROWN_LV'],
-                            'LAST_CROWN_LV_UPDATED_AT' => time(),
-                            'LAST_CROWN_LV_UPDATED_PERIOD' => $periodNum,
-                        ];
-                    } else {
-                        $columns = [
-                            'LAST_CROWN_LV' => $data['LAST_CROWN_LV'],
-                            'LAST_CROWN_LV_UPDATED_AT' => time(),
-                            'LAST_CROWN_LV_UPDATED_PERIOD' => $periodNum,
-                        ];
-                    }
-
-                    LoggerTool::info('sendBonus' . sprintf('actionUpdateCrownLevel: %s', json_encode([$columns, $data['USER_ID']])));
-
-                    User::updateAll($columns, 'ID = :USER_ID', [':USER_ID' => $data['USER_ID']]);
-                    User::deleteBaseInfoFromRedis($data['USER_ID']);
-                    unset($data);
-                }
-                $transaction->commit();
-            } catch (Exception $e) {
-                $transaction->rollBack();
-                return false;
-            }
-            unset($transaction, $allData);
-        }
-
-        // 刷新会员CrownLv为0
-        User::updateAll([
-            'LAST_CROWN_LV' => '',
-            'LAST_CROWN_LV_UPDATED_AT' => time(),
-            'LAST_CROWN_LV_UPDATED_PERIOD' => $periodNum,
-        ], 'LAST_CROWN_LV_UPDATED_PERIOD < :PERIOD_NUM AND LAST_CROWN_LV <> ""' , [':PERIOD_NUM' => $periodNum]);
-
-        User::deleteAllBaseInfoFromRedis();
-
-        return true;
-    }
-
-    public function actionStarCrownBonusPayout()
-    {
-        $periodAmount = 102.2;
-        $periodNum = 134;
-        $userId = '588993027624800256';
-//        $userId = '571010686600220672';// todo: test
-
-        Balance::changeUserBonus($userId, 'bonus', $periodAmount, [
-            'CALC_ID' => '595035263307223040',
-            'REMARK' => 'From Period ' . $periodNum,
-            'PERIOD_NUM' => $periodNum,
-
-            'BS' => 102.2,
-            'BS_MNT' => 0,
-            'BS_ABBR' => 102.2,
-
-            'ORI_BS' => 102.2,
-            'ORI_BS_MNT' => 0,
-            'ORI_BS_ABBR' => 102.2,
-
-            'BONUS_TOTAL' => 102.2,
-
-            'DEAL_TYPE_ID' => DealType::BONUS_SEND,
-            'BONUS_ISSUE' => true,
-        ]);
-    }
-
     /**
      * 构建行政区划js文件到cdn,刷新Redis数据
      */

frontendApi/modules/v1/controllers/AtlasController.php

@@ -8,7 +8,6 @@
 
 namespace frontendApi\modules\v1\controllers;
 
-use backendApi\modules\v1\models\lists\shop\BaUserList;
 use common\helpers\Cache;
 use common\helpers\user\Info;
 use common\models\BaUser;
@@ -16,20 +15,16 @@ use common\models\BaUserInfo;
 use common\models\DeclarationLevel;
 use common\models\EmployLevel;
 use common\models\Period;
-use common\models\StarCrownLevel;
 use common\models\UserNetwork;
 use common\models\UserRelation;
 use Yii;
 use common\models\User;
-use yii\data\Pagination;
-use yii\db\Query;
 
 class AtlasController extends BaseController {
     public $modelClass = User::class;
 
     public function behaviors() {
-        $behaviors = parent::behaviors();
-        return $behaviors;
+        return parent::behaviors();
     }
 
     /**