Browse Source

个体户支付

sunhao 5 years ago
parent
commit
2a90ffb490

+ 4 - 1
app/Http/Controllers/Admin/OrderController.php

152
                 $v['refund_type'] = '微信支付';
152
                 $v['refund_type'] = '微信支付';
153
             }elseif($v['refund_type'] == 2){
153
             }elseif($v['refund_type'] == 2){
154
                 $v['refund_type'] = '付款码支付';
154
                 $v['refund_type'] = '付款码支付';
155
+            }elseif($v['refund_type'] == 3){
156
+                $v['refund_type'] = '个体户支付';
155
             }else{
157
             }else{
156
                 $v['refund_type'] = '';
158
                 $v['refund_type'] = '';
157
             }   
159
             }   
1321
             3 => '已发货',
1323
             3 => '已发货',
1322
             4 => '已退款'
1324
             4 => '已退款'
1323
         );
1325
         );
1326
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付']; 
1324
         foreach($result as $k=>&$v){
1327
         foreach($result as $k=>&$v){
1325
             #加粉时间
1328
             #加粉时间
1326
             $fanTime = DB::table('customers')->select('fanTime')->where('phone', $v['receiverMobile'])->first();
1329
             $fanTime = DB::table('customers')->select('fanTime')->where('phone', $v['receiverMobile'])->first();
1331
             $v['warehouse'] = $v['warehouse'] == 1? 'A仓库':'B仓库';      
1334
             $v['warehouse'] = $v['warehouse'] == 1? 'A仓库':'B仓库';      
1332
             $v['is_fugou'] = $v['is_fugou'] == 1? '是':'否';      
1335
             $v['is_fugou'] = $v['is_fugou'] == 1? '是':'否';      
1333
             $v['is_refund'] = $v['is_refund'] == 1? '是':'否'; 
1336
             $v['is_refund'] = $v['is_refund'] == 1? '是':'否'; 
1334
-            $v['payment_type'] = $v['payment_type'] == 1? '微信支付' : '付款码支付' ;    
1337
+            $v['payment_type'] = $payArr[$v['payment_type']];    
1335
         }
1338
         }
1336
 
1339
 
1337
         if($is_saler == 0){
1340
         if($is_saler == 0){

+ 13 - 9
app/Http/Controllers/Admin/StatisticsController.php

1752
         $result = $resultQuery->orderBy('createTime','desc')->offset($offset)->limit($pageSize)->get();
1752
         $result = $resultQuery->orderBy('createTime','desc')->offset($offset)->limit($pageSize)->get();
1753
         
1753
         
1754
         $result = json_decode(json_encode($result), true);
1754
         $result = json_decode(json_encode($result), true);
1755
-        $payArr = [1=>'微信支付', 2=>'付款码支付'];
1755
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
1756
         foreach($result as $k=>&$v){
1756
         foreach($result as $k=>&$v){
1757
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
1757
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
1758
             $v['true_amount'] = $v['receivedAmount'] + $v['refund_price'] - $v['aftersale_fee'];
1758
             $v['true_amount'] = $v['receivedAmount'] + $v['refund_price'] - $v['aftersale_fee'];
1894
 
1894
 
1895
         $result = $resultQuery->orderBy('createTime','desc')->get();
1895
         $result = $resultQuery->orderBy('createTime','desc')->get();
1896
         $result = json_decode(json_encode($result), true);
1896
         $result = json_decode(json_encode($result), true);
1897
-        $payArr = [1=>'微信支付', 2=>'付款码支付'];
1897
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
1898
         foreach($result as $k=>&$v){
1898
         foreach($result as $k=>&$v){
1899
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
1899
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
1900
             //$v['true_amount'] = $v['receivedAmount'] - $v['refund_price'] - $v['aftersale_fee'];
1900
             //$v['true_amount'] = $v['receivedAmount'] - $v['refund_price'] - $v['aftersale_fee'];
2028
         $result = $resultQuery->orderBy('aftersale_time','desc')->offset($offset)->limit($pageSize)->get();
2028
         $result = $resultQuery->orderBy('aftersale_time','desc')->offset($offset)->limit($pageSize)->get();
2029
         
2029
         
2030
         $result = json_decode(json_encode($result), true);
2030
         $result = json_decode(json_encode($result), true);
2031
-        $payArr = [1=>'微信支付', 2=>'付款码支付'];
2031
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
2032
         $wareArr = array(
2032
         $wareArr = array(
2033
             0 => '其他',
2033
             0 => '其他',
2034
             1 => 'A仓',
2034
             1 => 'A仓',
2102
         $result = $resultQuery->orderBy('refund_time','desc')->offset($offset)->limit($pageSize)->get();
2102
         $result = $resultQuery->orderBy('refund_time','desc')->offset($offset)->limit($pageSize)->get();
2103
         
2103
         
2104
         $result = json_decode(json_encode($result), true);
2104
         $result = json_decode(json_encode($result), true);
2105
-        $payArr = [1=>'微信支付', 2=>'付款码支付'];
2105
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
2106
         $wareArr = array(
2106
         $wareArr = array(
2107
             0 => '其他',
2107
             0 => '其他',
2108
             1 => 'A仓',
2108
             1 => 'A仓',
2118
                 $v['refund_type'] = '微信支付';
2118
                 $v['refund_type'] = '微信支付';
2119
             }elseif($v['refund_type'] == 2){
2119
             }elseif($v['refund_type'] == 2){
2120
                 $v['refund_type'] = '付款码支付';
2120
                 $v['refund_type'] = '付款码支付';
2121
+            }elseif($v['refund_type'] == 3){
2122
+                $v['refund_type'] = '个体户支付';
2121
             }else{
2123
             }else{
2122
                 $v['refund_type'] = '';
2124
                 $v['refund_type'] = '';
2123
             }   
2125
             }   
2183
         $result = $resultQuery->orderBy('send_time','desc')->offset($offset)->limit($pageSize)->get();
2185
         $result = $resultQuery->orderBy('send_time','desc')->offset($offset)->limit($pageSize)->get();
2184
         
2186
         
2185
         $result = json_decode(json_encode($result), true);
2187
         $result = json_decode(json_encode($result), true);
2186
-        $payArr = [1=>'微信支付', 2=>'付款码支付'];
2188
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
2187
         $wareArr = array(
2189
         $wareArr = array(
2188
             0 => '其他',
2190
             0 => '其他',
2189
             1 => 'A仓',
2191
             1 => 'A仓',
2233
         $result = $resultQuery->orderBy('aftersale_time','desc')->get();
2235
         $result = $resultQuery->orderBy('aftersale_time','desc')->get();
2234
         
2236
         
2235
         $result = json_decode(json_encode($result), true);
2237
         $result = json_decode(json_encode($result), true);
2236
-        $payArr = [1=>'微信支付', 2=>'付款码支付'];
2238
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
2237
         $wareArr = array(
2239
         $wareArr = array(
2238
             0 => '其他',
2240
             0 => '其他',
2239
             1 => 'A仓',
2241
             1 => 'A仓',
2274
         $result = $resultQuery->orderBy('refund_time','desc')->get();
2276
         $result = $resultQuery->orderBy('refund_time','desc')->get();
2275
         
2277
         
2276
         $result = json_decode(json_encode($result), true);
2278
         $result = json_decode(json_encode($result), true);
2277
-        $payArr = [1=>'微信支付', 2=>'付款码支付'];
2279
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
2278
         $wareArr = array(
2280
         $wareArr = array(
2279
             0 => '其他',
2281
             0 => '其他',
2280
             1 => 'A仓',
2282
             1 => 'A仓',
2290
                 $v['refund_type'] = '微信支付';
2292
                 $v['refund_type'] = '微信支付';
2291
             }elseif($v['refund_type'] == 2){
2293
             }elseif($v['refund_type'] == 2){
2292
                 $v['refund_type'] = '付款码支付';
2294
                 $v['refund_type'] = '付款码支付';
2295
+            }elseif($v['refund_type'] == 3){
2296
+                $v['refund_type'] = '个体户支付';
2293
             }else{
2297
             }else{
2294
                 $v['refund_type'] = '';
2298
                 $v['refund_type'] = '';
2295
             } 
2299
             } 
2322
         $result = $resultQuery->orderBy('send_time','desc')->get();
2326
         $result = $resultQuery->orderBy('send_time','desc')->get();
2323
         
2327
         
2324
         $result = json_decode(json_encode($result), true);
2328
         $result = json_decode(json_encode($result), true);
2325
-        $payArr = [1=>'微信支付', 2=>'付款码支付'];
2329
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
2326
         $wareArr = array(
2330
         $wareArr = array(
2327
             0 => '其他',
2331
             0 => '其他',
2328
             1 => 'A仓',
2332
             1 => 'A仓',
2445
             $result = $resultQuery->orderBy('createTime','desc')->get();
2449
             $result = $resultQuery->orderBy('createTime','desc')->get();
2446
         }
2450
         }
2447
         $result = json_decode(json_encode($result), true);
2451
         $result = json_decode(json_encode($result), true);
2448
-        $payArr = [1=>'微信支付', 2=>'付款码支付'];
2452
+        $payArr = [1=>'微信支付', 2=>'付款码支付', 3=>'个体户支付', 4=>'充值卡支付'];
2449
         foreach($result as $k=>&$v){
2453
         foreach($result as $k=>&$v){
2450
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
2454
             $v['team_name'] = $v['team_id']>0 ? $teams[$v['team_id']] : '';;
2451
             $v['true_amount'] = $v['receivedAmount'] - $v['refund_price'] - $v['aftersale_fee'];
2455
             $v['true_amount'] = $v['receivedAmount'] - $v['refund_price'] - $v['aftersale_fee'];

+ 4 - 2
resources/views/order/ordercreate.blade.php

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

+ 3 - 1
resources/views/order/orderedit.blade.php

233
                     <input type="radio" name="payment_type"  value="1" @if($order['payment_type']=='1') checked  @endif>
233
                     <input type="radio" name="payment_type"  value="1" @if($order['payment_type']=='1') checked  @endif>
234
                     <label for="status-1" style="margin-right: 27px;">微信支付</label>
234
                     <label for="status-1" style="margin-right: 27px;">微信支付</label>
235
                     <input type="radio" name="payment_type" value="2" @if($order['payment_type']=='2') checked @endif>
235
                     <input type="radio" name="payment_type" value="2" @if($order['payment_type']=='2') checked @endif>
236
-                    <label for="status-0">付款码支付</label>
236
+                    <label for="status-0" style="margin-right: 27px;">付款码支付</label>
237
+                    <input type="radio" name="payment_type" value="3" @if($order['payment_type']=='3') checked @endif>
238
+                    <label for="status-0" style="margin-right: 27px;">个体户支付</label>
237
                 </div>
239
                 </div>
238
             </div>
240
             </div>
239
 
241