会员端查询PGS、活跃；管理端月业绩显示PGS

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

@@ -3,6 +3,7 @@ namespace backendApi\modules\v1\models\lists\bonus;
 
 use common\helpers\Cache;
 use common\helpers\user\Info;
+use common\models\CalcBonusBSDefault;
 use common\models\PerfMonth;
 use common\models\User as modelUser;
 use common\libs\dataList\column\Price;
@@ -28,7 +29,7 @@ class PerfMonthList extends \common\libs\dataList\DataList implements DataListIn
     public function dataHandle()
     {
         $data = PerfMonth::lists($this->condition, $this->params, [
-            'select'=>'PM.*, U.USER_NAME, U.REAL_NAME,RU.USER_NAME REC_USER_NAME,RU.REAL_NAME REC_REAL_NAME,',
+            'select'=>'PM.*, U.USER_NAME, U.REAL_NAME,RU.USER_NAME REC_USER_NAME,RU.REAL_NAME REC_REAL_NAME',
             'from' => PerfMonth::tableName().' AS PM',
             'join' => [
                 ['LEFT JOIN', modelUser::tableName() . ' AS U', 'PM.USER_ID=U.ID'],
@@ -64,7 +65,7 @@ class PerfMonthList extends \common\libs\dataList\DataList implements DataListIn
                 'USER_NAME' => [
                     'header' => 'Member Code', // 会员编号
                     'headerOther' => [
-                        'width' => '110',
+                        'width' => '120',
                     ],
                 ],
                 'REAL_NAME' => [
@@ -108,6 +109,17 @@ class PerfMonthList extends \common\libs\dataList\DataList implements DataListIn
                         ]))->result();
                     },
                 ],
+                'PV_PGS' => [
+                    'header' => 'Director PGS Performance', // 管理奖个人小组业绩
+                    'headerOther' => [
+                        'width' => '190',
+                    ],
+                    'value' => function($row) {
+                        return (new Price([
+                            'value' => $row['DIRECTOR_BONUS_PGS'],
+                        ]))->result();
+                    },
+                ],
                 'VIP_PV_1L_ZC' => [
                     'header' => 'L. New Market Entry Performance', // 一市场新增报单业绩
                     'headerOther' => [

common/models/CalcBonusBSDefault.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "{{%CALC_BONUS_BS_DETAIL}}".
+ *
+ * @property string $ID ID
+ * @property string $USER_ID 会员ID
+ * @property string $GPV10 个人小组业绩
+ */
+class CalcBonusBSDefault extends \common\components\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return '{{%CALC_BONUS_BS_DETAIL}}';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['ID'], 'unique'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'ID' => 'ID',
+            'USER_ID' => '会员ID',
+            'GPV10' => '个人小组业绩',
+        ];
+    }
+}

frontendApi/modules/v1/controllers/BonusController.php

@@ -16,6 +16,7 @@ use common\helpers\Tool;
 use common\helpers\user\Info;
 use common\helpers\user\Perf;
 use common\models\CalcBonus;
+use common\models\CalcBonusBSDefault;
 use common\models\CalcBonusBT;
 use common\models\CalcBonusFL;
 use common\models\DealType;
@@ -28,6 +29,7 @@ use common\models\FlowTourismPoints;
 use common\models\FlowVillaPoints;
 use common\models\FlowWallet;
 use common\models\PerfMonth;
+use common\models\PerfPeriod;
 use common\models\Period;
 use common\models\DecRole;
 use common\models\EmployLevel;
@@ -408,7 +410,12 @@ class BonusController extends BaseController {
             $data['SURPLUS_2L'] = ['name' => '二市场结余业绩', 'value' => Tool::formatFrontPerf($calcBonus['SURPLUS_2L'])];
 //            $data['SURPLUS_3L'] = ['name' => '三市场结余业绩', 'value' => Tool::formatFrontPerf($calcBonus['SURPLUS_3L'])];
 
-
+            // 是否活跃
+            $perfPeriod = PerfPeriod::find()->where('USER_ID=:USER_ID AND PERIOD_NUM = :PERIOD_NUM', [':USER_ID' => \Yii::$app->user->id, ':PERIOD_NUM' => $periodNum])->asArray()->one();
+            $data['IS_ACTIVE'] = ['name' => '是否活跃', 'value' => ($perfPeriod['IS_ACTIVE'] ?? 0)];
+            // 管理奖个人小组业绩
+            $calcBonusBS = CalcBonusBSDefault::findOneAsArray('USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM', [':USER_ID' => \Yii::$app->user->id, ':PERIOD_NUM' => $periodNum], 'GPV10');
+            $data['DIRECTOR_BONUS_PGS'] = ['name' => '个人小组业绩', 'value' => ($calcBonusBS['GPV10'] ?? 0)];
 
             // if ($sysConfig['openYC']['VALUE']) {
             //     $data[] = ['name' => '荣衔奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_YC'])];

frontendEle/src/views/bonus/other.vue

@@ -30,11 +30,13 @@
           <el-descriptions-item class="bonus-item" label="Member Code">{{newData.USER_NAME.value}}</el-descriptions-item><!-- 用户编号 -->
           <el-descriptions-item class="bonus-item" label="Pay Cycle">{{newData.PERIOD_NUM.value}}</el-descriptions-item><!-- 期数 -->
           <el-descriptions-item class="bonus-item" label="Member Level">{{newData.LAST_DEC_LV.value}}</el-descriptions-item><!-- 会员等级 -->
+          <el-descriptions-item class="bonus-item" label="Whether Active">{{ newData.IS_ACTIVE.value === 1 ? 'Yes' : 'No' }}</el-descriptions-item><!-- 是否活跃 -->
           <el-descriptions-item class="bonus-item" label="Latest Director">{{newData.LAST_EMP_LV.value}}</el-descriptions-item><!-- 会员管理星级 -->
           <el-descriptions-item class="bonus-item" label="Latest Crown">{{newData.LAST_CROWN_LV.value}}</el-descriptions-item><!-- 会员皇冠星级 -->
+          <el-descriptions-item class="bonus-item" label="Director PGS Performance">{{newData.DIRECTOR_BONUS_PGS.value}}</el-descriptions-item><!-- 管理奖个人小组业绩 -->
+          <el-descriptions-item class="bonus-item" label="Director Bonus">{{newData.ORI_BONUS_BS.value}}</el-descriptions-item><!-- 蓝星奖金/管理奖 -->
           <el-descriptions-item class="bonus-item" label="Welcome Bonus" v-if="newData.ORI_BONUS_TG_SWITCH === 1">{{newData.ORI_BONUS_TG.value}}</el-descriptions-item><!-- 销售奖金 -->
           <el-descriptions-item class="bonus-item" label="Team Bonus" v-if="newData.ORI_BONUS_QY_SWITCH === 1">{{newData.ORI_BONUS_QY.value}}</el-descriptions-item><!-- 绩效奖 -->
-          <el-descriptions-item class="bonus-item" label="Director Bonus">{{newData.ORI_BONUS_BS.value}}</el-descriptions-item><!-- 蓝星奖金/管理奖 -->
           <el-descriptions-item class="bonus-item" label="Quarterly Bonus">{{newData.ORI_BONUS_QUARTER.value}}</el-descriptions-item><!-- 季度分红 -->
           <el-descriptions-item class="bonus-item" label="Stockist Commission" v-if="newData.BONUS_BD_SWITCH === 1">{{newData.BONUS_BD.value}}</el-descriptions-item><!-- 服务中心 -->
           <el-descriptions-item class="bonus-item" label="Total Bonus">{{newData.BONUS_TOTAL.value}}</el-descriptions-item><!-- 合计 -->