s

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<0){
+        if($name == ''||$alias_name == '' || !$value ||!$min_price ){
             CommonFn::requestAjax(false, '必填内容为空');
         }
 

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

@@ -44,9 +44,6 @@ class  OrderController extends O2oBaseController{
             $order = ROrder::model()->findAll($criteria_user);
             $o = CommonFn::getRowsFromCursor($order);
 
-            /*if(!empty($o)) {
-                CommonFn::requestAjax(false, '对不起，日常保洁两小时体验只能购买一单，你已经抢购过');
-            }*/
             foreach ($o as $value) {
                 if ($value['status'] == 0 || $value['status'] == -1) {
                     $t = ROrder::model()->get(new MongoId($value['_id']));
@@ -233,7 +230,7 @@ class  OrderController extends O2oBaseController{
                 $order->pay_channel = 'balance';
             }
             $order->status = 1;
-           /* if($order->status == 1 ) {
+            if($order->status == 1 ) {
                 if($products[0]['product_id'] == '5835423fa84ea0ac7a8b4568') {
                     $u_id = new MongoId($user_id);
                     $start_time = date_create("2016-11-11")->format('U');//发放优惠券可用开始时间 2016.11.14
@@ -251,7 +248,7 @@ class  OrderController extends O2oBaseController{
                         }
                     }
                 }
-            }*/
+            }
             //修改订单状态
             CommonFn::sendOrderSms($order,(string)$order->_id);
         }else{
@@ -357,7 +354,7 @@ class  OrderController extends O2oBaseController{
             // 支付成功后用户有效订单数增加
             if (isset($user_obj->order_count)) {
                 $user_obj->order_count += 1;
-               /* //支付成功 判断是否是长期定
+                //支付成功 判断是否是长期定 start
                 if($order->products[0]['product'] == '5835423fa84ea0ac7a8b4568') {
                     $u_id = new MongoId($user_id);
                     $start_time = date_create("2016-11-11")->format('U');//发放优惠券可用开始时间 2016.11.14
@@ -372,8 +369,8 @@ class  OrderController extends O2oBaseController{
                             Service::factory('CouponService')->giveCoupon($u_id, new MongoId("5835527fa84ea02e758b45b7"), $start_time, $end_time);//发放代金券
                         }
                     }
-                }*/
-
+                }
+                // 长期定end
             } else {
                 $user_obj->order_count = 1;
             }