Merge branch 'test' of git.oschina.net:yiguanjia/php into test

www/protected/modules/common/controllers/ActivityController.php

@@ -8,11 +8,6 @@
 
 class ActivityController extends O2oBaseController  {
     //扫码获取代金券
-
-    public function actionIndex(){
-        $this->render('index');exit;
-    }
-
     public function actionGetCoupon() {
         $signPackage = CommonWeixin::get_sign();
         $coupon_id = Yii::app()->request->getParam('coupon_id','');//获取代金券id
@@ -85,7 +80,7 @@ class ActivityController extends O2oBaseController  {
         $coupon_id =new MongoId($coupon_id);
         $start_time = time();                 //发放优惠券可用开始时间
         $end_time = $start_time + 86400*30;   //发放优惠券过期时间
-        $flag = 1;
+        $flag = 0;
         var_dump($userId);
         if ($userId != ""){
             if (!CommonFn::isMongoId($userId)) {