|
|
@@ -157,13 +157,16 @@ class Withdraw extends \common\components\ActiveRecord {
|
|
|
*/
|
|
|
public static function getPeriod($nowTime) {
|
|
|
$period = Period::instance();
|
|
|
+ $nowPeriodNum = $period->getNowPeriodNum();
|
|
|
$year = $period->getNowYear();
|
|
|
$month = $period->getNowMonth();
|
|
|
$yearMonth = $period->getNowYearMonth();
|
|
|
- $thisMonth = Period::getPeriodNumRangeFromMonth($year, $month);
|
|
|
- $period->setPeriodNum($thisMonth['min']);
|
|
|
+// $thisMonth = Period::getPeriodNumRangeFromMonth($year, $month);
|
|
|
+// $period->setPeriodNum($thisMonth['min']);
|
|
|
+ $period->setPeriodNum($nowPeriodNum);
|
|
|
$endTime = $period->getNowPeriodEnd();
|
|
|
- return ['nowPeriodNum' => $thisMonth['min'], 'nowYear' => $year, 'nowMonth' => $month, 'yearMonth'=>$yearMonth, 'endTime' => $endTime];
|
|
|
+// return ['nowPeriodNum' => $thisMonth['min'], 'nowYear' => $year, 'nowMonth' => $month, 'yearMonth'=>$yearMonth, 'endTime' => $endTime];
|
|
|
+ return ['nowPeriodNum' => $nowPeriodNum, 'nowYear' => $year, 'nowMonth' => $month, 'yearMonth'=>$yearMonth, 'endTime' => $endTime];
|
|
|
}
|
|
|
|
|
|
/**
|