Merge branch 'master' into dev

application/api/controller/Raffle.php

@@ -184,6 +184,8 @@ class Raffle extends Api
         if(empty($where['r_id'])){
             $this->error('活动ID不能为空');
         }
+        //洛杉矶时间
+        date_default_timezone_set("America/Los_Angeles");
         $where['create_day'] =date('Y-m-d');
         return $where;
     }
@@ -272,6 +274,7 @@ class Raffle extends Api
         $prize_arr = $this->getPrize($info['r_id'])['new'];
         $data=array();
         $alphabet = "abcdefghijklmnopqrstuvwxyz";
+        $alphabet=strtoupper($alphabet);
         for($i=0;$i<20;$i++){
             $alphabet = str_shuffle($alphabet);
             $result = substr($alphabet, 0, 1);