m

app/Http/Controllers/Admin/OrderController.php

@@ -486,7 +486,7 @@ class OrderController extends Controller
             'receiverCity'           => 'required|between:1,10', 
             'receiverAddress'           => 'required', 
             'delivery_date'           => 'required|date', 
-            'createTime'           => 'required|date', 
+            //'createTime'           => 'required|date', 
             'receivedAmount'           => 'required|numeric|min:1', 
             //'goods_note'           => 'required|min:1',  
             'warehouse'           => 'required|integer|min:1',  
@@ -505,7 +505,7 @@ class OrderController extends Controller
             'receiverCity.between'           => '市填写有误',   
             'receiverAddress.required'           => '详细地址不能为空',             
             'delivery_date.required'           => '预发货时间不能为空',   
-            'createTime.required'           => '下单时间不能为空',   
+            //'createTime.required'           => '下单时间不能为空',   
             'receivedAmount.required'           => '付款金额不能为空',                   
             'receivedAmount.numeric'           => '付款金额必须为数字',                   
             'goods_note.required'           => '商品信息不能为空',                   
@@ -563,7 +563,7 @@ class OrderController extends Controller
         $order['receivedAmount'] = trim($request->input('receivedAmount')); //付款金额        
         $order['buyerMemo'] = trim($request->input('buyerMemo', '')); // 买家备注
         $order['sellerMemo'] = trim($request->input('sellerMemo', '')); // 卖家备注
-        $order['createTime'] = !empty($request->input('createTime')) ? $request->input('createTime') : date('Y-m-d H:i:s'); // 订单创建时间
+        $order['createTime'] = date('Y-m-d H:i:s'); // 订单创建时间
         $order['modifyTime'] = date('Y-m-d H:i:s'); // 订单修改时间
         $order['should_amount'] = $request->input('should_amount');
         if(!$order['should_amount']) $order['should_amount'] = null;
@@ -761,7 +761,7 @@ class OrderController extends Controller
             'receiverCity'           => 'required|between:1,10', 
             'receiverAddress'           => 'required', 
             'delivery_date'           => 'required|date', 
-            'createTime'           => 'required|date', 
+            //'createTime'           => 'required|date', 
             'receivedAmount'           => 'required|numeric|min:1', 
             //'goods_note'           => 'required|min:1',  
             'warehouse'           => 'required|integer|min:1',    
@@ -778,7 +778,7 @@ class OrderController extends Controller
             'receiverCity.between'           => '市填写有误',   
             'receiverAddress.required'           => '详细地址不能为空',             
             'delivery_date.required'           => '预发货时间不能为空',   
-            'createTime.required'           => '下单时间不能为空',   
+            //'createTime.required'           => '下单时间不能为空',   
             'receivedAmount.required'           => '付款金额不能为空',                   
             'receivedAmount.numeric'           => '付款金额必须为数字',                   
             'goods_note.required'           => '商品信息不能为空',                   
@@ -815,7 +815,7 @@ class OrderController extends Controller
         $order['is_fugou'] = (int)$request->input('is_fugou'); //是否复购
         $order['warehouse'] = (int)$request->input('warehouse'); //仓库
         $order['delivery_date'] = !empty($request->input('delivery_date')) ? $request->input('delivery_date') : date('Y-m-d'); //发货日期
-        if(!empty($request->input('createTime'))) $order['createTime'] = $request->input('createTime'); // 订单创建时间
+        //if(!empty($request->input('createTime'))) $order['createTime'] = $request->input('createTime'); // 订单创建时间
         $order['order_status'] = (int)$request->input('order_status');
         $order['payment_type'] = (int)$request->input('payment_type'); //支付方式
         //$order['status'] = (int)$request->input('status');
@@ -881,7 +881,7 @@ class OrderController extends Controller
             $orderSkus['receivedAmount'] = $order['receivedAmount'];
             $orderSkus['buyerMemo'] = $order['buyerMemo'];
             $orderSkus['sellerMemo'] = $order['sellerMemo'];
-            $orderSkus['createTime'] = $order['createTime'];
+            $orderSkus['createTime'] = $old_order->createTime;
             $orderSkus['modifyTime'] = $old_order->modifyTime;
             
         }

resources/views/order/ordercreate.blade.php

@@ -228,7 +228,7 @@
                 <label class="form-label col-xs-4 col-sm-2">
                     <font color='red'>* </font>下单时间：</label>
                 <div class="formControls col-xs-6 col-sm-6">
-                    <input id="createTime" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss' })" autocomplete="off"  class="input-text Wdate" style="width:22%;text-align:center;" name="createTime" value="{{old('createTime')}}"> <font color='red'> *默认今天 </font>                  
+                    <input id="createTime" type="text" autocomplete="off"  class="input-text" style="width:22%;text-align:center;" name="createTime" value="{{$createTime}}" disabled> <font color='red'> *默认当前时间 </font>                                    
                 </div>
             </div>
 
@@ -676,11 +676,7 @@
             layer.msg('预发货时间不能为空!',{icon:2,time:1500});
             return false;
         }
-        var createTime = $("input[name=createTime]").val();
-        if(!createTime){
-            layer.msg('下单时间不能为空!',{icon:2,time:1500});
-            return false;
-        }
+        
         var warehouse = $("#warehouse").val();
         if(warehouse<1){
             layer.msg('仓库必须选择!',{icon:2,time:1500});

resources/views/order/orderedit.blade.php

@@ -232,8 +232,10 @@
                 <div class="formControls col-xs-6 col-sm-6">
                     <input type="radio" name="payment_type"  value="1" @if($order['payment_type']=='1') checked  @endif>
                     <label for="status-1" style="margin-right: 27px;">微信支付</label>
-                    <input type="radio" name="payment_type" value="2" @if($order['payment_type']=='2') checked @endif>
+                    @if($order['payment_type']=='2')
+                    <input type="radio" name="payment_type" value="2"  checked >
                     <label for="status-0" style="margin-right: 27px;">付款码支付</label>
+                    @endif
                     <input type="radio" name="payment_type" value="3" @if($order['payment_type']=='3') checked @endif>
                     <label for="status-0" style="margin-right: 27px;">个体户支付</label>
                 </div>
@@ -284,7 +286,7 @@
                 <label class="form-label col-xs-4 col-sm-2">
                     <font color='red'>* </font>下单时间：</label>
                 <div class="formControls col-xs-6 col-sm-6">
-                    <input id="createTime" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss' })" class="input-text Wdate" style="width:22%;text-align:center;" name="createTime" value="{{$order['createTime']}}"> <font color='red'>  </font>                  
+                    <input id="createTime" type="text"  class="input-text" style="width:22%;text-align:center;" name="createTime" value="{{$order['createTime']}}" disabled> <font color='red'> *不可变更 </font>                  
                 </div>
             </div>
 

resources/views/order/orderlist.blade.php

@@ -170,7 +170,8 @@
                                 <select id="refund_type_2{{$a['id']}}" style="display: none" name='refund_type' value="{{$a['refund_type']}}" onchange="change_refund_type({{$a['id']}})">
                                     <option value='0'>-请选择-</option>
                                     <option value='1'>微信支付</option>
-                                    <option value='2'>付款码支付</option>
+                                    <!--option value='2'>付款码支付</option-->
+                                    <option value='3'>个体户支付</option>
                                 </select>
                                 <span class="sort_icon" hidden  onClick='change_refund_type_click("{{$a['id']}}","{{$a['cost']}}")' style="cursor:pointer"><i class="Hui-iconfont">&#xe647;</i></span>
                             </td>
@@ -682,6 +683,9 @@
                     if(refund_type==2){
                         refund_type = '付款码支付';
                     }
+                    if(refund_type==3){
+                        refund_type = '个体户支付';
+                    }
                     if(refund_type==0){
                         refund_type = '';
                     }

resources/views/statistics/teamFinanceTotal.blade.php

@@ -28,19 +28,23 @@
                 <tr class="text-c">
                     <th width="5%">团队</th>
                     <th width="5%">时间</th>
-                    <th width="5%">总单数</th>
+                    <th width="4%">总单数</th>
                     <th width="5%">成交金额</th>
                     <th width="5%">微信支付金额</th>
                     <th width="5%">付款码支付金额</th>
-                    <th width="5%">售后单数</th>
+                    <th width="5%">个体户支付金额</th>
+                    <th width="4%">售后单数</th>
                     <th width="5%">售后金额</th>
-                    <th width="5%">微信退补单数</th>
-                    <th width="5%">微信退补差价</th>
+                    <th width="4%">微信退补单数</th>
+                    <th width="4%">微信退补差价</th>
                     <th width="5%">微信实际金额</th>
-                    <th width="5%">付款码退补单数</th>
-                    <th width="5%">付款码退补差价</th>
+                    <th width="4%">付款码退补单数</th>
+                    <th width="4%">付款码退补差价</th>
                     <th width="5%">付款码实际金额</th>
-                    <th width="5%">发货单数</th>
+                    <th width="4%">个体户退补单数</th>
+                    <th width="4%">个体户退补差价</th>
+                    <th width="5%">个体户实际金额</th>
+                    <th width="4%">发货单数</th>
                     <th width="5%">货品成本</th>
                     <th width="5%">物流成本</th>
                     <th width="5%">毛利</th>
@@ -57,6 +61,7 @@
                             <td>{{$a['receivedAmount']}}</td>
                             <td>{{$a['wx_money']}}</td>
                             <td>{{$a['zfm_money']}}</td>
+                            <td>{{$a['gth_money']}}</td>
                             <td>{{$a['aftersale_count']}}</td>
                             <td>{{$a['aftersale_fee']}}</td>
                             <td>{{$a['wx_refund_count']}}</td>
@@ -65,6 +70,9 @@
                             <td>{{$a['zfm_refund_count']}}</td>
                             <td>{{$a['zfm_refund_price']}}</td>
                             <td>{{$a['zfm_true_amount']}}</td>
+                            <td>{{$a['gth_refund_count']}}</td>
+                            <td>{{$a['gth_refund_price']}}</td>
+                            <td>{{$a['gth_true_amount']}}</td>
                             <td>{{$a['send_count']}}</td>
                             <td>{{$a['cost']}}</td>
                             <td>{{$a['freight_cost']}}</td>