#19 4370分支-4718的改动

Слито
ryan001 слито 4 коммит(ов) из guanli/feature/EK-4370 в guanli/master 1 месяц назад

+ 3 - 3
backendApi/modules/v1/models/lists/bonus/PeriodBonusList.php

@@ -151,9 +151,9 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     'headerOther' => [
                         'width' => '120',
                     ],
-//                    'value' => function ($row) {
-//                        return 0.00;
-//                    },
+                    'value' => function($row) {
+                        return $row['BONUS_BB']?:'-';
+                    },
                 ],
                 'BONUS_PE' => [
                     'header' => Yii::t('ctx', 'proEliteBonus'), // Pro_Elite奖金

+ 2 - 1
frontendApi/modules/v1/controllers/BonusController.php

@@ -350,7 +350,7 @@ class BonusController extends BaseController {
         $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,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')
+            ->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,BONUS_BB')
             ->limit($showBonusPeriodNum)
             ->orderBy('PERIOD_NUM DESC')
             ->asArray()
@@ -370,6 +370,7 @@ class BonusController extends BaseController {
                 'carBonus' => Tool::formatPrice($data['BONUS_CAR']),
                 'totalBonus' => Tool::formatPrice($data['BONUS_TOTAL']),
                 'userPerformanceBonus' => Tool::formatPrice($data['BONUS_PB']),
+                'userBuilderBonus' => Tool::formatPrice($data['BONUS_BB']),
             ];
         }