|
@@ -403,6 +403,7 @@ class OrderController extends O2oBaseController{
|
|
|
$current_time = time();
|
|
|
$criteria->end_time('>=',$current_time);
|
|
|
$criteria->status('==',1);
|
|
|
+ $criteria->sort('start_time',EMongoCriteria::SORT_DESC);
|
|
|
$coupons = UserCoupon::model()->findAll($criteria);
|
|
|
$coupon_list = array();
|
|
|
$coupon_list['useable_coupons'] = array();
|
|
@@ -417,6 +418,7 @@ class OrderController extends O2oBaseController{
|
|
|
$criteria = new EMongoCriteria();
|
|
|
$criteria->user('==',new MongoId($user_id));
|
|
|
$criteria->status('==',-1);
|
|
|
+ $criteria->sort('start_time',EMongoCriteria::SORT_DESC);
|
|
|
$coupons = UserCoupon::model()->findAll($criteria);
|
|
|
$coupon_list['used_coupons'] = array();
|
|
|
foreach ($coupons as $value) {
|
|
@@ -428,7 +430,7 @@ class OrderController extends O2oBaseController{
|
|
|
$criteria->user('==',new MongoId($user_id));
|
|
|
$current_time = time();
|
|
|
$criteria->end_time('<',$current_time);
|
|
|
- $criteria->sort('coupon',EMongoCriteria::SORT_DESC);
|
|
|
+ $criteria->sort('start_time',EMongoCriteria::SORT_DESC);
|
|
|
$coupons = UserCoupon::model()->findAll($criteria);
|
|
|
$coupon_list['overtime_coupons'] = array();
|
|
|
foreach ($coupons as $value) {
|
|
@@ -467,6 +469,7 @@ class OrderController extends O2oBaseController{
|
|
|
$criteria->start_time('<=',$current_time);
|
|
|
$criteria->end_time('>=',$current_time);
|
|
|
$criteria->status('==',1);
|
|
|
+ $criteria->sort('start_time',EMongoCriteria::SORT_DESC);
|
|
|
$coupons = UserCoupon::model()->findAll($criteria);
|
|
|
$coupon_list = array();
|
|
|
$unuseable_coupons = array();
|