m

app/Http/Controllers/Admin/OrderController.php

@@ -1019,6 +1019,7 @@ class OrderController extends Controller
         $aftersale_fee = $request->input('aftersale_fee');
         $aftersale_reason = $request->input('aftersale_reason');
         $aftersale_time = $request->input('aftersale_time');
+        $refund_time = $request->input('refund_time');
         $refund_price = $request->input('refund_price');
 
         $data = array();
@@ -1038,8 +1039,14 @@ class OrderController extends Controller
         if(isset($aftersale_fee)) $data['aftersale_fee'] = trim($aftersale_fee);
         if(isset($aftersale_reason)) $data['aftersale_reason'] = trim($aftersale_reason);
         if(isset($aftersale_time)) $data['aftersale_time'] = trim($aftersale_time);
+        if(isset($refund_time)) $data['refund_time'] = trim($refund_time);
         if(isset($refund_price)){
-            if(empty($refund_price)) $refund_price = null; 
+            if(empty($refund_price)){
+                $refund_price = null; 
+                $data['is_refund'] = 0;
+            }else{
+                $data['is_refund'] = 1;
+            }
             $data['refund_price'] = $refund_price;
         }
         if($id>0 && !empty($data)){

app/Http/Controllers/Admin/StatisticsController.php

@@ -1666,7 +1666,7 @@ class StatisticsController extends Controller
         $total_data['new_roi'] = $total_data['cost']>0 ? round($total_data['new_order_amount'] / $total_data['cost'], 4) * 100 .'%' : '';
 
         $indexKey = ['ad_time','city','total_cost','conversion_times','new_fan_count','new_order_count','new_order_amount','new_roi','order_count','order_amount','total_roi'];
-        $title = ['日期', '城市', '投放成本', '加粉数', '新粉数量', '新粉成单数', '新粉收入', '新粉ROI', '累计成单数', '累计收入', '累计ROI'];
+        $title = ['日期', '城市', '投放成本', '加粉数', '下单人数', '新粉成单数', '新粉收入', '新粉ROI', '累计成单数', '累计收入', '累计ROI'];
         $filename = 'district_roi_'.date('Y-m-d_H').'.xlsx';
         return Order::export_excel($result, $filename, $indexKey, $title);
     }
@@ -2060,7 +2060,7 @@ class StatisticsController extends Controller
         }
 
         $indexKey = ['ad_time','city','cost','gzh_count','fan_count','new_fan_order_count','new_fan_order_amount','new_roi','order_count','order_amount','total_roi'];
-        $title = ['日期', '城市', '投放成本', '加粉数', '新粉数量', '新粉成单数', '新粉收入', '新粉ROI', '7日累计成单数', '7日累计收入', '7日累计ROI'];
+        $title = ['日期', '城市', '投放成本', '加粉数', '下单人数', '新粉成单数', '新粉收入', '新粉ROI', '7日累计成单数', '7日累计收入', '7日累计ROI'];
         $filename = 'districtRoi7day_'.date('Y-m-d_H').'.xlsx';
         return Order::export_excel($result, $filename, $indexKey, $title);
     }
@@ -2143,7 +2143,7 @@ class StatisticsController extends Controller
         }
 
         $indexKey = ['city','cost','gzh_count','fan_count','new_fan_order_count','new_fan_order_amount','new_roi','order_count','order_amount','total_roi'];
-        $title = ['城市', '投放成本', '加粉数', '新粉数量', '新粉成单数', '新粉收入', '新粉ROI', '7日累计成单数', '7日累计收入', '7日累计ROI'];
+        $title = ['城市', '投放成本', '加粉数', '下单人数', '新粉成单数', '新粉收入', '新粉ROI', '7日累计成单数', '7日累计收入', '7日累计ROI'];
         $filename = 'districtRoi7day_'.date('Y-m-d_H').'.xlsx';
         return Order::export_excel($result, $filename, $indexKey, $title);
     }
@@ -2234,7 +2234,7 @@ class StatisticsController extends Controller
         }
 
         $indexKey = ['ad_time','city','cost','gzh_count','fan_count','new_fan_order_count','new_fan_order_amount','new_roi','order_count','order_amount','total_roi'];
-        $title = ['日期', '城市', '投放成本', '加粉数', '新粉数量', '新粉成单数', '新粉收入', '新粉ROI', '累计成单数', '累计收入', '累计ROI'];
+        $title = ['日期', '城市', '投放成本', '加粉数', '下单人数', '新粉成单数', '新粉收入', '新粉ROI', '累计成单数', '累计收入', '累计ROI'];
         $filename = 'districtRoi30day_'.date('Y-m-d_H').'.xlsx';
         return Order::export_excel($result, $filename, $indexKey, $title);
     }
@@ -2317,7 +2317,7 @@ class StatisticsController extends Controller
         }
 
         $indexKey = ['city','cost','gzh_count','fan_count','new_fan_order_count','new_fan_order_amount','new_roi','order_count','order_amount','total_roi'];
-        $title = ['城市', '投放成本', '加粉数', '新粉数量', '新粉成单数', '新粉收入', '新粉ROI', '累计成单数', '累计收入', '累计ROI'];
+        $title = ['城市', '投放成本', '加粉数', '下单人数', '新粉成单数', '新粉收入', '新粉ROI', '累计成单数', '累计收入', '累计ROI'];
         $filename = 'districtRoi30day_'.date('Y-m-d_H').'.xlsx';
         return Order::export_excel($result, $filename, $indexKey, $title);
     }

resources/views/order/orderlist.blade.php

@@ -76,6 +76,7 @@
                     <th width="2%">是否退补单</th>                                                       
                     <th width="4%">应该退补差价</th> 
                     <th width="5%">退补备注</th>                 
+                    <th width="5%">退补时间</th>                 
                     <th width="4%">所属销售</th> 
                     <th width="4%">订单状态</th>                  
                     <th width="4%">审核时间</th>                  
@@ -145,7 +146,11 @@
                                 <textarea id="refund_note_2{{$a['id']}}" rows=4 style="display: none"  name='refund_note' onblur="change_refund_note({{$a['id']}})" >{{$a['refund_note']}}</textarea>
                                 <span class="sort_icon" hidden  onClick='change_refund_note_click("{{$a['id']}}","{{$a['refund_note']}}")' style="cursor:pointer"><i class="Hui-iconfont">&#xe647;</i></span>
                             </td>
-
+                            <td class ="change_logistics_id"> 
+                                <p id="refund_time_1{{$a['id']}}">{{$a['refund_time']}}</p> 
+                                <input id="refund_time_2{{$a['id']}}" style="display: none"  name='refund_time' onblur="change_refund_time({{$a['id']}})" value="{{$a['refund_time']}}"  onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss' })" class=" Wdate" />
+                                <span class="sort_icon" hidden  onClick='change_refund_time_click("{{$a['id']}}","{{$a['refund_time']}}")' style="cursor:pointer"><i class="Hui-iconfont">&#xe647;</i></span>
+                            </td>
 
                             <td>{{$a['admin_name']}}</td>
                             <td id="order_verify{{$a['id']}}">{{$a['status_name']}}</td>
@@ -475,6 +480,29 @@
             });
         }
 
+        function change_refund_time_click(id, refund_time){
+            $("#refund_time_1"+id).hide();
+            $("#refund_time_2"+id).show();
+            $("#refund_time_2"+id).focus();
+        }
+
+        function change_refund_time(id){
+            var refund_time = $("#refund_time_2"+id).val();
+            if(!refund_time){
+                return false;
+            }
+            $.ajax({
+                url: '/admin/order/editLogisticsId?id='+id+'&refund_time='+refund_time,
+                type: 'get',
+                dateType: 'json',
+                success:function(msg){
+                    $("#refund_time_1"+id).html(refund_time);
+                    $("#refund_time_1"+id).show();
+                    $("#refund_time_2"+id).hide();
+                }
+            });
+        }
+
         function change_aftersale_reason_click(id, aftersale_reason){
             $("#aftersale_reason_1"+id).hide();
             $("#aftersale_reason_2"+id).show();

resources/views/statistics/districtRoi.blade.php

@@ -34,7 +34,7 @@
                 <ul>
                     <li>总投放成本：&yen;{{$total_data['cost']}}&nbsp;&nbsp;&nbsp;&nbsp;
                     总加粉数：{{$total_data['conversion_times']}}&nbsp;&nbsp;&nbsp;&nbsp;
-                    总新粉数量：{{$total_data['fan_count']}}&nbsp;&nbsp;&nbsp;&nbsp;
+                    总下单人数：{{$total_data['fan_count']}}&nbsp;&nbsp;&nbsp;&nbsp;
                     新粉成单数：{{$total_data['new_order_count']}}&nbsp;&nbsp;&nbsp;&nbsp;
                     新粉收入：&yen;{{$total_data['new_order_amount']}}&nbsp;&nbsp;&nbsp;&nbsp;
                     新粉ROI：{{$total_data['new_roi']}}&nbsp;&nbsp;&nbsp;&nbsp;
@@ -53,7 +53,7 @@
                     <th width="5%">城市</th>
                     <th width="5%">投放成本</th>
                     <th width="5%">加粉数</th>
-                    <th width="5%">新粉数量</th>
+                    <th width="5%">下单人数</th>
                     <th width="5%">新粉成单数</th>
                     <th width="5%">新粉收入</th>
                     <th width="5%">新粉ROI</th>

resources/views/statistics/districtRoi30day.blade.php

@@ -35,7 +35,7 @@
                     <th width="5%">城市</th>
                     <th width="5%">投放成本</th>
                     <th width="5%">加粉数</th>
-                    <th width="5%">新粉数量</th>
+                    <th width="5%">下单人数</th>
                     <th width="5%">新粉成单数</th>
                     <th width="5%">新粉收入</th>
                     <th width="5%">新粉ROI</th>

resources/views/statistics/districtRoi30dayTotal.blade.php

@@ -29,7 +29,7 @@
                     <th width="5%">城市</th>
                     <th width="5%">投放成本</th>
                     <th width="5%">加粉数</th>
-                    <th width="5%">新粉数量</th>
+                    <th width="5%">下单人数</th>
                     <th width="5%">新粉成单数</th>
                     <th width="5%">新粉收入</th>
                     <th width="5%">新粉ROI</th>

resources/views/statistics/districtRoi7day.blade.php

@@ -35,7 +35,7 @@
                     <th width="5%">城市</th>
                     <th width="5%">投放成本</th>
                     <th width="5%">加粉数</th>
-                    <th width="5%">新粉数量</th>
+                    <th width="5%">下单人数</th>
                     <th width="5%">新粉成单数</th>
                     <th width="5%">新粉收入</th>
                     <th width="5%">新粉ROI</th>

resources/views/statistics/districtRoi7dayTotal.blade.php

@@ -29,7 +29,7 @@
                     <th width="5%">城市</th>
                     <th width="5%">投放成本</th>
                     <th width="5%">加粉数</th>
-                    <th width="5%">新粉数量</th>
+                    <th width="5%">下单人数</th>
                     <th width="5%">新粉成单数</th>
                     <th width="5%">新粉收入</th>
                     <th width="5%">新粉ROI</th>