个体户支付

app/Http/Controllers/Admin/OrderController.php

@@ -152,6 +152,8 @@ class OrderController extends Controller
                 $v['refund_type'] = '微信支付';
             }elseif($v['refund_type'] == 2){
                 $v['refund_type'] = '付款码支付';
+            }elseif($v['refund_type'] == 3){
+                $v['refund_type'] = '个体户支付';
             }else{
                 $v['refund_type'] = '';
             }   
@@ -1321,6 +1323,7 @@ class OrderController extends Controller
             3 => '已发货',
             4 => '已退款'
         );
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付']; 
         foreach($result as $k=>&$v){
             #加粉时间
             $fanTime = DB::table('customers')->select('fanTime')->where('phone', $v['receiverMobile'])->first();
@@ -1331,7 +1334,7 @@ class OrderController extends Controller
             $v['warehouse'] = $v['warehouse'] == 1? 'A仓库':'B仓库';      
             $v['is_fugou'] = $v['is_fugou'] == 1? '是':'否';      
             $v['is_refund'] = $v['is_refund'] == 1? '是':'否'; 
-            $v['payment_type'] = $v['payment_type'] == 1? '微信支付' : '付款码支付' ;    
+            $v['payment_type'] = $payArr[$v['payment_type']];    
         }
 
         if($is_saler == 0){

app/Http/Controllers/Admin/StatisticsController.php

@@ -1752,7 +1752,7 @@ class StatisticsController extends Controller
         $result = $resultQuery->orderBy('createTime','desc')->offset($offset)->limit($pageSize)->get();
         
         $result = json_decode(json_encode($result), true);
-        $payArr = [1=>'微信支付', 2=>'付款码支付'];
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
             $v['true_amount'] = $v['receivedAmount'] + $v['refund_price'] - $v['aftersale_fee'];
@@ -1894,7 +1894,7 @@ class StatisticsController extends Controller
 
         $result = $resultQuery->orderBy('createTime','desc')->get();
         $result = json_decode(json_encode($result), true);
-        $payArr = [1=>'微信支付', 2=>'付款码支付'];
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
             //$v['true_amount'] = $v['receivedAmount'] - $v['refund_price'] - $v['aftersale_fee'];
@@ -2028,7 +2028,7 @@ class StatisticsController extends Controller
         $result = $resultQuery->orderBy('aftersale_time','desc')->offset($offset)->limit($pageSize)->get();
         
         $result = json_decode(json_encode($result), true);
-        $payArr = [1=>'微信支付', 2=>'付款码支付'];
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
         $wareArr = array(
             0 => '其他',
             1 => 'A仓',
@@ -2102,7 +2102,7 @@ class StatisticsController extends Controller
         $result = $resultQuery->orderBy('refund_time','desc')->offset($offset)->limit($pageSize)->get();
         
         $result = json_decode(json_encode($result), true);
-        $payArr = [1=>'微信支付', 2=>'付款码支付'];
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
         $wareArr = array(
             0 => '其他',
             1 => 'A仓',
@@ -2118,6 +2118,8 @@ class StatisticsController extends Controller
                 $v['refund_type'] = '微信支付';
             }elseif($v['refund_type'] == 2){
                 $v['refund_type'] = '付款码支付';
+            }elseif($v['refund_type'] == 3){
+                $v['refund_type'] = '个体户支付';
             }else{
                 $v['refund_type'] = '';
             }   
@@ -2183,7 +2185,7 @@ class StatisticsController extends Controller
         $result = $resultQuery->orderBy('send_time','desc')->offset($offset)->limit($pageSize)->get();
         
         $result = json_decode(json_encode($result), true);
-        $payArr = [1=>'微信支付', 2=>'付款码支付'];
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
         $wareArr = array(
             0 => '其他',
             1 => 'A仓',
@@ -2233,7 +2235,7 @@ class StatisticsController extends Controller
         $result = $resultQuery->orderBy('aftersale_time','desc')->get();
         
         $result = json_decode(json_encode($result), true);
-        $payArr = [1=>'微信支付', 2=>'付款码支付'];
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
         $wareArr = array(
             0 => '其他',
             1 => 'A仓',
@@ -2274,7 +2276,7 @@ class StatisticsController extends Controller
         $result = $resultQuery->orderBy('refund_time','desc')->get();
         
         $result = json_decode(json_encode($result), true);
-        $payArr = [1=>'微信支付', 2=>'付款码支付'];
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
         $wareArr = array(
             0 => '其他',
             1 => 'A仓',
@@ -2290,6 +2292,8 @@ class StatisticsController extends Controller
                 $v['refund_type'] = '微信支付';
             }elseif($v['refund_type'] == 2){
                 $v['refund_type'] = '付款码支付';
+            }elseif($v['refund_type'] == 3){
+                $v['refund_type'] = '个体户支付';
             }else{
                 $v['refund_type'] = '';
             } 
@@ -2322,7 +2326,7 @@ class StatisticsController extends Controller
         $result = $resultQuery->orderBy('send_time','desc')->get();
         
         $result = json_decode(json_encode($result), true);
-        $payArr = [1=>'微信支付', 2=>'付款码支付'];
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
         $wareArr = array(
             0 => '其他',
             1 => 'A仓',
@@ -2445,7 +2449,7 @@ class StatisticsController extends Controller
             $result = $resultQuery->orderBy('createTime','desc')->get();
         }
         $result = json_decode(json_encode($result), true);
-        $payArr = [1=>'微信支付', 2=>'付款码支付'];
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
         foreach($result as $k=>&$v){
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
             $v['true_amount'] = $v['receivedAmount'] - $v['refund_price'] - $v['aftersale_fee'];

resources/views/order/ordercreate.blade.php

@@ -198,8 +198,10 @@
                 <div class="formControls col-xs-6 col-sm-6">
                     <input type="radio" name="payment_type"  value="1" @if(old('payment_type')==='1') checked @else checked @endif>
                     <label for="status-1" style="margin-right: 27px;">微信支付</label>
-                    <input type="radio" name="payment_type" value="2" @if(old('payment_type')==='2') checked @endif>
-                    <label for="status-0">付款码支付</label>
+                    <!--input type="radio" name="payment_type" value="2" @if(old('payment_type')==='2') checked @endif>
+                    <label for="status-0">付款码支付</label-->
+                    <input type="radio" name="payment_type" value="3" @if(old('payment_type')==='3') checked @endif>
+                    <label for="status-0">个体户支付</label>
                 </div>
             </div>
 

resources/views/order/orderedit.blade.php

@@ -233,7 +233,9 @@
                     <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>
-                    <label for="status-0">付款码支付</label>
+                    <label for="status-0" style="margin-right: 27px;">付款码支付</label>
+                    <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>
             </div>