增加累计值

mp-quartz/src/main/java/com/qs/mp/quartz/task/DayStatTask.java

@@ -89,18 +89,21 @@ public class DayStatTask {
     }
     StringBuilder sb = new StringBuilder();
     sb.append(DateUtils.dateTime(bizDay)).append("\n");
+    int allChannelCnt = channelService.count(new LambdaQueryWrapper<Channel>().gt(Channel::getLevel, 0));
     int channelCnt = channelService.count(new LambdaQueryWrapper<Channel>().gt(Channel::getLevel, 0)
         .ge(Channel::getCreatedTime, bizDay)
         .lt(Channel::getCreatedTime, DateUtils.addDays(bizDay, 1)));
-    sb.append("新增代理:").append(channelCnt).append("\n");
+    sb.append("累计代理：").append(allChannelCnt).append("，当日新增：").append(channelCnt).append("\n");
     int siteCnt = channelService.count(new LambdaQueryWrapper<Channel>().eq(Channel::getLevel, 0)
         .ge(Channel::getCreatedTime, bizDay)
         .lt(Channel::getCreatedTime, DateUtils.addDays(bizDay, 1)));
-    sb.append("新增门店:").append(siteCnt).append("\n");
+    int allSiteCnt = channelService.count(new LambdaQueryWrapper<Channel>().eq(Channel::getLevel, 0));
+    sb.append("累计门店：").append(allSiteCnt).append("，当日新增：").append(siteCnt).append("\n");
     int userCnt = sysUserService.count(new LambdaQueryWrapper<SysUser>()
         .ge(SysUser::getCreateTime, bizDay)
         .lt(SysUser::getCreateTime, DateUtils.addDays(bizDay, 1)));
-    sb.append("新增用户:").append(userCnt - siteCnt - channelCnt).append("\n");
+    int allUserCnt = sysUserService.count(new LambdaQueryWrapper<SysUser>());
+    sb.append("累计用户：").append(allUserCnt - allSiteCnt - allChannelCnt).append("，当日新增：").append(userCnt - siteCnt - channelCnt).append("\n");
     sb.append("===================\n");
 
     LambdaQueryWrapper<TicketBox> queryWrapper = new LambdaQueryWrapper<TicketBox>()
@@ -117,6 +120,7 @@ public class DayStatTask {
       totalPage = totalSize % pageSize == 0 ? totalSize / pageSize : totalSize / pageSize + 1;
     }
     BigDecimal sumSaleAmt = BigDecimal.ZERO;
+    BigDecimal sumAllSaleAmt = BigDecimal.ZERO;
     for (int i = 0; i < totalPage; i++) {
       queryWrapper.orderByAsc(TicketBox::getBoxNo);
       queryWrapper.last("limit " + (i * pageSize) + ", " + pageSize);
@@ -134,23 +138,34 @@ public class DayStatTask {
               Integer.valueOf(String.valueOf(orderMap.get("orderAmt")))).divide(new BigDecimal(100),
               2, RoundingMode.DOWN);
           sumSaleAmt = sumSaleAmt.add(orderAmt);
+          BigDecimal allOrderAmt = new BigDecimal(ticketBox.getSalePrice() * ticketBox.getSaleQty()).divide(new BigDecimal(100),
+              2, RoundingMode.DOWN);
+          sumAllSaleAmt = sumAllSaleAmt.add(allOrderAmt);
+
           sb.append(ticketBox.getTitle()).append("|").append(ticketBox.getType().getDesc())
               .append("(").append(
                   new BigDecimal(ticketBox.getSalePrice()).divide(new BigDecimal(100), 2,
-                      RoundingMode.DOWN)).append("元)，销售额：")
+                      RoundingMode.DOWN)).append("元)，累计销售额：")
+              .append(allOrderAmt).append("元，当日：")
               .append(orderAmt).append("元\n");
         }
       }
     }
-    sb.append("总销售额：").append(sumSaleAmt).append("元\n");
+    sb.append("累计销售额：").append(sumAllSaleAmt).append("元，当日：").append(sumSaleAmt).append("元\n");
 
     Map<String, Object> commMap = channelCommissionService.getMap(
         new QueryWrapper<ChannelCommission>()
             .select("IFNULL(sum(comm_amt) ,0) as commAmt")
             .lambda().ge(ChannelCommission::getCreatedTime, bizDay)
             .lt(ChannelCommission::getCreatedTime, DateUtils.addDays(bizDay, 1)));
+    Map<String, Object> allCommMap = channelCommissionService.getMap(
+        new QueryWrapper<ChannelCommission>()
+            .select("IFNULL(sum(comm_amt) ,0) as commAmt"));
     if (null != commMap) {
       sb.append("累计分佣：").append(
+          new BigDecimal(Integer.valueOf(String.valueOf(allCommMap.get("commAmt")))).divide(
+              new BigDecimal(100), 2, RoundingMode.DOWN))
+          .append("元，当日：").append(
           new BigDecimal(Integer.valueOf(String.valueOf(commMap.get("commAmt")))).divide(
               new BigDecimal(100), 2, RoundingMode.DOWN)).append("元\n");
     }
@@ -160,8 +175,14 @@ public class DayStatTask {
             .select("IFNULL(sum(money) ,0) as withdrawAmt")
             .lambda().ge(ChannelWithdraw::getCreateTime, bizDay)
             .lt(ChannelWithdraw::getCreateTime, DateUtils.addDays(bizDay, 1)));
+    Map<String, Object> allWithdrawMap = channelWithdrawService.getMap(
+        new QueryWrapper<ChannelWithdraw>()
+            .select("IFNULL(sum(money) ,0) as withdrawAmt"));
     if (null != withdrawMap) {
       sb.append("累计提现：").append(
+          new BigDecimal(Integer.valueOf(String.valueOf(allWithdrawMap.get("withdrawAmt")))).divide(
+              new BigDecimal(100), 2, RoundingMode.DOWN))
+          .append("元，当日：").append(
           new BigDecimal(Integer.valueOf(String.valueOf(withdrawMap.get("withdrawAmt")))).divide(
               new BigDecimal(100), 2, RoundingMode.DOWN)).append("元\n");
     }
@@ -169,15 +190,20 @@ public class DayStatTask {
     int exCnt = userExchangeOrderService.count(new LambdaQueryWrapper<UserExchangeOrder>()
         .ge(UserExchangeOrder::getCreatedTime, bizDay)
         .lt(UserExchangeOrder::getCreatedTime, DateUtils.addDays(bizDay, 1)));
-    sb.append("兑换订单：").append(exCnt).append("个\n");
+    int allExCnt = userExchangeOrderService.count(new LambdaQueryWrapper<UserExchangeOrder>());
+    sb.append("累计兑换订单：").append(allExCnt).append("个，当日：").append(exCnt).append("个\n");
 
     Map<String, Object> deliverMap = userCoinLogService.getMap(new QueryWrapper<UserCoinLog>()
         .select("IFNULL(sum(log_money) ,0) as deliverAmt")
         .lambda().eq(UserCoinLog::getType, CoinLogTypeEnum.PRIZE)
         .ge(UserCoinLog::getCreatedTime, bizDay)
         .lt(UserCoinLog::getCreatedTime, DateUtils.addDays(bizDay, 1)));
-    if (null != withdrawMap) {
-      sb.append("派发盲豆：").append(Integer.valueOf(String.valueOf(deliverMap.get("deliverAmt"))))
+    Map<String, Object> allDeliverMap = userCoinLogService.getMap(new QueryWrapper<UserCoinLog>()
+        .select("IFNULL(sum(log_money) ,0) as deliverAmt")
+        .lambda().eq(UserCoinLog::getType, CoinLogTypeEnum.PRIZE));
+    if (null != deliverMap) {
+      sb.append("累计派发盲豆：").append(Integer.valueOf(String.valueOf(allDeliverMap.get("deliverAmt"))))
+          .append("颗，当日：").append(Integer.valueOf(String.valueOf(deliverMap.get("deliverAmt"))))
           .append("颗\n");
     }
 
@@ -186,8 +212,12 @@ public class DayStatTask {
         .lambda().eq(UserCoinLog::getType, CoinLogTypeEnum.EXCHANGE)
         .ge(UserCoinLog::getCreatedTime, bizDay)
         .lt(UserCoinLog::getCreatedTime, DateUtils.addDays(bizDay, 1)));
+    Map<String, Object> allExchangeMap = userCoinLogService.getMap(new QueryWrapper<UserCoinLog>()
+        .select("IFNULL(sum(log_money) ,0) as exchangeAmt")
+        .lambda().eq(UserCoinLog::getType, CoinLogTypeEnum.EXCHANGE));
     if (null != withdrawMap) {
-      sb.append("兑换盲豆：").append(0 - Integer.valueOf(String.valueOf(exchangeMap.get("exchangeAmt"))))
+      sb.append("累计兑换盲豆：").append(0 - Integer.valueOf(String.valueOf(allExchangeMap.get("exchangeAmt"))))
+          .append("颗，当日：").append(0 - Integer.valueOf(String.valueOf(exchangeMap.get("exchangeAmt"))))
           .append("颗\n");
     }
     WebhookService.sendBizData(sb.toString());