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

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

@@ -7,6 +7,7 @@ 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;
@@ -29,17 +30,18 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
     {
         $yearMonth = $this->others['yearMonth'];
         $this->listData = CalcBonus::lists($this->condition, $this->params, [
-            'select'=>'CB.*,UI.CON_UID,UI.REC_UID',
+            'select'=>'CB.*,UI.CON_UID,UI.REC_UID,PO.CALC_YEAR,PO.CALC_MONTH',
             'from' => CalcBonus::tableName().' AS CB',
             'join' => [
                 ['INNER JOIN', UserInfo::tableName() . ' AS UI', 'CB.USER_ID=UI.USER_ID'],
+                ['INNER JOIN', Period::tableName() . ' AS PO', 'PO.PERIOD_NUM=CB.PERIOD_NUM'],
             ],
             'yearMonth' => $yearMonth,
             'orderBy' => 'CB.CREATED_AT DESC, CB.ID DESC',
             'page' => $this->page,
             'pageSize' => $this->pageSize,
         ]);
-        unset($yearMonth);
+
         if ($this->listData['list']) {
             foreach ($this->listData['list'] as $key => $value) {
                 $this->listData['list'][$key]['LAST_DEC_LV_NAME'] = Cache::getDecLevelConfig()[$value['LAST_DEC_LV']]['LEVEL_NAME'];
@@ -48,6 +50,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                 $this->listData['list'][$key]['LAST_STATUS_NAME'] = Tool::paramConvert(Yii::$app->params['userStatus'])[$value['LAST_STATUS']]['label'];
                 $this->listData['list'][$key]['LAST_REC_USER_NAME'] = Info::getUserNameByUserId($value['REC_UID']);
                 $this->listData['list'][$key]['LAST_REC_REAL_NAME'] = Info::getUserRealNameByUserId($value['REC_UID']);
+                $this->listData['list'][$key]['BONUS_YEAR_MONTH'] = $value['CALC_YEAR'] . ($value['CALC_MONTH'] >= 10 ? $value['CALC_MONTH'] : '0' . $value['CALC_MONTH']);
             }
         }
     }
@@ -69,7 +72,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                         'tag'=>['type'=>'', 'size' => 'small', 'class'=>'no-border'],
                     ],
                 ],
-                'CALC_MONTH' => [
+                'BONUS_YEAR_MONTH' => [
                     'header' => Yii::t('ctx', 'bonusMonth'), // 结算月
                     'headerOther' => [
                         'width' => '110',