order add fix

www/protected/controllers/ROrderController.php

@@ -482,7 +482,9 @@ class ROrderController extends AdminController{
         $area          = Yii::app()->request->getParam('area', '');
         $poi_name      = Yii::app()->request->getParam('poi_name', '');
         $detail        = Yii::app()->request->getParam('detail', '');
-        $extra =  Yii::app()->request->getParam('extra',array());
+
+        $counts = Yii::app()->request->getParam('counts', 1);
+        $extra =  Yii::app()->request->getParam('extra','[]');
         $extra = json_decode($extra);
 
         // 数据完整性检查
@@ -577,6 +579,7 @@ class ROrderController extends AdminController{
         $rOrder->price        = intval($price);
         $rOrder->final_price  = intval($final_price);
         //$rOrder->precedence   = intval($precedence);
+        $rOrder->counts      = $counts;
         $rOrder->coupons      = $coupons;
         $rOrder->user         = $user;
         $rOrder->status       = intval($status);
@@ -588,7 +591,7 @@ class ROrderController extends AdminController{
         $rOrder->address      = $address;
         $rOrder->pay_channel  = $pay_channel;
 
-        $addROrder_arr = array('channel', 'booking_time', 'order_time', 'price','products', 'final_price', 'precedence', 'coupons', 'user', 'status', 'memo', 'remark', 'type', 'have_comment', 'station', 'address', 'pay_channel');
+        $addROrder_arr = array('channel', 'booking_time', 'order_time', 'price','products', 'final_price', 'counts','precedence', 'coupons', 'user', 'status', 'memo', 'remark', 'type', 'have_comment', 'station', 'address', 'pay_channel');
         $success = $rOrder->save(true, $addROrder_arr);
 
         CommonFn::requestAjax($success, '', array());

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

@@ -16,6 +16,10 @@ class  OrderController extends O2oBaseController{
         $station = Yii::app()->getRequest()->getParam("station");
         $order_channel = Yii::app()->getRequest()->getParam("order_channel");
 
+        $counts = Yii::app()->request->getParam('counts', 1);
+        $extra =  Yii::app()->request->getParam('extra',array());
+        $extra = json_decode($extra);
+
         //CommonFn::requestAjax(false,'系统升级中，暂时不能下单');
         
         if(!$precedence){
@@ -273,8 +277,6 @@ class  OrderController extends O2oBaseController{
                 $user_coupon->update(array('status'),true);
             }
         }
-        // 触宝信息更新
-        $from = Yii::app()->request->getParam('from', '');
 
         $order->status = $status;
         $arr_order = array('status');
@@ -536,7 +538,7 @@ class  OrderController extends O2oBaseController{
     public function actionRetrieve(){
         $user_id = Yii::app()->getRequest()->getParam("user_id");
         $order_id = Yii::app()->getRequest()->getParam("order_id");
-        $from = Yii::app()->request->getParam('from', '');
+
         if(!$user_id || !$order_id ){
             CommonFn::requestAjax(false,CommonFn::getMessage('message','params_illegal'));
         }
@@ -588,7 +590,6 @@ class  OrderController extends O2oBaseController{
     public function actionConfirmComplete(){
         $user_id = Yii::app()->getRequest()->getParam("user_id");
         $order_id = Yii::app()->getRequest()->getParam("order_id");
-        $from = Yii::app()->request->getParam('from', '');
         if(!$user_id || !$order_id ){
             CommonFn::requestAjax(false,CommonFn::getMessage('message','params_illegal'));
         }
@@ -608,22 +609,6 @@ class  OrderController extends O2oBaseController{
 
         $success = $order->update(array('finish_time','status'),true);
         if($success ){
-            $result = Service::factory('ScoreService')->changeScore($user_id,intval($order->final_price),'下单奖爪币');
-            if($result){
-                $z_message = new ZMessage();
-                $from_user = Yii::app()->params['sys_user'];
-                $message_data = array(
-                    'from_user' => $from_user,
-                    'to_user' => $user_id,
-                    'content' => '您成功下单，获得了'.intval($order->final_price).'个爪币的奖励。',
-                    'pics' => array(),
-                    'voice' => array(),
-                    'video'=> array()
-                );
-                $z_message->addMessage($message_data);
-                CommonSMS::send('final_order',array('name' =>$order->address['name'],'num' =>intval($order->final_price),'mobile'=>$order->address['mobile']));
-            }
-
             // 保洁师订单统计
             if ($order->technician) {
                 $tech_obj = TechInfo::get($order->technician);

www/protected/runtime/tm

@@ -1 +0,0 @@
-dd

www/protected/views/rOrder/index.php

@@ -388,10 +388,10 @@
                 <li class="f_item">
                     <div class="box">
                         <div class="f_label">
-                            <span>详细: </span>
+                            <span>补充地址: </span>
                         </div>
                         <div class="box_flex f_content">
-                            <input id="detail_add" name="detail" placeholder="例如：汇智创意园1号406室" style="width: 250px;" />
+                            <input id="detail_add" name="detail" placeholder="例如：1号楼406室" style="width: 250px;" />
                         </div>
                     </div>
                 </li>
@@ -1507,6 +1507,13 @@ function checkAddForm () {
         return false;
     }
 
+    if($('#extra_items').html().length && !$("input[name='extra']:checked").val()){
+        $.messager.alert('提示', '服务详情没有选择', 'warning');
+        return false;
+    }
+
+
+
     return true;
 }
 function delete_extra(msg){