导出商铺收益排行增加实际收入

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

@@ -271,6 +271,7 @@ public class DataCentreServiceImpl implements DataCentreService {
             row.add(tbOrder.getShopTypeName());
             row.add(tbOrder.getRank());
             row.add(tbOrder.getShopMoney());
+            row.add(tbOrder.getShopIncomeMoney());
             rows.add(row);
         }
         data.setRows(rows);
@@ -283,7 +284,8 @@ public class DataCentreServiceImpl implements DataCentreService {
                 "店铺名称",
                 "商铺类型",
                 "排名",
-                "收益");
+                "收益",
+                "实际收入");
     }
     @Override
     public Result selectUserCenter(DataCenterQuery query) {

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

@@ -314,7 +314,7 @@
         @rank_num := @rank_num + 1 AS Rank
         FROM
         ( SELECT @rank_num := 0 ) r,
-        ( SELECT ifnull( sum( pay_money ), 0 ) AS shopMoney, tor.shop_id , u.shop_name,gp.id as
+        ( 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
         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