骑手排行导出增加骑手姓名和余额字段

src/main/java/com/sqx/modules/datacentre/service/impl/DataCentreServiceImpl.java

@@ -434,6 +434,8 @@ public class DataCentreServiceImpl implements DataCentreService {
         List<String> titleList=Arrays.asList(
                 "排名",
                 "骑手昵称",
+                "骑手姓名",
+                "骑手余额",
                 "地区 ",
                 "骑手所在站点",
                 "总收益");
@@ -443,6 +445,8 @@ public class DataCentreServiceImpl implements DataCentreService {
             List<Object> row = new ArrayList<>();
             row.add(tbOrder.getRankNum());
             row.add(tbOrder.getNickName());
+            row.add(tbOrder.getRiderNickName());
+            row.add(tbOrder.getRiderBalance());
             row.add(tbOrder.getUserProvince()+tbOrder.getUserCity()+tbOrder.getUserDistrict());
             row.add(tbOrder.getStationName());
             row.add(tbOrder.getMoneyOrder());

src/main/resources/mapper/dataCentre/dataCenterMapper.xml

@@ -164,7 +164,8 @@
         ( SELECT @rank_num := 0 ) r,
         ( SELECT ifnull( sum( rider_money ), 0 ) AS moneyOrder, i.rider_user_id, u.nick_name as nickName, u.avatar as
         avatar,
-        i.user_province as userProvince, i.user_city as userCity, i.user_district as userDistrict,rs.station_name as stationName
+        i.user_province as userProvince, i.user_city as userCity, i.user_district as userDistrict,rs.station_name as stationName,
+        u.user_name as riderNickName,u.balance as riderBalance
         FROM tb_indent i left join tb_user u on i.rider_user_id = u.user_id
         left join rider_station rs on u.rider_station_id=rs.id
         WHERE i.rider_user_id IS NOT NULL and i.indent_state = 6
@@ -196,7 +197,8 @@
         ( SELECT @rank_num := 0 ) r,
         ( SELECT ifnull( sum( rider_money ), 0 ) AS moneyOrder, i.rider_user_id, u.nick_name as nickName, u.avatar as
         avatar,
-        i.user_province as userProvince, i.user_city as userCity, i.user_district as userDistrict,rs.station_name as stationName
+        i.user_province as userProvince, i.user_city as userCity, i.user_district as userDistrict,rs.station_name as stationName,
+        u.user_name as riderNickName,u.balance as riderBalance
         FROM tb_indent i left join tb_user u on i.rider_user_id = u.user_id
         left join rider_station rs on u.rider_station_id=rs.id
         WHERE i.rider_user_id IS NOT NULL
@@ -286,7 +288,7 @@
         FROM
         ( SELECT @rank_num := 0 ) r,
         ( SELECT ifnull( sum( pay_money ), 0 ) AS shopMoney,ifnull( sum( shop_income_money ), 0 ) AS shopIncomeMoney, tor.shop_id , u.shop_name,gp.id as
-        shopType,gp.shop_type_name as shopTypeName,u.user_name as riderNickName,u.balance as riderBalance
+        shopType,gp.shop_type_name as shopTypeName
         FROM tb_order tor left join goods_shop u on tor.shop_id = u.shop_id
         left join shop_type gp on gp.id=u.shop_type_id
         WHERE tor.shop_id IS NOT NULL and tor.status = 4