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

www/protected/controllers/ROrderController.php

@@ -3,7 +3,7 @@ class ROrderController extends AdminController{
 
     public function actionIndex()
     {
-        
+
         $status_option = ROrder::$status_option;
         $status = CommonFn::getComboboxData($status_option, 100, true, 100);
 

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

@@ -35,8 +35,9 @@ class ActivityController extends O2oBaseController
   //扫码跳转11元订单页面，回掉微信接口，注册用户信息，然后生成订单
   public function actionScanCoupon()
   {
-    $this->redirect('http://common.yiguanjia.me/index.php?r=o2o/web/index');
-
+    //$this->redirect('http://common.yiguanjia.me/index.php?r=o2o/web/index');
+    var_dump(intval(date_create("2016-11-10")->format('U')));
+    var_dump(time());
   }
 
 

www/protected/modules/o2o/controllers/AdvisoryController.php

@@ -22,7 +22,7 @@ class AdvisoryController extends O2oBaseController {
         if ($success == 1) {
             CommonFn::requestAjax(true, '您的咨询已发送成功,请等待我们的企业管家与您联系,温馨提示，一般是一个工作日内，日间致电给您，请留意。');
         }
-        $this->render('Enterprise');
+        $this->render('enterprise');
     }
 
     public function actionSaveAdvisory(){

www/protected/modules/o2o/controllers/WebController.php

@@ -2,10 +2,12 @@
 class WebController extends O2oBaseController {
 
     public function actionIndex() {
+        var_dump($_REQUEST);
         $signPackage = CommonWeixin::get_sign();
         $home_page = Yii::app()->getRequest()->getParam("home_page",'');
         $code = Yii::app()->getRequest()->getParam("code");
         $state = Yii::app()->getRequest()->getParam("state");
+
         $userId = '';
         $appToken = '';
         if($code && $state){
@@ -20,6 +22,7 @@ class WebController extends O2oBaseController {
                     $criteria = new EMongoCriteria();
                     $criteria->unionid('==', $accessInfo['unionid']);
                     $user = RUser::model()->find($criteria);
+                    var_dump($user);
                     if ($user) {
                         $userId = $user->_id;
                         if(!isset($user->wx_pub_openid) || empty($user->wx_pub_openid)){
@@ -54,6 +57,7 @@ class WebController extends O2oBaseController {
                                 $list->push($user_id);
                             }
                             $userId = (string)$userAr->_id;
+
                         }else{
                             var_dump($userAr);exit;
                         }
@@ -63,7 +67,54 @@ class WebController extends O2oBaseController {
                     die();
                 }
             }
+
+        }
+        var_dump($userId);
+        if ($userId) {
+            //start双十一三天登陆发送优惠券 用后删除
+            //三批
+            $criteria = new EMongoCriteria();
+
+            $criteria->coupon('==',new MongoId('5822df8aa84ea04e238b456f'));
+            $criteria->user('==', new MongoId('57e237ea9f5160b6048b4568'));
+            $user_coupon = UserCoupon::model()->find($criteria);
+            if (empty($user_coupon) && time() >= intval(date_create("2016-11-10")->format('U')) && time() <= intval(date_create("2016-11-13")->format('U'))) {
+
+                $coupons = array(
+                    0 => array('5822df8aa84ea04e238b456f', '5822df7ba84ea03e238b456d'),
+                    1 => array('57fe10c69f5160b5048b45d0', '57fe0ed09f5160a2048b456b'),
+                    2 => array('57fe0e029f5160a9048b456a', '57fe0d9b9f5160a3048b4572')
+                );
+                foreach ($coupons as $key => $coupon) {
+                    switch ($key) {
+                        //第一批
+                        case 0:
+                            $start_time = date_create("2016-11-14")->format('U');//发放优惠券可用开始时间 2016.11.14
+                            $end_time = date_create("2016-11-30")->format('U');   //发放优惠券过期时间 17天
+                            break;
+                        //第二批
+                        case 1:
+                            $start_time = date_create("2016-12-01")->format('U');//发放优惠券可用开始时间 2016.11.14
+                            $end_time = date_create("2016-12-15")->format('U');   //发放优惠券过期时间 15天
+                            break;
+                        //第三批
+                        case 2:
+                            $start_time = date_create("2016-12-16")->format('U');//发放优惠券可用开始时间 2016.11.14
+                            $end_time = $start_time + 86400 * 16;   //发放优惠券过期时间 15天
+                            break;
+
+                    }
+                    foreach ($coupon as $c) {
+                        $coupon_id = new MongoId($c);
+                        Service::factory('CouponService')->giveCoupon($userId, $coupon_id, $start_time, $end_time);//发放代金券
+                    }
+                }
+            }
+            //end
+
         }
+
+
         if($home_page){
             $this->renderpartial($home_page.'Index', array(
                 'version' => '2015082505',