Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!499

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::getUpdatedTime, bizDay)
-                .lt(UserTicketOrder::getUpdatedTime, DateUtils.addDays(bizDay, 1)));
+                .ge(UserTicketOrder::getPayTime, bizDay)
+                .lt(UserTicketOrder::getPayTime, DateUtils.addDays(bizDay, 1)));
         if (null != orderMap) {
           BigDecimal orderAmt = new BigDecimal(
               Integer.valueOf(String.valueOf(orderMap.get("orderAmt")))).divide(new BigDecimal(100),
@@ -152,7 +152,7 @@ public class DayStatTask {
                   .select("IFNULL(sum(pay_amt) ,0) as orderAmt")
                   .lambda().eq(UserTicketOrder::getBoxId, ticketBox.getBoxId())
                   .eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.FINISHED)
-                  .lt(UserTicketOrder::getUpdatedTime, DateUtils.addDays(bizDay, 1)));
+                  .lt(UserTicketOrder::getPayTime, DateUtils.addDays(bizDay, 1)));
           BigDecimal allOrderAmt = new BigDecimal(
               Integer.valueOf(String.valueOf(allOrderMap.get("orderAmt")))).divide(new BigDecimal(100),
               2, RoundingMode.DOWN);