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

www/protected/controllers/CouponController.php

@@ -67,7 +67,7 @@ class CouponController extends AdminController{
         if($status == 100 ){
             CommonFn::requestAjax(false, '必须指定状态和服务类型！');
         }
-        if($name == ''||$alias_name == '' || !$value ||!$min_price ){
+        if($name == ''||$alias_name == '' || !$value ||$min_price<0){
             CommonFn::requestAjax(false, '必填内容为空');
         }
 

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

@@ -438,6 +438,7 @@ class  OrderController extends O2oBaseController{
         }
         
         $UserCoupon = new UserCoupon();
+        var_dump($get_all);
         if($get_all){
             $criteria = new EMongoCriteria();
             $criteria->user('==',new MongoId($user_id));
@@ -504,15 +505,16 @@ class  OrderController extends O2oBaseController{
                 }
             }
         }
-  
+        var_dump($price);
         $criteria = new EMongoCriteria();
         $criteria->user('==',new MongoId($user_id));
         $current_time = time();
-        $criteria->start_time('<=',$current_time);
-        $criteria->end_time('>=',$current_time);
+       // $criteria->start_time('<=',$current_time);
+        //$criteria->end_time('>=',$current_time);
         $criteria->status('==',1);
-
+        var_dump($criteria);
         $coupons = UserCoupon::model()->findAll($criteria);
+
         $coupon_list = array(); 
         $unuseable_coupons = array();
         foreach ($coupons as $value) {