Merge remote-tracking branch 'origin/master'

# Conflicts:
#	backendApi/modules/v1/models/lists/bonus/PeriodBonusList.php

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

@@ -4,7 +4,6 @@ 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\Countries;
@@ -153,9 +152,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                         'width' => '120',
                     ],
                     'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['BONUS_BB'],
-                        ]))->result();
+                        return $row['BONUS_BB']?:'-';
                     },
                 ],
                 'BONUS_PE' => [

frontendApi/modules/v1/controllers/BonusController.php

@@ -314,7 +314,7 @@ class BonusController extends BaseController {
         $data = User::find()
             ->from(User::tableName().' AS U')
             ->join('LEFT JOIN', CalcBonus::tableName() . ' AS B','B.USER_ID = U.ID')
-            ->select('U.ID AS USER_ID, U.USER_NAME, U.LAST_DEC_LV, B.LAST_EMP_LV, B.LAST_ELITE_LV, B.IS_ACTIVE, B.BONUS_E, B.BONUS_PE, B.BONUS_SE, B.BONUS_LB, B.BONUS_ST, B.BONUS_WB, B.BONUS_CAR, B.BONUS_TOTAL, B.BONUS_PB')
+            ->select('U.ID AS USER_ID, U.USER_NAME, U.LAST_DEC_LV, B.LAST_EMP_LV, B.LAST_ELITE_LV, B.IS_ACTIVE, B.BONUS_E, B.BONUS_PE, B.BONUS_SE, B.BONUS_LB, B.BONUS_ST, B.BONUS_WB, B.BONUS_CAR, B.BONUS_TOTAL, B.BONUS_PB, B.BONUS_BB')
             ->where('USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM', [':USER_ID' => \Yii::$app->user->id,':PERIOD_NUM'=>$periodNum])
             ->asArray()
             ->one();
@@ -335,6 +335,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']),
         ];
 
         return static::notice($result);
@@ -350,7 +351,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 +371,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']),
             ];
         }