Browse Source

订单复购

sunhao 5 years ago
parent
commit
765a2dd392

+ 9 - 2
app/Http/Controllers/Admin/OrderController.php

@@ -22,6 +22,8 @@ class OrderController extends Controller
22 22
             $page = 1;
23 23
         }
24 24
 
25
+        $offset = ($page-1) * $pageSize;
26
+
25 27
         $self_role = session('role_name');
26 28
         if($self_role == '超级管理员' || $self_role == '团队主管'){
27 29
             $admin_id = $request->input('admin_id');
@@ -51,7 +53,7 @@ class OrderController extends Controller
51 53
             if($admin_id) $query->where('admin_id', $admin_id);
52 54
             if($stime) $query->where('createTime', '>=', $stime);
53 55
             if($etime) $query->where('createTime', '<=', $etime);
54
-        })->where('is_del',0)->orderBy('id', 'desc')->get();
56
+        })->where('is_del',0)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
55 57
         $result = json_decode(json_encode($result),true);
56 58
         
57 59
         foreach($result as $k=>&$v){
@@ -148,6 +150,7 @@ class OrderController extends Controller
148 150
         if($request->input('cost')) $order['cost'] = $request->input('cost');  //成本
149 151
         $order['logistics_id'] = $request->input('logistics_id'); //物流单号
150 152
         $order['is_refund'] = (int)$request->input('is_refund'); //是否退过单
153
+        $order['is_fugou'] = (int)$request->input('is_fugou'); //是否复购
151 154
 
152 155
         //商品信息
153 156
         /*
@@ -200,6 +203,7 @@ class OrderController extends Controller
200 203
             }else{
201 204
                 $customers['phone'] = $order['receiverMobile'];
202 205
                 $customers['fanTime'] = $request->input('fanTime');
206
+                $customers['is_fugou'] = $order['is_fugou'];
203 207
                 $in_c = DB::table('customers')->insert($customers);
204 208
             }
205 209
 
@@ -207,7 +211,7 @@ class OrderController extends Controller
207 211
             //unset($order['skuList']);
208 212
             //DB::table('order_goods')->insert($order_goods);
209 213
             //$order['orderCode'] = $mj_add['order']['code']; 
210
-            $admin_id = (int)$request->input('admin_id');
214
+            $admin_id = (int)$request->input('admin_id');   
211 215
             if($admin_id>0){
212 216
                 $admin_info = DB::table('admin')->select('realname', 'team_id')->where('id', $admin_id)->first();
213 217
                 $order['admin_id'] = $admin_id;
@@ -288,6 +292,7 @@ class OrderController extends Controller
288 292
         if($request->input('cost')) $order['cost'] = $request->input('cost');  //成本
289 293
         $order['logistics_id'] = $request->input('logistics_id'); //物流单号
290 294
         $order['is_refund'] = (int)$request->input('is_refund'); //是否退过单
295
+        $order['is_fugou'] = (int)$request->input('is_fugou'); //是否复购
291 296
 
292 297
         $admin_id = (int)$request->input('admin_id');
293 298
         if($admin_id>0){
@@ -492,5 +497,7 @@ class OrderController extends Controller
492 497
         echo $data_str;
493 498
         exit;       
494 499
     }
500
+
501
+
495 502
 }
496 503
 

+ 11 - 0
resources/views/order/ordercreate.blade.php

@@ -159,6 +159,17 @@
159 159
 
160 160
             <div class="row cl">
161 161
                 <label class="form-label col-xs-4 col-sm-2">
162
+                    是否复购:</label>
163
+                <div class="formControls col-xs-6 col-sm-6">
164
+                    <input type="radio" name="is_fugou"  value="0" @if(old('is_fugou')==='0') checked @else checked @endif>
165
+                    <label for="status-1" style="margin-right: 27px;">否</label>
166
+                    <input type="radio" name="is_fugou"  value="1" @if(old('is_fugou')==='1') checked @endif>
167
+                    <label for="status-0">是</label>
168
+                </div>
169
+            </div>
170
+
171
+            <div class="row cl">
172
+                <label class="form-label col-xs-4 col-sm-2">
162 173
                     买家备注:</label>
163 174
                 <div class="formControls col-xs-6 col-sm-6">
164 175
                     <textarea class="textarea" placeholder="填写买家备注..." name="buyerMemo">{{old('buyerMemo')}}</textarea>

+ 11 - 0
resources/views/order/orderedit.blade.php

@@ -126,6 +126,17 @@
126 126
 
127 127
             <div class="row cl">
128 128
                 <label class="form-label col-xs-4 col-sm-2">
129
+                    是否复购:</label>
130
+                <div class="formControls col-xs-6 col-sm-6">
131
+                    <input type="radio" name="is_fugou"  value="0" @if($order['is_fugou']=='0') checked @else checked @endif>
132
+                    <label for="status-1" style="margin-right: 27px;">否</label>
133
+                    <input type="radio" name="is_fugou" value="1" @if($order['is_fugou']=='1') checked @endif>
134
+                    <label for="status-0">是</label>
135
+                </div>
136
+            </div>
137
+
138
+            <div class="row cl">
139
+                <label class="form-label col-xs-4 col-sm-2">
129 140
                     买家备注:</label>
130 141
                 <div class="formControls col-xs-6 col-sm-6">
131 142
                     <textarea class="textarea" placeholder="填写买家备注..." name="buyerMemo">{{$order['buyerMemo']}}</textarea>

+ 4 - 1
resources/views/order/orderlist.blade.php

@@ -134,7 +134,10 @@
134 134
             totalPage: {{$pages}},
135 135
             totalSize: {{$count}},
136 136
             callback: function(num) {
137
-                location.href='index?page='+num;
137
+                var admin_id = $('#admin_id').val();
138
+                var stime = $('#stime').val();
139
+                var etime = $('#etime').val();
140
+                location.href = 'index?page='+num+'&admin_id='+admin_id+'&stime='+stime+'&etime='+etime;
138 141
             }
139 142
         })
140 143