退款必填时间和金额

app/Http/Controllers/Admin/OrderController.php

@@ -207,6 +207,7 @@ class OrderController extends Controller
             'last_url'      => 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'],
             'overtime'      => $overtime,
             'warehouse'      => $warehouse,
+            'thisTime'      => date('Y-m-d H:i:s'),
             ]);
     }
 
@@ -1143,10 +1144,22 @@ class OrderController extends Controller
      * @param Request $request
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function set_refund($id)
+    public function set_refund(Request $request)
     {
+        $id = (int)$request->input('refund_id');
+        $aftersale_fee = trim($request->input('refund_money'));
+        $aftersale_reason = trim($request->input('refund_reason'));
+        $aftersale_time = $request->input('refund_time');
+
+        if(empty($aftersale_fee) || empty($aftersale_time)){
+            exit('<script>alert("必须填写退款金额和时间");history.back()</script>');
+        }
         $order = Order::find($id);
         $order->status = 4;
+        $order->aftersale_fee = $aftersale_fee;
+        $order->aftersale_reason = $aftersale_reason;
+        $order->aftersale_time = $aftersale_time;
+
         DB::beginTransaction();
         try{
             if ($order ->save()){
@@ -1156,10 +1169,7 @@ class OrderController extends Controller
                     $del['eshopCode'] = $order->eshopCode;
                     $del['outerCode'] = $order->outerCode;
                     $del['code'] = $order->orderCode;
-                    $mj_del = Order::mjOrderDel($del);
-                    if( $mj_del == false ){
-                        throw new Exception("订单同步到卖家云失败");
-                    }
+                    
                 }
                 #记录操作日志
                 $self_id = session('admin_id');

app/Http/routes.php

@@ -85,7 +85,7 @@ Route::group(['prefix' => 'admin'], function(){
         Route::get('/order/teamAdmins/{team_id}', 'Admin\OrderController@teamAdmins');
         Route::get('/order/editLogisticsId', 'Admin\OrderController@editLogisticsId');
         Route::get('/order/setrefund/{id}', 'Admin\OrderController@setrefund');  //设为退货 弃用
-        Route::get('/order/set_refund/{id}', 'Admin\OrderController@set_refund');  //设为退货 用于c仓同步到卖家取消订单，不删除单子
+        Route::post('/order/setrefundinfo', 'Admin\OrderController@set_refund');  //设为退货 用于c仓同步到卖家取消订单，不删除单子
         Route::get('/order/setverify/{id}', 'Admin\OrderController@setverify');  //设为已审核
         Route::get('/order/setverifymore', 'Admin\OrderController@setverifymore');  //设为已审核
 

resources/views/order/orderlist.blade.php

@@ -306,6 +306,61 @@
                 </div>
             </div>
         </div>
+
+         <!--弹出层 推入分组-->
+        <div id="modal-demo2" class="modal fade" tabnonautomatic_index="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content radius">
+                    <div class="modal-body" style="height:340px">
+                        <div class="cl pd-5 bg-1 bk-gray mt-20">
+                            
+                            <form class="form form-horizontal" method="POST" action="/admin/order/setrefundinfo" enctype="multipart/form-data">
+                                <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+                                <input id='refund_id' type="hidden" name="refund_id" value=""/>
+
+                                <div class="row cl">
+                                <label class="form-label col-xs-4 col-sm-2">
+                                    退款金额：</label>
+                                    <div class="formControls col-xs-6 col-sm-6">
+                                        <input type="text" class="input-text" value="" placeholder="请填写退款金额" name="refund_money">
+                                    </div>
+                                </div>
+
+                                <div class="row cl">
+                                <label class="form-label col-xs-4 col-sm-2">
+                                    退款时间：</label>
+                                    <div class="formControls col-xs-6 col-sm-6">
+                                        <input id="ad_time" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss' })" class="input-text Wdate" style="width:70%;text-align:center;" name="refund_time" value="{{$thisTime}}">
+                                    </div>
+                                </div>
+
+                                <div class="row cl">
+                                <label class="form-label col-xs-4 col-sm-2">
+                                    退款原因：</label>
+                                    <div class="formControls col-xs-6 col-sm-6">
+                                        <textarea class="textarea" placeholder="请填写退款原因" name="refund_reason"></textarea>
+                                    </div>
+                                </div>
+
+
+                                <div class="row cl">
+                                    <div class="col-9 col-offset-2">
+                                        <button type="submit" class="btn btn-primary radius">提交</button>
+                                        <button class="btn radius" data-dismiss="modal" aria-hidden="true">关闭</button>
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
+                        <br>
+                        {{--<div style="float:right">--}}
+                            {{--<button class="btn btn-primary radius" onclick='submits(this,"{{$page}}")' value="&nbsp;&nbsp;确定&nbsp;&nbsp;">&nbsp;&nbsp;确定&nbsp;&nbsp;</button>&nbsp;--}}
+                            {{--<button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>--}}
+                        {{--</div>--}}
+                    </div>
+                </div>
+            </div>
+        </div>
+
         <div id="page" class="page_div"></div>
     </div>
     
@@ -354,12 +409,11 @@
         }
 
         /*广告-移除*/
-        function set_refund(id){
-            var msg = '确认要设为退款吗？';          
-            layer.confirm(msg,function(index){
-                location.href='/admin/order/set_refund/'+id;
-            });
+        function set_refund(id){         
+            $("#refund_id").val(id);
+            $("#modal-demo2").modal("show");               
         }
+
         /*广告-设为首页隐藏*/
         function down(obj,id){
             layer.confirm('确认要设为首页隐藏吗？',function(index){