调整退款导出

app/Model/OrderModel.php

@@ -205,6 +205,7 @@ class OrderModel extends Model
                                 case '6': $order_payment_mode[] = '京东支付';break;
                                 case '7': $order_payment_mode[] = '交通银行';break;
                                 case '8': $order_payment_mode[] = '恒生银行';break;
+                                case '9': $order_payment_mode[] = '钱包支付';break;
                             }
                         }
 

app/Model/OrderRefundModel.php

@@ -29,17 +29,19 @@ class OrderRefundModel extends Model
 		$map = array();
 
         // 页面参数
-        $map['order_sn']     = $request->input('order_sn', '');
-        $map['sku_name']     = $request->input('sku_name', '');
-        $map['time_start']   = $request->input('time_start', '');
-        $map['time_end']     = $request->input('time_end', '');
-        $map['apply_status'] = $request->input('apply_status', '');
+        $map['order_sn']           = $request->input('order_sn', '');
+        $map['sku_name']           = $request->input('sku_name', '');
+        $map['time_start']         = $request->input('time_start', '');
+        $map['time_end']           = $request->input('time_end', '');
+        $map['apply_status']       = $request->input('apply_status', '');
+        $map['order_payment_mode'] = $request->input('order_payment_mode', '');
 
         $list = $this->from('lie_order_refund_items as it')
                 ->leftJoin('lie_order_refund as r', function($join) {
                     $join->on('it.refund_id', '=', 'r.refund_id')->where('r.refund_type', '=', 2)->where('r.order_goods_type', '=', 1);
                 })
-                ->leftJoin('lie_user_main as u', 'r.create_uid', '=', 'u.user_id')
+                ->leftJoin('lie_pay_log as p', 'r.order_id', '=', 'p.order_id')
+                ->leftJoin('lie_user_main as u', 'r.user_id', '=', 'u.user_id')
                 ->where(function ($query) use ($map) {
                     // 订单编号
                     if (!empty($map['order_sn'])) {
@@ -68,6 +70,29 @@ class OrderRefundModel extends Model
                         $query->whereIn('r.status', explode(',', $map['apply_status']));
                     }
                 })
+                ->where(function ($query) use ($map) {
+                    // 支付方式
+                    if (!empty($map['order_payment_mode'])) {
+                        $pay_name = explode(',', $map['order_payment_mode']);
+                        $order_payment_mode = [];
+
+                        foreach ($pay_name as $v) {
+                            switch ($v) {
+                                case '1': $order_payment_mode[] = '微信支付';break;
+                                case '2': $order_payment_mode[] = '支付宝';break;
+                                case '3': $order_payment_mode[] = '银联支付(B2B)';break;
+                                case '4': $order_payment_mode[] = '银联支付(B2C)';break;
+                                case '5': $order_payment_mode[] = '账期支付';break;
+                                case '6': $order_payment_mode[] = '京东支付';break;
+                                case '7': $order_payment_mode[] = '交通银行';break;
+                                case '8': $order_payment_mode[] = '恒生银行';break;
+                                case '9': $order_payment_mode[] = '钱包支付';break;
+                            }
+                        }
+
+                        $query->whereIn('p.pay_name', $order_payment_mode);
+                    }
+                })
                 ->select('it.refund_rec_id', 'it.refund_id', 'it.rec_id', 'it.goods_id', 'it.goods_name', 'it.brand_id', 'it.brand_name', 'it.supplier_id', 'it.supplier_name', 'it.sku_name', 'it.goods_price', 'it.single_pre_price', 'it.refund_num', 'r.order_id', 'r.order_sn', 'r.order_goods_type', 'r.currency', 'r.pay_amount', 'r.price_fall', 'r.create_uid', 'r.status', 'r.refund_reason', 'r.create_time', 'r.refund_time', 'u.mobile', 'u.email')
                 ->groupBy('it.refund_rec_id')
                 ->orderBy('r.create_time', 'DESC')
@@ -171,14 +196,15 @@ class OrderRefundModel extends Model
         $map = array();
 
         // 页面参数
-        $map['order_sn']     = $request->input('order_sn', '');
-        $map['sku_name']     = $request->input('sku_name', '');
-        $map['time_start']   = $request->input('time_start', '');
-        $map['time_end']     = $request->input('time_end', '');
-        $map['apply_status'] = $request->input('apply_status', '');
+        $map['order_sn']           = $request->input('order_sn', '');
+        $map['time_start']         = $request->input('time_start', '');
+        $map['time_end']           = $request->input('time_end', '');
+        $map['apply_status']       = $request->input('apply_status', '');
+        $map['order_payment_mode'] = $request->input('order_payment_mode', '');
 
         $list = $this->from('lie_order_refund as r')
-                ->leftJoin('lie_user_main as u', 'r.create_uid', '=', 'u.user_id')
+                ->leftJoin('lie_pay_log as p', 'r.order_id', '=', 'p.order_id')
+                ->leftJoin('lie_user_main as u', 'r.user_id', '=', 'u.user_id')
                 ->where('r.refund_type', '=', 1)
                 ->where('r.order_goods_type', '=', 2)
                 ->where(function ($query) use ($map) {
@@ -203,6 +229,29 @@ class OrderRefundModel extends Model
                         $query->whereIn('r.status', explode(',', $map['apply_status']));
                     }
                 })
+                ->where(function ($query) use ($map) {
+                    // 支付方式
+                    if (!empty($map['order_payment_mode'])) {
+                        $pay_name = explode(',', $map['order_payment_mode']);
+                        $order_payment_mode = [];
+
+                        foreach ($pay_name as $v) {
+                            switch ($v) {
+                                case '1': $order_payment_mode[] = '微信支付';break;
+                                case '2': $order_payment_mode[] = '支付宝';break;
+                                case '3': $order_payment_mode[] = '银联支付(B2B)';break;
+                                case '4': $order_payment_mode[] = '银联支付(B2C)';break;
+                                case '5': $order_payment_mode[] = '账期支付';break;
+                                case '6': $order_payment_mode[] = '京东支付';break;
+                                case '7': $order_payment_mode[] = '交通银行';break;
+                                case '8': $order_payment_mode[] = '恒生银行';break;
+                                case '9': $order_payment_mode[] = '钱包支付';break;
+                            }
+                        }
+
+                        $query->whereIn('p.pay_name', $order_payment_mode);
+                    }
+                })
                 ->select('r.order_id', 'r.order_sn', 'r.order_goods_type', 'r.currency', 'r.pay_amount', 'r.price_fall', 'r.create_uid', 'r.status', 'r.refund_reason', 'r.create_time', 'r.refund_time', 'u.mobile', 'u.email')
                 ->orderBy('r.create_time', 'DESC')
                 ->get()

resources/views/refundlist/content.blade.php

@@ -135,7 +135,7 @@
                                     <!-- 退款申请已处理且为钱包支付 -->
                                     @if ($v['status'] == 1 && strpos($pay_name, '钱包支付') !== false)
                                         @if ($condition['order_goods_type'] == 2)
-                                            <a class="btn btn-danger cancel-refund" data-rid="{{$v['refund_id']}}">取消申请</a>
+                                            <!-- <a class="btn btn-danger cancel-refund" data-rid="{{$v['refund_id']}}">取消申请</a> -->
                                         @endif
 
                                         <!-- <a class="btn btn-info wallet-refund" data-oid="{{$v['order_id']}}" data-amount="{{number_format($v['pay_amount'] - $v['price_fall'], 2)}}" target="_blank">钱包退款</a> -->