商铺收益分析增加商铺实际收益

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

@@ -253,6 +253,7 @@ public class DataCentreServiceImpl implements DataCentreService {
         hashMap.put("pageUtils", pageUtils);
         TbOrder tbOrder=dataCentreDao.selectRankingListAmount(query);
         hashMap.put("moneyAmount", tbOrder.getShopMoney());
+        hashMap.put("shopIncomeMoney", tbOrder.getShopIncomeMoney());
         return Result.success().put("data", hashMap);
     }
 

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

@@ -256,7 +256,7 @@
         @rank_num := @rank_num + 1 AS rankNum
         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
@@ -284,7 +284,7 @@
     </select>
 
     <select id="selectRankingListAmount" resultType="com.sqx.modules.order.entity.TbOrder">
-        SELECT ifnull( sum( pay_money ), 0 ) AS shopMoney
+        SELECT ifnull( sum( pay_money ), 0 ) AS shopMoney,ifnull( sum( shop_income_money ), 0 ) AS shopIncomeMoney
         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