Merge branch 'feature/NG-71' of http://16.162.42.175:8014/guanli/ngds into feature/NG-71

backendApi/modules/v1/controllers/BonusController.php

@@ -880,6 +880,15 @@ class BonusController extends BaseController {
             'LAST_PERIOD_AT' => 'CB.LAST_PERIOD_AT',
             'LAST_CREATED_AT' => 'CB.LAST_CREATED_AT',
             'CALC_MONTH' => 'CB.CALC_MONTH',
+            'BONUS_TOTAL' => 'CB.BONUS_TOTAL',
+            'BONUS_E' => 'CB.BONUS_E',
+            'BONUS_PE' => 'CB.BONUS_PE',
+            'BONUS_SE' => 'CB.BONUS_SE',
+            'BONUS_LB' => 'CB.BONUS_LB',
+            'BONUS_ST' => 'CB.BONUS_ST',
+            'BONUS_WB' => 'CB.BONUS_WB',
+            'BONUS_CAR' => 'CB.BONUS_CAR',
+            'BONUS_PB' => 'CB.BONUS_PB',
         ]);
         $period = Period::instance();
         $yearMonth = $period->getYearMonth($periodNum);

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

@@ -4,12 +4,10 @@ namespace backendApi\modules\v1\models\lists\bonus;
 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\Period;
 use common\models\UserInfo;
-use common\libs\dataList\column\DateTime;
 use Yii;
 
 class PeriodBonusList extends \common\libs\dataList\DataList implements DataListInterface
@@ -120,13 +118,60 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                         'width' => '150',
                     ],
                 ],
-                'LAST_REC_REAL_NAME' => [
-                    'header' => Yii::t('ctx', 'sponsorName'), // 开拓者姓名
+                'BONUS_TOTAL' => [
+                    'header' => Yii::t('ctx', 'sponsorName'), // 总奖金
                     'headerOther' => [
                         'width' => '120',
                     ],
                 ],
-
+//                'BONUS_E' => [
+//                    'header' => Yii::t('ctx', 'sponsorName'), // Elite奖金
+//                    'headerOther' => [
+//                        'width' => '120',
+//                    ],
+//                ],
+//                'BONUS_PE' => [
+//                    'header' => Yii::t('ctx', 'sponsorName'), // Pro_Elite奖金
+//                    'headerOther' => [
+//                        'width' => '120',
+//                    ],
+//                ],
+//                'BONUS_SE' => [
+//                    'header' => Yii::t('ctx', 'sponsorName'), // Super_Elite奖金
+//                    'headerOther' => [
+//                        'width' => '120',
+//                    ],
+//                ],
+//                'BONUS_LB' => [
+//                    'header' => Yii::t('ctx', 'sponsorName'), // LeaderShip奖金
+//                    'headerOther' => [
+//                        'width' => '120',
+//                    ],
+//                ],
+//                'BONUS_ST' => [
+//                    'header' => Yii::t('ctx', 'sponsorName'), // 店铺奖
+//                    'headerOther' => [
+//                        'width' => '120',
+//                    ],
+//                ],
+//                'BONUS_PB' => [
+//                    'header' => Yii::t('ctx', 'sponsorName'), // Performance Bonus
+//                    'headerOther' => [
+//                        'width' => '120',
+//                    ],
+//                ],
+//                'BONUS_WB' => [
+//                    'header' => Yii::t('ctx', 'sponsorName'), // 迎新奖
+//                    'headerOther' => [
+//                        'width' => '120',
+//                    ],
+//                ],
+//                'BONUS_CAR' => [
+//                    'header' => Yii::t('ctx', 'sponsorName'), // 车奖
+//                    'headerOther' => [
+//                        'width' => '120',
+//                    ],
+//                ],
             ];
         }
         return $this->columns;

frontendApi/modules/v1/controllers/BonusController.php

@@ -396,26 +396,25 @@ class BonusController extends BaseController {
      * @return mixed
      * @throws \yii\web\HttpException
      */
-    public function actionOther(){
+    public function actionOther() {
         //获取可以查看几期奖金
         $showBonusPeriodNum = Cache::getSystemConfig()['showBonusPeriodNum']['VALUE'];
-        $calcBonus = CalcBonus::find()->where('USER_ID=:USER_ID AND IS_SENT=1', [':USER_ID' => \Yii::$app->user->id])
-        ->select('PERIOD_NUM,ORI_BONUS_QY,ORI_BONUS_YC,ORI_BONUS_VIP,ORI_BONUS_STANDARD,ORI_BONUS_BD,ORI_BONUS_TG,
-        ORI_BONUS_XF,BONUS_TOTAL,MANAGE_TAX,BONUS_REAL,BONUS_INCOME,ORI_BONUS_YJ,ORI_BONUS_GX,ORI_BONUS_GL,RECONSUME_POINTS,
-        LAST_DEC_LV,LAST_EMP_LV,EXCHANGE_POINTS,ORI_BONUS_BS,ORI_BONUS_BS_MNT,ORI_BONUS_BS_ABBR,ORI_BONUS_QUARTER,BONUS_TOURISM,BONUS_GARAGE')
-        ->limit($showBonusPeriodNum)
-        ->orderBy('PERIOD_NUM DESC')
-        ->asArray()
-        ->all();
         $sysConfig = Cache::getSystemConfig();
 
+        $calcBonus = CalcBonus::find()->where('USER_ID=:USER_ID AND IS_SENT=1', [':USER_ID' => \Yii::$app->user->id])
+            ->select('PERIOD_NUM,CALC_MONTH,LAST_DEC_LV,LAST_EMP_LV,LAST_ELITE_LV,BONUS_TOTAL,BONUS_E,BONUS_PE,BONUS_SE,BONUS_LB,BONUS_ST,BONUS_WB,BONUS_CAR,BONUS_PB')
+            ->limit($showBonusPeriodNum)
+            ->orderBy('PERIOD_NUM DESC')
+            ->asArray()
+            ->all();
+
         //增加明细开关控制(0 只显示总奖金 1 全部显示)
         $flowBonusSwitch = Cache::getSystemConfig()['flowBonusSwitch']['VALUE'];
 
         $bonusSwitch = [
-            'welcomeBonusSwitch' => intval($sysConfig['openTG']['VALUE']),
-            'teamBonusSwitch' => intval($sysConfig['openQY']['VALUE']),
-            'stockistCommissionSwitch' => intval($sysConfig['openFW']['VALUE']),
+            'welcomeBonusSwitch' => 0,
+            'teamBonusSwitch' => 0,
+            'stockistCommissionSwitch' => 0,
         ];
 
         $result = [];
@@ -424,24 +423,18 @@ class BonusController extends BaseController {
                 $result[$key]['PERIOD_NUM'] = ['name' => '期数', 'value' => $data['PERIOD_NUM']];
                 $result[$key]['LAST_DEC_NAME'] = ['name' => '级别', 'value' => Cache::getDecLevelConfig()[$data['LAST_DEC_LV']]['LEVEL_NAME']];
                 $result[$key]['LAST_EMP_NAME'] = ['name' => '聘级', 'value' => Cache::getEmpLevelConfig()[$data['LAST_EMP_LV']]['LEVEL_NAME']];
+                $result[$key]['LAST_ELITE_NAME'] = ['name' => 'Elite级别', 'value' => Cache::getEliteLevelConfig()[$data['LAST_ELITE_LV']]['LEVEL_NAME']];
+
+                $result[$key]['BONUS_E'] = ['name' => 'Elite奖金', 'value' => Tool::formatPrice($data['BONUS_E'])];
+                $result[$key]['BONUS_PE'] = ['name' => 'SuperElite奖金', 'value' => Tool::formatPrice($data['BONUS_PE'])];
+                $result[$key]['BONUS_SE'] = ['name' => 'ProElite奖金', 'value' => Tool::formatPrice($data['BONUS_SE'])];
+                $result[$key]['BONUS_LB'] = ['name' => 'LeaderShip奖金', 'value' => Tool::formatPrice($data['BONUS_LB'])];
+                $result[$key]['BONUS_ST'] = ['name' => '店铺奖', 'value' => Tool::formatPrice($data['BONUS_ST'])];
+                $result[$key]['BONUS_WB'] = ['name' => '迎新奖', 'value' => Tool::formatPrice($data['BONUS_WB'])];
+                $result[$key]['BONUS_CAR'] = ['name' => '车奖', 'value' => Tool::formatPrice($data['BONUS_CAR'])];
+                $result[$key]['BONUS_TOTAL'] = ['name' => '总奖金', 'value' => Tool::formatPrice($data['BONUS_TOTAL'])];
 
-                // 销售奖金,就是原来的推广奖金
-                if ($sysConfig['openTG']['VALUE']) {
-                    $result[$key]['BONUS_TG'] = ['name' => '销售奖金', 'value' => Tool::formatPrice($data['ORI_BONUS_TG'])];
-                }
-                // 业绩奖金,就是原来的团队奖  并将业绩奖金改成绩效奖金
-                if ($sysConfig['openQY']['VALUE']) {
-                    $result[$key]['ORI_BONUS_QY'] = ['name' => '业绩奖金', 'value' => Tool::formatPrice($data['ORI_BONUS_QY'])];
-                }
-                if ($sysConfig['openFW']['VALUE']) {
-                    $result[$key]['BONUS_BD'] = ['name' => '服务奖金', 'value' => Tool::formatPrice($data['ORI_BONUS_BD'])];
-                }
-                $result[$key]['ORI_BONUS_BS'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($data['ORI_BONUS_BS'])];
-                $result[$key]['ORI_BONUS_BS_MNT'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($data['ORI_BONUS_BS_MNT'])];
-                $result[$key]['ORI_BONUS_BS_ABBR'] = ['name' => '绩效奖金', 'value' => Tool::formatPrice($data['ORI_BONUS_BS_ABBR'])];
-                $result[$key]['ORI_BONUS_QUARTER'] = ['name' => '季度奖金', 'value' => Tool::formatPrice($data['ORI_BONUS_QUARTER'] ?? 0)];
-                $result[$key]['BONUS_TOTAL'] = ['name' => '合计', 'value' => Tool::formatPrice($data['BONUS_TOTAL'])];
-                $result[$key]['BONUS_REAL'] = ['name' => '实发奖金', 'value' => Tool::formatPrice($data['BONUS_REAL'])];
+                $result[$key]['BONUS_PB'] = ['name' => '绩效奖金', 'value' => Tool::formatPrice($data['BONUS_PB'])];
             } else {
                 $result[$key]['BONUS_TOTAL'] = ['name' => '总奖金', 'value' => Tool::formatPrice($data['BONUS_TOTAL'])];
             }
@@ -459,11 +452,14 @@ class BonusController extends BaseController {
     {
         $calcBonus = CalcBonus::find()->where('USER_ID=:USER_ID AND IS_SENT=1', [':USER_ID' => \Yii::$app->user->id])
             ->select([
-                'IFNULL(SUM(ORI_BONUS_TG), 0.00) AS ORI_BONUS_TG',
-                'IFNULL(SUM(ORI_BONUS_QY), 0.00) AS ORI_BONUS_QY',
-                'IFNULL(SUM(ORI_BONUS_BD), 0.00) AS ORI_BONUS_BD',
-                'IFNULL(SUM(ORI_BONUS_BS), 0.00) AS ORI_BONUS_BS',
-                'IFNULL(SUM(ORI_BONUS_QUARTER), 0.00) AS ORI_BONUS_QUARTER',
+                'IFNULL(SUM(BONUS_E), 0.00) AS BONUS_E',
+                'IFNULL(SUM(BONUS_PE), 0.00) AS BONUS_PE',
+                'IFNULL(SUM(BONUS_SE), 0.00) AS BONUS_SE',
+                'IFNULL(SUM(BONUS_ST), 0.00) AS BONUS_ST',
+                'IFNULL(SUM(BONUS_LB), 0.00) AS BONUS_LB',
+                'IFNULL(SUM(BONUS_WB), 0.00) AS BONUS_WB',
+                'IFNULL(SUM(BONUS_CAR), 0.00) AS BONUS_CAR',
+                'IFNULL(SUM(BONUS_PB), 0.00) AS BONUS_PB',
                 'IFNULL(SUM(BONUS_TOTAL), 0.00) AS BONUS_TOTAL'
             ])
             ->asArray()
@@ -472,39 +468,22 @@ class BonusController extends BaseController {
         // 增加明细开关控制(0 只显示总奖金 1 全部显示)
         $flowBonusSwitch = Cache::getSystemConfig()['flowBonusSwitch']['VALUE'];
 
-        $sysConfig = Cache::getSystemConfig();
-        $bonusSwitch = [
-            'welcomeBonusSwitch' => intval($sysConfig['openTG']['VALUE']),
-            'teamBonusSwitch' => intval($sysConfig['openQY']['VALUE']),
-            'stockistCommissionSwitch' => intval($sysConfig['openFW']['VALUE']),
-        ];
-
-        if ($calcBonus) {
-            if ($flowBonusSwitch) {
-                if ($sysConfig['openTG']['VALUE']) {
-                    $calcBonus['BONUS_TG'] = ['name' => '销售奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_TG'])];
-                } else {
-                    $calcBonus['BONUS_TG'] = ['name' => '销售奖金', 'value' => 0.00];
-                }
-                if ($sysConfig['openQY']['VALUE']) {
-                    $calcBonus['ORI_BONUS_QY'] = ['name' => '业绩奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_QY'])];
-                } else {
-                    $calcBonus['ORI_BONUS_QY'] = ['name' => '业绩奖金', 'value' => 0.00];
-                }
-                if ($sysConfig['openFW']['VALUE']) {
-                    $calcBonus['BONUS_BD'] = ['name' => '服务奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BD'])];
-                } else {
-                    $calcBonus['BONUS_BD'] = ['name' => '服务奖金', 'value' => 0.00];
-                }
-
-                $calcBonus['ORI_BONUS_BS'] = ['name' => '蓝星奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BS'])];
-                $calcBonus['ORI_BONUS_QUARTER'] = ['name' => '季度奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_QUARTER'])];
-            }
-
-            $calcBonus['BONUS_TOTAL'] = ['name' => '总奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_TOTAL'])];
-        }
+//        if ($calcBonus) {
+//            if ($flowBonusSwitch) {
+//                $flowBonusSwitch['BONUS_E'] = ['name' => 'Elite奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_E'])];
+//                $flowBonusSwitch['BONUS_PE'] = ['name' => 'SuperElite奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_PE'])];
+//                $flowBonusSwitch['BONUS_SE'] = ['name' => 'ProElite奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_SE'])];
+//                $flowBonusSwitch['BONUS_LB'] = ['name' => 'LeaderShip奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_LB'])];
+//                $flowBonusSwitch['BONUS_ST'] = ['name' => '店铺奖', 'value' => Tool::formatPrice($calcBonus['BONUS_ST'])];
+//                $flowBonusSwitch['BONUS_WB'] = ['name' => '迎新奖', 'value' => Tool::formatPrice($calcBonus['BONUS_WB'])];
+//                $flowBonusSwitch['BONUS_CAR'] = ['name' => '车奖', 'value' => Tool::formatPrice($calcBonus['BONUS_CAR'])];
+//                $flowBonusSwitch['BONUS_PB'] = ['name' => '绩效奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_PB'])];
+//            }
+//
+//            $calcBonus['BONUS_TOTAL'] = ['name' => '总奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_TOTAL'])];
+//        }
 
-        return static::notice(['tableData' => [$calcBonus], 'bonusSwitch' => $bonusSwitch]);
+        return static::notice(['tableData' => [$calcBonus], 'bonusSwitch' => $flowBonusSwitch]);
     }
 
     /**
@@ -540,8 +519,8 @@ class BonusController extends BaseController {
      */
     public function actionDecPeriod() {
         $showDecPeriodNum = Cache::getSystemConfig()['showDecPeriodNum']['VALUE'];
-        $data = Period::find()->where('IS_SENT=:IS_SENT',[':IS_SENT' => Period::SEND_FINISH])->select('PERIOD_NUM,END_TIME')->limit($showDecPeriodNum)->orderBy('PERIOD_NUM DESC')->asArray()->all();
-        return static::notice($data);
+        $calcBonus = Period::find()->where('IS_SENT=:IS_SENT',[':IS_SENT' => Period::SEND_FINISH])->select('PERIOD_NUM,END_TIME')->limit($showDecPeriodNum)->orderBy('PERIOD_NUM DESC')->asArray()->all();
+        return static::notice($calcBonus);
     }
 
     /**