|
@@ -230,6 +230,7 @@ class OrderController extends O2oBaseController{
|
|
|
$order->pay_channel = 'balance';
|
|
|
}
|
|
|
$order->status = 1;
|
|
|
+ //start 长期订暂用
|
|
|
if($order->status == 1 ) {
|
|
|
if($products[0]['product_id'] == '5835423fa84ea0ac7a8b4568') {
|
|
|
$u_id = new MongoId($user_id);
|
|
@@ -249,6 +250,7 @@ class OrderController extends O2oBaseController{
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ //end暂用
|
|
|
//修改订单状态
|
|
|
CommonFn::sendOrderSms($order,(string)$order->_id);
|
|
|
}else{
|
|
@@ -435,7 +437,6 @@ class OrderController extends O2oBaseController{
|
|
|
}
|
|
|
|
|
|
$UserCoupon = new UserCoupon();
|
|
|
- //var_dump($get_all);
|
|
|
if($get_all){
|
|
|
$criteria = new EMongoCriteria();
|
|
|
$criteria->user('==',new MongoId($user_id));
|
|
@@ -502,15 +503,15 @@ class OrderController extends O2oBaseController{
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- // var_dump($price);
|
|
|
+
|
|
|
$criteria = new EMongoCriteria();
|
|
|
- // var_dump($user_id);
|
|
|
+
|
|
|
$criteria->user('==',new MongoId($user_id));
|
|
|
$current_time = 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();
|