kevin_zhangl 2 yıl önce
ebeveyn
işleme
d4b1b33323

+ 19 - 1
common/models/Period.php

@@ -183,6 +183,15 @@ class Period extends \common\components\ActiveRecord
         }
     }
 
+    public function getTeamsPeriodNum(){
+        $teamsPeriodNum = static::find()->where('IS_CLOSED=1 AND IS_SENT=0')->orderBy('PERIOD_NUM ASC')->asArray()->one();
+        if($teamsPeriodNum){
+            return $teamsPeriodNum['PERIOD_NUM'];
+        } else {
+            return self::SYSTEM_START_PERIOD_NUM;
+        }
+    }
+
     /**
      * 获取当前期的开始时间
      * @return int
@@ -240,7 +249,16 @@ class Period extends \common\components\ActiveRecord
      * @return int|string
      */
     public function getNowYearMonth(){
-        $this->setPeriodNum(122);
+        $this->setPeriodNum();
+        if($this->nowPeriodArr){
+            return $this->nowPeriodArr['CALC_YEAR'].Tool::numFix($this->nowPeriodArr['CALC_MONTH']);
+        } else {
+            return 0;
+        }
+    }
+
+    public function getTeamsYearMonth($periodNum){
+        $this->setPeriodNum($periodNum);
         if($this->nowPeriodArr){
             return $this->nowPeriodArr['CALC_YEAR'].Tool::numFix($this->nowPeriodArr['CALC_MONTH']);
         } else {

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

@@ -128,8 +128,12 @@ class BonusController extends BaseController {
     public function actionTeams() {
         $userId = \Yii::$app->user->id;
         $period = Period::instance();
-        $periodNum = $period->getNowPeriodNum();
-        $month = $period->getNowYearMonth();
+//        $periodNum = $period->getNowPeriodNum();
+//        $month = $period->getNowYearMonth();
+        // 查询最新一期已封期、未挂网期数
+        $periodNum = $period->getTeamsPeriodNum();
+        $month = $period->getTeamsYearMonth($periodNum);
+
         // 判断此业绩期是否已经完成生成了预计算业绩单,生成完毕才能看到
         $isPerfed = Period::checkPerf($periodNum);
         if (!$isPerfed) {