init

www/protected/controllers/ROrderController.php

@@ -9,21 +9,6 @@ class ROrderController extends AdminController{
         $channel_option = ROrder::$channel_option;
         $channels = CommonFn::getComboboxData($channel_option, 100, true, 100);
 
-        $precedence_option = ROrder::$precedence_option;
-        $precedence = CommonFn::getComboboxData($precedence_option, 100, true, 100);
-
-        // 服务信息
-        $criteria_main = new EMongoCriteria();
-        $criteria_main->status('==', 1);
-        $criteria_main->is_extra('==', 0);
-        $cursor_main = Product::model()->findAll($criteria_main);
-        $rows_main = CommonFn::getRowsFromCursor($cursor_main);
-        $main_row = array();
-        foreach($rows_main as $row){
-            $ids = (string)$row['_id'];
-            $main_row[$ids] = array('name' =>$row['name']);
-        }
-        $main_products = CommonFn::getComboboxData($main_row, 100, true, 100);
 
         // 服务点信息
         $criteria_station = new EMongoCriteria();
@@ -43,8 +28,6 @@ class ROrderController extends AdminController{
         $this->render('index', array(
             'status'       => $status,
             'channels'     => $channels,
-            'precedence'   => $precedence,
-            'main_products'=> $main_products,
             'station'      => $station,
             'type'         => $type
         ));
@@ -637,7 +620,6 @@ class ROrderController extends AdminController{
         $channel       = Yii::app()->request->getParam('channel', '');
         $booking_time  = Yii::app()->request->getParam('booking_time_add', '');
         $order_time    = Yii::app()->request->getParam('order_time_add', '');
-        $main_products = Yii::app()->request->getParam('main_products', '');
         $price         = Yii::app()->request->getParam('price', 0);
         $final_price   = Yii::app()->request->getParam('final_price', 0);
         $status        = Yii::app()->request->getParam('status', -3);
@@ -664,10 +646,10 @@ class ROrderController extends AdminController{
             exit;
         }
 
-        if($channel == 'wz_app' || $channel == 'wx_pub'){
-            CommonFn::requestAjax(false, '不能录入渠道为握爪微信||握爪APP的订单', array());
-            exit;
-        }
+        //if($channel == 'wz_app' || $channel == 'wx_pub'){
+            //CommonFn::requestAjax(false, '不能录入渠道为握爪微信||握爪APP的订单', array());
+            //exit;
+        //}
 
         // 时间处理
         $booking_time = strtotime($booking_time);
@@ -692,19 +674,7 @@ class ROrderController extends AdminController{
         // 支付渠道
         $pay_channel = $channel;
 
-        // 服务数据整合
-        $products[] = array(
-            'product' => new MongoId($main_products),
-            'count'   => 1
-        );
-        if (!empty($box)) {
-            foreach ($box as $key => $value) {
-                $products[] = array(
-                    'product' => new MongoId($value),
-                    'count'   => 1
-                );
-            }
-        }
+
 
         // 地址数据整合
         $address = array(
@@ -738,7 +708,6 @@ class ROrderController extends AdminController{
         $rOrder->channel      = $channel;
         $rOrder->booking_time = intval($booking_time);
         $rOrder->order_time   = intval($order_time);
-        $rOrder->products     = $products;
         $rOrder->price        = intval($price);
         $rOrder->final_price  = intval($final_price);
         $rOrder->precedence   = intval($precedence);
@@ -753,7 +722,7 @@ class ROrderController extends AdminController{
         $rOrder->address      = $address;
         $rOrder->pay_channel  = $pay_channel;
 
-        $addROrder_arr = array('channel', 'booking_time', 'order_time', 'products', 'price', 'final_price', 'precedence', 'coupons', 'user', 'status', 'memo', 'remark', 'type', 'have_comment', 'station', 'address', 'pay_channel');
+        $addROrder_arr = array('channel', 'booking_time', 'order_time', 'price', 'final_price', '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/models/ROrder.php

@@ -37,7 +37,6 @@ class ROrder extends MongoAr
     
     public $coupon_type;
 
-    public $append_orders;
 
     public $user;  //对应的RUser 的mongoid
     public $status=0;//订单状态 0=>待支付  1=>已支付  2=>已处理  3=>已接单  4=>已出发  5=>已上门 6=>已完成 -1=>已取消 -2=>已退款
@@ -50,13 +49,12 @@ class ROrder extends MongoAr
 
     public $counts=1;//预订的数量
 
-
-
     public $have_comment = 0; //是否已评价
 
     public $station = '';//服务网点,station的mongoid
 
     public $technicians = array(); // 接单保洁师
+    public $technician = ''; // 接单技师,user的id
     public $technician_name = ''; // 接单技师姓名
 
     public $address = array(); //收货地址信息   包含   province  city  area position detail   name  mobile position
@@ -130,76 +128,6 @@ class ROrder extends MongoAr
         }
     }
 
-    public static function setDianPingStatus($_id,$status){
-        if(CommonFn::isMongoId($_id)){
-            $post_args = array(
-                                    'methodName' => 'updateOrderStatus',
-                                    'orderId' => (string)$_id,
-                                    'status' => intval($status)
-                                    );
-            $sign = CommonFn::getDianPingSing($post_args);
-            if($sign === false){
-                return false;
-            }
-            $post_args['sign'] = $sign;
-            $ch = curl_init();
-            curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
-            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
-            curl_setopt($ch, CURLOPT_URL, 'http://m.api.dianping.com/tohome/openapi/wozhua/');
-            curl_setopt($ch, CURLOPT_POSTFIELDS,$post_args);
-            $result = curl_exec($ch);
-            if($result === false) {
-                    return false;
-            }
-            curl_close($ch);
-            $result = json_decode($result,true);
-            if($result['code'] == 0){
-                return true;
-            }else{
-                return false;
-            }
-        }else{
-            return false;
-        }
-    }
-
-    public static function cancelDianPingOrder($_id){
-        if(CommonFn::isMongoId($_id)){
-            $post_args = array(
-                                    'methodName' => 'partnerCancelOrder',
-                                    'orderId' => (string)$_id
-                                    );
-            $sign = CommonFn::getDianPingSing($post_args);
-            if($sign === false){
-                return false;
-            }
-            $post_args['sign'] = $sign;
-            $ch = curl_init();
-            curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
-            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
-            curl_setopt($ch, CURLOPT_URL, 'http://m.api.dianping.com/tohome/openapi/wozhua/');
-            curl_setopt($ch, CURLOPT_POSTFIELDS,$post_args);
-            $result = curl_exec($ch);
-            if($result === false) {
-                return false;
-            }
-            curl_close($ch);
-            $result = json_decode($result,true);
-            if(isset($result['code']) && $result['code'] == 0){
-                return true;
-            }else{
-                return false;
-            }
-        }else{
-            return false;
-        }
-    }
 
     public static function updateOrderInfo($_id,$info = array()){
         if(CommonFn::isMongoId($_id) && $info){
@@ -252,7 +180,8 @@ class ROrder extends MongoAr
         $newRow['pay_channel'] = CommonFn::get_val_if_isset($row,'pay_channel','');
         $newRow['charge_id'] = CommonFn::get_val_if_isset($row,'charge_id','');
 
-        $newRow['channel'] = CommonFn::get_val_if_isset($row,'channel','Wozhua');
+        $newRow['channel'] = CommonFn::get_val_if_isset($row,'channel','wx_pub');
+        $newRow['type'] = CommonFn::get_val_if_isset($row,'type','');
 
         $newRow['precedence'] = CommonFn::get_val_if_isset($row,'precedence',0);
         $newRow['booking_time'] = CommonFn::get_val_if_isset($row,'booking_time',0);

www/protected/views/rOrder/index.php

@@ -75,16 +75,6 @@
                                         </div>
                                     </div>
                                 </li>
-                                <li class="f_item">
-                                    <div class="box">
-                                        <div class="f_label">
-                                            <span>追加的服务: </span>
-                                        </div>
-                                        <div class="box_flex f_content">
-                                            <span  id="append_info" style="width: 250px;"></span>
-                                        </div>
-                                    </div>
-                                </li>
                                 <li class="f_item">
                                     <div class="box">
                                         <div class="f_label">
@@ -385,34 +375,6 @@
                     </div>
                 </li>
 
-
-
-                <li class="f_item">
-                    <div class="box">
-                        <div class="f_label">
-                            <span>订购的服务: </span>
-                        </div>
-                        <div class="box_flex f_content">
-                            <input id="main_products" name="main_products" />
-                            <br>
-                            <div id="extra_items"></div>
-                        </div>
-                    </div>
-                </li>
-
-                <li class="f_item">
-                    <div class="box">
-                        <div class="f_label">
-                            <span>追加的服务: </span>
-                        </div>
-                        <div class="box_flex f_content">
-                            <input id="append_products" name="append_products" />
-                            <br>
-                            <div id="extra_items"></div>
-                        </div>
-                    </div>
-                </li>
-
                 <li class="f_item">
                     <div class="box">
                         <div class="f_label">
@@ -424,17 +386,6 @@
                     </div>
                 </li>
 
-                <li class="f_item">
-                    <div class="box">
-                        <div class="f_label">
-                            <span>是否加急: </span>
-                        </div>
-                        <div class="box_flex f_content">
-                            <input id="set_precedence" name="precedence" />
-                        </div>
-                    </div>
-                </li>
-
                 <li class="f_item">
                     <div class="box">
                         <div class="f_label">
@@ -545,9 +496,7 @@
     var jq_filter_station = $('#filter_station');
     var module_router = site_root + '/index.php?r=ROrder';
     var status_data = <?php echo json_encode($status); ?>;
-    var precedence_data = <?php echo json_encode($precedence); ?>;
     var channel_data = <?php echo json_encode($channels); ?>;
-    var main_products = <?php echo json_encode($main_products); ?>;
     var type = <?php echo json_encode($type); ?>;
     var station_data = <?php echo json_encode($station); ?>;
 
@@ -751,35 +700,7 @@
             editable: false,
             data: status_data
         });
-        $('#main_products').combobox({
-            editable: false,
-            data: (function () {
-                var main_products_temp = new Array();
-                $.extend(main_products_temp, main_products)
-                main_products_temp.shift();
-
-                return main_products_temp;
-            })(),
-            onSelect: function(rec){
-                $.ajax({
-                    type: "GET",
-                    url: "index.php?r=product/GetExtra",
-                    data: {product_id:rec.value},
-                    dataType: "json",
-                    success: function(data){
-                        var _html = "";
-                        $('#set_type').combobox('setValue',data.type);
-                        for (i in data.data){
-                            _html += '<input type="checkbox" name="box[]" value="'+data.data[i]['id']+'" />'+data.data[i]['name'];
-                        }
 
-                        $('#extra_items').html(_html);
-
-                    }
-                });
-                console.log(rec.value);
-            }
-        });
 
         jq_setStatus_add.combobox({
             editable: false,
@@ -803,16 +724,7 @@
             })()
         });
 
-        jq_set_precedence.combobox({
-            editable : false,
-            data : (function () {
-                var precedence_data_temp = new Array();
-                $.extend(precedence_data_temp, precedence_data);
-                precedence_data_temp.shift();
 
-                return precedence_data_temp;
-            })()
-        });
 
         jq_set_station.combobox({
             editable : false,
@@ -925,14 +837,9 @@
         ]],
         columns:[[
             {field:'id', title:'id', hidden:true},
-            {field:'products', title:'服务', width:30,
+            {field:'type', title:'服务', width:30,
                 formatter: function(value, row){
-                    var returnString = value[0].type_str.replace('宠物','');
-                    if (row.hasSendTec == 1) {
-                        // returnString += '<span style="color:red">&raquo;&raquo;&raquo;</span>';
-                        returnString += '<span class="l-btn-icon icon-ok" style="position:relative;"></span>';
-                    }
-                    return returnString;
+                    return type[value].text;
                 }
             },
             {field:'user', title:'用户', width:50,
@@ -958,11 +865,7 @@
 
                 }
             },
-            {field:'precedence', title:'加急', width:20,sortable:false,
-                formatter: function(value, row){
-                    return get_filed_text(value, precedence_data);
-                }
-            },
+
             {field:'booking_time', title:'预约时间', width:60,sortable:false,formatter: function(value, row){
                 var now=new Date(value*1000);
 
@@ -1061,7 +964,6 @@
                 $('#booking_time').datetimebox('setValue', parse_time(data,'booking_time'));
                 $('#deal_time').datetimebox('setValue', parse_time(data,'deal_time'));
                 $('#product_info').html(product_info);
-                $('#append_info').html(append_info);
 
                 $('#coupon_info').html(coupon_info);
 
@@ -1450,15 +1352,6 @@ function add_content(){
     jq_add_dialog.dialog('open');
 }
 
-function process_append_order(orderid){
-    console.log(orderid);
-    jq_refund_tip_dialog.dialog('close');
-    $.post( "/index.php?r=rOrder/cancelProcess", { orderid: orderid } );
-    parent.load_url('<?php echo Yii::app()->request->baseUrl; ?>/index.php?r=rOrder&id='+orderid);
-}
-function cancel_process_append_order(orderid){
-    jq_refund_tip_dialog.dialog('close');
-}
 function reset_technician() {
     var id = jq_resetTec_form.find('input[name="id"]').val();
     if (id.length == 0) {
@@ -1502,10 +1395,6 @@ function checkAddForm () {
         return false;
     }
 
-    if ($('#main_products').combobox('getValue') == '') {
-        $.messager.alert('提示', '请选择服务', 'warning');
-        return false;
-    }
     if ($('#set_type').combobox('getValue') == '') {
         $.messager.alert('提示', '请选择订单类型', 'warning');
         return false;