Merge branch 'dev-xpy' into dev

app/common/repositories/finance/FinanceRepository.php

@@ -1975,50 +1975,46 @@ class FinanceRepository extends BaseRepository
 
         //导出数据
         $is_excel = request()->param('is_excel', 0);
-        if($is_excel == 1){
+        if ($is_excel == 1) {
             $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
-                ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,uss.order_id,uss.status,uss.mark,u.score')
+                ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,uss.order_id,uss.status,uss.mark')
                 ->order('uss.id', 'desc')
-            ->select();
+                ->select();
             $arr = [];
-            foreach ($date['list'] as $k=>$item){
+            foreach ($date['list'] as $k => $item) {
                 switch ($item['status']) {
-                    case '1':
-                        $item['status'] = '有效';
-                        break;
-                    case '-1':
-                        $item['status'] = '待确认';
-                        break;
-                    case '0':
-                        $item['status'] = '已失效';
-                        break;
+                    case '1': $statusLabel = '有效'; break;
+                    case '-1': $statusLabel = '待确认'; break;
+                    case '0': $statusLabel = '已失效'; break;
+                    default: $statusLabel = (string)$item['status'];
                 }
-                $arr[] = array(
+                $addtimeFormatted = is_numeric($item['addtime']) ? date('Y-m-d H:i:s', $item['addtime']) : $item['addtime'];
+                $arr[] = [
                     $item['id'],
-                    date('Y-m-d H:i:s', $item['addtime']),
+                    $addtimeFormatted,
                     $item['nickname'],
                     $item['phone'],
                     $item['pv'],
-                    $item['status'],
+                    $statusLabel,
                     $item['order_id'],
                     $item['mark']
-                );
+                ];
             }
             return $this->getStatisticsExcel([
-                'ID','时间','用户昵称','手机号','PV数','状态','关联订单ID','说明',
+                'ID', '时间', '用户昵称', '手机号', 'PV数', '状态', '关联订单号', '说明',
             ], $arr, 'PV统计');
-
         }
 
 
+
         $date['list'] = $this->date_where($query, $where['date'], 'uss.addtime', '-', 2)
             ->field('uss.id,uss.addtime,u.nickname,u.phone,uss.pv,uss.order_id,uss.status,uss.mark,u.score')
             ->page($page, $limit)
             ->order('uss.id', 'desc')
             ->select()
             ->each(function ($item) {
-                $item['mark'] = $item['mark'];
-                $item['addtime'] = date('Y-m-d H:i:s', $item['addtime']);
+                $item['addtime'] = is_numeric($item['addtime']) ? date('Y-m-d H:i:s', $item['addtime']) : $item['addtime'];
+                $item['order_sn'] = $item['order_id'];
                 return $item;
             });
         $date['count'] = $query->count();