feat: NG-71: 会员奖金计算调整

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

@@ -119,59 +119,59 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'BONUS_TOTAL' => [
-                    'header' => Yii::t('ctx', 'sponsorName'), // 总奖金
+                    'header' => Yii::t('ctx', 'totalBonus'), // 总奖金
+                    'headerOther' => [
+                        'width' => '120',
+                    ],
+                ],
+                'BONUS_E' => [
+                    'header' => Yii::t('ctx', 'eliteBonus'), // Elite奖金
+                    'headerOther' => [
+                        'width' => '120',
+                    ],
+                ],
+                'BONUS_PE' => [
+                    'header' => Yii::t('ctx', 'proEliteBonus'), // Pro_Elite奖金
+                    'headerOther' => [
+                        'width' => '120',
+                    ],
+                ],
+                'BONUS_SE' => [
+                    'header' => Yii::t('ctx', 'superEliteBonus'), // Super_Elite奖金
+                    'headerOther' => [
+                        'width' => '120',
+                    ],
+                ],
+                'BONUS_LB' => [
+                    'header' => Yii::t('ctx', 'leaderShipBonus'), // LeaderShip奖金
+                    'headerOther' => [
+                        'width' => '120',
+                    ],
+                ],
+                'BONUS_ST' => [
+                    'header' => Yii::t('ctx', 'stockistBonus'), // 店铺奖
+                    'headerOther' => [
+                        'width' => '120',
+                    ],
+                ],
+                'BONUS_PB' => [
+                    'header' => Yii::t('ctx', 'performanceBonus'), // Performance Bonus
+                    'headerOther' => [
+                        'width' => '120',
+                    ],
+                ],
+                'BONUS_WB' => [
+                    'header' => Yii::t('ctx', 'welcomeBonus'), // 迎新奖
+                    'headerOther' => [
+                        'width' => '120',
+                    ],
+                ],
+                'BONUS_CAR' => [
+                    'header' => Yii::t('ctx', 'carBonus'), // 车奖
                     '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;

common/helpers/bonus/BonusSend.php

@@ -442,7 +442,10 @@ class BonusSend extends BaseObject {
         return true;
     }
 
-    public function sentMemberLevel()
+    /**
+     * @return bool
+     */
+    public function sentMemberLevel(): bool
     {
         $transaction = Yii::$app->db->beginTransaction();
         try {

common/messages/en-US/ctx.php

@@ -623,7 +623,6 @@ return [
     'superiorCode' => 'Superior Code',
     'superiorName' => 'Superior Name',
     'superiorNumber' => 'Superior Number',
-    'welcomeBonus' => 'Welcome Bonus',
     'teamBonus' => 'Team Bonus',
     'uncappedTeamBonus' => 'Uncapped Team Bonus',
     'directorBonus' => 'Director Bonus',
@@ -631,6 +630,14 @@ return [
     'quarterlyBonus' => 'Quarterly Bonus',
     'actualBonus' => 'Actual Bonus',
     'totalBonus' => 'Total Bonus',
+    'eliteBonus' => 'Elite Bonus',
+    'proEliteBonus' => 'Pro Elite Bonus',
+    'superEliteBonus' => 'Super Elite Bonus',
+    'leaderShipBonus' => 'LeaderShip Bonus',
+    'stockistBonus' => 'Stockist Bonus',
+    'performanceBonus' => 'Performance Bonus',
+    'welcomeBonus' => 'Welcome Bonus',
+    'carBonus' => 'Car Bonus',
     'totalRevenue' => 'Total Revenue',
     'bonusMonth' => 'Bonus Month',
     'oneNewMarketPerformance' => 'I. new market performance',

common/messages/zh-CN/ctx.php

@@ -624,7 +624,6 @@ return [
     'sponsorName' => '开拓者姓名',
     'superiorCode' => '上级编号',
     'superiorName' => '上级姓名',
-    'welcomeBonus' => '销售奖金',
     'teamBonus' => '绩效奖金',
     'uncappedTeamBonus' => '绩效奖未封顶金额',
     'directorBonus' => '管理奖/蓝星奖',
@@ -632,6 +631,14 @@ return [
     'quarterlyBonus' => '季度分红',
     'actualBonus' => '实发奖金',
     'totalBonus' => '总奖金',
+    'eliteBonus' => 'Elite奖金',
+    'proEliteBonus' => 'Pro Elite奖金',
+    'superEliteBonus' => 'Super Elite奖金',
+    'leaderShipBonus' => 'LeaderShip奖金',
+    'stockistBonus' => '店铺奖',
+    'performanceBonus' => '绩效奖金',
+    'welcomeBonus' => '迎新奖',
+    'carBonus' => '车奖',
     'totalRevenue' => '总收入',
     'bonusMonth' => '结算月',
     'superiorNumber' => '上级编号',