Merge branch 'master' of http://18.167.157.193:1026/guanli/ngds into feature/1940-theo-lastemp

common/helpers/Validator.php

@@ -33,7 +33,7 @@ class Validator extends \yii\validators\Validator {
         'fullPrice'         =>  ["/^\-?[0-9]+([.]{1}[0-9]{1,2})?$/", ' must be in the amount format'], // 必须为金额格式
         'simpleIdCard'  =>  ["/^\d{6}(19|2\d)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)?$/", '必须为身份证号码格式'],
         'userName'  =>  ["|^[a-z0-9]+$|", '只允许小写英文数字'],
-        'realName'  =>  ["/^([\x{4E00}-\x{FA29}]|[\x{E7C7}-\x{E7F3}]|[a-zA-Z0-9])*$/u", '不允许包含特殊字符'],
+        'realName'  =>  ["/^([\x{4E00}-\x{FA29}]|[\x{E7C7}-\x{E7F3}]|[a-zA-Z0-9. ])*$/u", '不允许包含特殊字符'],
         'idCard'        => 'idCardValidate',
         'yearMonth'       =>  ["/^\d{4}([0][0-9]|[1][0-2]|[0-9])$/", '必须为年月格式'],
     ];

common/models/Order.php

@@ -139,13 +139,25 @@ class Order extends \common\components\ActiveRecord
      * 查询当月订单
      */
     public static function fetchOrderCurrentMonth($periodNum, $userId){
-        if($periodNum % 2 == 0){
-            $periods = [$periodNum-1, $periodNum];
-        }else{
-            $periods = [$periodNum];
+        $currentPeriod = Period::findOneAsArray("PERIOD_NUM = :PERIOD_NUM", [':PERIOD_NUM' => $periodNum]);
+
+        switch ($currentPeriod['WEEK_NUMBER']){
+            case 1:
+                $periods = [$periodNum];
+                break;
+            case 2:
+                $periods = [$periodNum-1, $periodNum];
+                break;
+            case 3:
+                $periods = [$periodNum-2, $periodNum-1, $periodNum];
+                break;
+            case 4:
+                $periods = [$periodNum-3, $periodNum-2, $periodNum-1, $periodNum];
+                break;
         }
+
         $periodsStr = implode(",", $periods);
-        $orders = Order::find()->where("USER_ID = '$userId' AND PERIOD_NUM IN (' . $periodsStr . ')");
+        $orders = Order::find()->where("USER_ID = :USER_ID AND PERIOD_NUM IN ($periodsStr)", [':USER_ID' => $userId]);
         return $orders;
     }
 }