修改导出产品、报名城市默认值、导出线索

agent/admin/controllers/pingan/car/Product.php

@@ -187,7 +187,7 @@ class Product extends BaseController
                     $temp['推广周期'] = $v->timeStart . '到' . $v->timeEnd;
                     $temp['线索佣金'] = $commission['cluesCommission'] ?: 0;;
                     $temp['订单佣金'] = $commission['orderCommission'] ?: 0;;
-                    $temp['城市'] = $getProvinceCity['cityNames'] ?: ['全国'];
+                    $temp['城市'] = $getProvinceCity['cityNames'] ? implode(',', $getProvinceCity['cityNames']) : '全国';
                     $bizList = $coupon['bizList']['list'] ?: [];
                     $biz_name = $bizList ? implode(',', array_column($bizList, 'biz_name')) : '';
                     $temp['适用门店'] = $biz_name;
@@ -226,7 +226,7 @@ class Product extends BaseController
             }
         }
         if ($limit >= 10000) {
-            $columns = ['代理人姓名', '代理人工号', '团队主管姓名', '团队主管工号', '部经理姓名', '部经理工号', '区经理姓名', '区经理工号', '中心编号', '归属城市', '归属机构', '代理人角色编号'];
+            $columns = ['品牌', '车系', '官方售价', '补贴详情', '推广周期', '线索佣金', '订单佣金', '城市', '适用门店'];
         }
         $data = ['list' => $list, 'count' => $count, 'columns' => $columns];
         return $data;

agent/admin/controllers/pingan/receiver/Clues.php

@@ -403,7 +403,8 @@ class Clues extends BaseController
                         'brandList' => implode(',', $brandList),
                         'provinceName' => $area['province_name'] ?: '',
                         'cityName' => $area['city_name'] ?: '',
-                        'statusCn' => $status_name,
+                        'statusCn' => $statusAry[$v['status']]['name'],
+                        'subStatusCn' => $statusAry[$v['status']]['list'][$v['status2']] ?: '',
                         'isUnlock' => $is_unlock,
                         'enTime' => $v['en_time'],
                     ];
@@ -426,7 +427,7 @@ class Clues extends BaseController
         }
         $columns = [];
         if ($limit >= 10000) {
-            $columns = ['姓名', '手机号', '订单编号', '归属', '中心', '机构', '关注车型', '所属省', '所属市', '状态', '是否解锁', '入池时间'];
+            $columns = ['姓名', '手机号', '订单编号', '归属', '中心', '机构', '关注车型', '所属省', '所属市', '主状态', '子状态', '是否解锁', '入池时间'];
         }
         return ['list' => $list, 'count' => $count, 'statusList' => $statusList, 'columns' => $columns];
     }

common/models/agent/Auto_user_coupon_model.php

@@ -48,6 +48,7 @@ class Auto_user_coupon_model extends HD_Model
                 throw new Exception('优惠券不存在');
             }
             $areaRow = [];
+            !$cityId && $cityId = 350200;
             if ($cityId) {
                 $areaRow = $this->area_model->get(['city_id' => $cityId]);
             }