Merge branch 'test'

www/protected/controllers/ROrderController.php

@@ -223,6 +223,7 @@ class ROrderController extends AdminController{
         // 获取用户信息，修改用户订单统计
         //     2015-11-16
         $user_id = $order->user;
+        $order->_id = $id;
         if (!empty($user_id)) {
             $user = RUser::get($user_id);
         } else {
@@ -345,9 +346,7 @@ class ROrderController extends AdminController{
         $order->technicians = $technicians;
 
        // var_dump($order->technicians);exit;
-        $arr_order = array('cancel_time','refund_time','finish_time','status','booking_time','deal_time','remark', 'station', 'technicians');
-
-
+        $arr_order = array('_id','cancel_time','refund_time','finish_time','status','booking_time','deal_time','remark', 'station', 'technicians');
         $success = $order->save(true,$arr_order);
 
         // 通知保洁师

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

@@ -75,6 +75,7 @@ class  OrderController extends O2oBaseController{
                     $price += ($product_obj->price*$product['count']);
                     $product_temp['product'] = $product_obj->_id;
                     $product_temp['count'] = $product['count'];
+                    $product_temp['extra'] = $extra;
                     $product_list[] = $product_temp;
                     if($product_obj->is_extra == 0){
                         $service_type = $product_obj->type;
@@ -133,6 +134,7 @@ class  OrderController extends O2oBaseController{
         $order->precedence = $precedence;
         $order->price = $price;
         $order->channel = $order_channel;
+        $order->counts = $counts;
         $order->final_price = ceil($final_price*100)/100;
         $order->address = $o2o_address;
         $order->memo = $memo;

www/protected/modules/o2o/models/ROrder.php

@@ -351,6 +351,7 @@ class ROrder extends MongoAr
 
             $order = $this->_id;
             $commisionObj = Commision::getByOrder($order);
+            
             // 检查Cmmmision信息是否已录入
             foreach ($this->technicians as $technician_id => $technician) {
 

www/protected/models/data/Recharge.php → www/protected/modules/o2o/models/Recharge.php

@@ -9,9 +9,8 @@
 class Recharge extends MongoAr
 {
     public $_id;
-    public $user_id;//充值用户的id
     public $Denomination;//充值面额
-    public $pay;//充值方式
+    public $time;
     public $presentation;//赠送方式  1 赠送优惠券  2 返现
     public $coupon = array();//赠送的优惠券
     public $cash_back;//返现

www/protected/views/rOrder/index.php

@@ -98,7 +98,7 @@
                                 <li class="f_item">
                                     <div class="box">
                                         <div class="f_label">
-                                            <span>地址/联系方式1: </span>
+                                            <span>地址/联系方式: </span>
                                         </div>
                                         <div class="box_flex f_content">
                                             <span  id="address_contact" style="width: 250px;"></span>
@@ -238,7 +238,7 @@
                                             </div>
                                             <input name="technician_name" style="width: 250px;" id="setTechnician_content"/>
                                             <input name="technician" type="hidden" id="technician_id" value="0" />
-                                            <input name="tech_nums" type="hidden" id="tech_nums" value="1" />
+
                                             <a class='easyui-linkbutton' plain="true" iconCls="icon-add" onclick="add_extra();return false;">添加保洁师</a><br/>
                                             </div>
                                     </div>
@@ -996,14 +996,14 @@
             $('#admins_edit_info').html('');
             var technicians = data['technicians'];
             var tmp = '';
-            var value = 0;
+
             for (var j in technicians) {
                 tmp +='<div id="extra_add_info_'+technicians[j]['technician_id']+'" style="height:4px">'+technicians[j]['technician_name'];
                 /*tmp += '<a href="" onclick="delete_extra('+technicians[j]['technician_id']+');return false;">删除</a></div><br/>';*/
                 tmp += '<input type="hidden" id="extra_add_info_hidden_'+technicians[j]['technician_id']+'" name="extra_add_info_'+technicians[j]['technician_id']+'" value='+technicians[j]['technician_name']+'/></div><br/>';
-                value += 1;
+
             }
-            $('#tech_nums').val(value);
+
 
             var address_contact = '省:'+data['address']['province']+'<br />'+'市:'+data['address']['city']+'<br />'+'区:'+data['address']['area']+'<br />'+'地址:'+data['address']['poi']['name']+' '+data['address']['detail']+'<br />'+'姓名:'+data['address']['name']+'<br />'+'手机号:'+data['address']['mobile']+'<br />'+'<a href="javascript:void();" lat='+data['address']['position'][1]+' lng='+data['address']['position'][0]+' id="view_position">查看坐标</a>';
             $('#address_contact').html(address_contact);
@@ -1534,10 +1534,7 @@ function add_extra(){
         $output +="<a href ='' onclick='delete_extra("+setTechnician_id+");return false;'>删除</a></div><br/>";
         $output +="<input type='hidden' id='extra_add_info_hidden_"+setTechnician_id+"' name='extra_add_info_"+setTechnician_id+"' value='"+setTechnician_content+"' /></div>";
         $('#setTechnician_content').val('');
-        var nums = $('#tech_nums').val();
 
-        var value = nums+1;
-        $('#tech_nums').val(value);
 
         $("#extra_add_info").append($output);
 
@@ -1560,9 +1557,7 @@ function reset_add_extra(){
         $output +="<a href ='' onclick='reset_delete_extra("+resetTec+");return false;'>删除</a></div><br/>";
         $output +="<input type='hidden' id='reset_extra_add_info_hidden_"+resetTec+"' name='reset_extra_add_info_"+resetTec+"' value='"+resetTecName+"' />";
         $output += "<input type='hidden' id='reset_add' name='reset_add' value='1'>";
-        var nums = $('#tech_nums').val();
-        var value = nums+1;
-        $('#tech_nums').val(value);
+
         $("#reset_extra_add_info").append($output);
         $('#resetTecName').val('');
     }