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

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

@@ -408,15 +408,18 @@ class  OrderController extends O2oBaseController{
             $coupon_list = array(); 
             $coupon_list['useable_coupons'] = array(); 
             foreach ($coupons as $value) {
-                $c =new EMongoCriteria();
-                $c->sort('time',EMongoCriteria::SORT_DESC);
-                $c->addCond('_id','==',$value->coupon);
-                $coupon = Coupon::model()->find($c);
+                $coupon = Coupon::get($value->coupon);
                 if($coupon->status!=1){
                     continue;
                 }
                 $coupon_list['useable_coupons'][] = $UserCoupon->parseRow($value,array('id','start_time','end_time','start_time_str','end_time_str','coupon'));
             }
+            foreach ($coupon_list['useable_coupons'] as $key => $value) {
+                $name[$key] = $value['start_time'];
+                $rating[$key] = $value['end_time'];
+            }
+            array_multisort($coupon_list['useable_coupons'],SORT_DESC, $rating,$name);
+           // ksort($coupon_list['useable_coupons']);
             if(count($coupon_list['useable_coupons']) <= 15){
                 $criteria = new EMongoCriteria();
                 $criteria->user('==',new MongoId($user_id));