Browse Source

优化:后台订单导出增加第三方支付订单号和支付流水号

萤火科技 2 years ago
parent
commit
59f5345d64
2 changed files with 5 additions and 1 deletions
  1. 1 1
      app/store/model/Order.php
  2. 4 0
      app/store/service/order/Export.php

+ 1 - 1
app/store/model/Order.php

@@ -84,7 +84,7 @@ class Order extends OrderModel
         // 设置订单类型条件
         $dataTypeFilter = $this->getFilterDataType($param['dataType']);
         // 获取数据列表
-        return $this->with(['goods.image', 'address', 'user.avatar', 'express'])
+        return $this->with(['goods.image', 'address', 'user.avatar', 'express', 'trade'])
             ->alias('order')
             ->field('order.*')
             ->join('user', 'user.user_id = order.user_id')

+ 4 - 0
app/store/service/order/Export.php

@@ -199,6 +199,8 @@ class Export extends BaseService
             'order_status' => '订单状态',
             'is_comment' => '是否已评价',
             'order_source' => '订单来源',
+            'out_trade_no' => '第三方支付订单号',
+            'trade_no' => '支付流水号',
         ];
     }
 
@@ -257,6 +259,8 @@ class Export extends BaseService
                 'order_status' => OrderStatusEnum::data()[$order['order_status']]['name'],
                 'is_comment' => $order['is_comment'] ? '是' : '否',
                 'order_source' => OrderSourceEnum::data()[$order['order_source']]['name'],
+                'out_trade_no' => !empty($order['trade']) ? $this->filterValue($order['trade']['out_trade_no']) : '',
+                'trade_no' => !empty($order['trade']) ? $this->filterValue($order['trade']['trade_no']) : '',
             ];
         }
         return $dataArray;