渠道列表bug修复

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

@@ -139,8 +139,8 @@ public class DayStatTask {
                 .select("IFNULL(sum(pay_amt) ,0) as orderAmt")
                 .lambda().eq(UserTicketOrder::getBoxId, ticketBox.getBoxId())
                 .eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.FINISHED)
-                .ge(UserTicketOrder::getCreatedTime, bizDay)
-                .lt(UserTicketOrder::getCreatedTime, DateUtils.addDays(bizDay, 1)));
+                .ge(UserTicketOrder::getUpdatedTime, bizDay)
+                .lt(UserTicketOrder::getUpdatedTime, DateUtils.addDays(bizDay, 1)));
         if (null != orderMap) {
           BigDecimal orderAmt = new BigDecimal(
               Integer.valueOf(String.valueOf(orderMap.get("orderAmt")))).divide(new BigDecimal(100),
@@ -151,7 +151,8 @@ public class DayStatTask {
               new QueryWrapper<UserTicketOrder>()
                   .select("IFNULL(sum(pay_amt) ,0) as orderAmt")
                   .lambda().eq(UserTicketOrder::getBoxId, ticketBox.getBoxId())
-                  .eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.FINISHED));
+                  .eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.FINISHED)
+                  .lt(UserTicketOrder::getUpdatedTime, DateUtils.addDays(bizDay, 1)));
           BigDecimal allOrderAmt = new BigDecimal(
               Integer.valueOf(String.valueOf(allOrderMap.get("orderAmt")))).divide(new BigDecimal(100),
               2, RoundingMode.DOWN);
@@ -180,11 +181,11 @@ public class DayStatTask {
             .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))
+              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");
+              new BigDecimal(Integer.valueOf(String.valueOf(commMap.get("commAmt")))).divide(
+                  new BigDecimal(100), 2, RoundingMode.DOWN)).append("元\n");
     }
 
     Map<String, Object> couponMap = channelCouponVerifyLogService.getMap(
@@ -218,11 +219,11 @@ public class DayStatTask {
             .lambda().eq(ChannelWithdraw::getStatus, ChannelWithdrawStatusEnum.FINISHED));
     if (null != withdrawMap) {
       sb.append("累计提现：").append(
-          new BigDecimal(Integer.valueOf(String.valueOf(allWithdrawMap.get("withdrawAmt")))).divide(
-              new BigDecimal(100), 2, RoundingMode.DOWN))
+              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");
+              new BigDecimal(Integer.valueOf(String.valueOf(withdrawMap.get("withdrawAmt")))).divide(
+                  new BigDecimal(100), 2, RoundingMode.DOWN)).append("元\n");
     }
 
     int exCnt = userExchangeOrderService.count(new LambdaQueryWrapper<UserExchangeOrder>()

mp-service/src/main/resources/mapper/channel/ChannelMapper.xml

@@ -63,12 +63,12 @@
            left join mp_channel t2 on t1.parent_id = t2.channel_id
            left join (select q1.channel_id, count(q2.channel_id) as site_cnt
                       from mp_channel q1
-                             left join mp_channel q2 on q2.channel_no like concat(q1.channel_id, '.%')
+                             left join mp_channel q2 on q2.channel_no like concat(q1.channel_no, '.%')
                       where q1.level > 0 and q2.level= 0
                       group by q1.channel_id) t3 on t3.channel_id = t1.channel_id
            left join (select q1.channel_id, count(q2.channel_id) as child_cnt
                       from mp_channel q1
-                             left join mp_channel q2 on q2.channel_no like concat(q1.channel_id, '.%')
+                             left join mp_channel q2 on q2.channel_no like concat(q1.channel_no, '.%')
                       where q1.level > 0 and q2.level> 0
                       group by q1.channel_id) t4 on t4.channel_id = t1.channel_id
            left join (select q1.channel_id,sum(q2.user_cnt) as user_cnt