Merge remote-tracking branch 'origin/dev' into dev

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

@@ -127,7 +127,7 @@ public class DayStatTask {
     if (totalSize > pageSize) {
       totalPage = totalSize % pageSize == 0 ? totalSize / pageSize : totalSize / pageSize + 1;
     }
-      BigDecimal sumSaleAmt = BigDecimal.ZERO;
+    BigDecimal sumSaleAmt = BigDecimal.ZERO;
     BigDecimal sumAllSaleAmt = BigDecimal.ZERO;
     for (int i = 0; i < totalPage; i++) {
       queryWrapper.orderByAsc(TicketBox::getBoxNo);
@@ -146,7 +146,14 @@ 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),
+
+          Map<String, Object> allOrderMap = userTicketOrderService.getMap(
+              new QueryWrapper<UserTicketOrder>()
+                  .select("IFNULL(sum(pay_amt) ,0) as orderAmt")
+                  .lambda().eq(UserTicketOrder::getBoxId, ticketBox.getBoxId())
+                  .eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.FINISHED));
+          BigDecimal allOrderAmt = new BigDecimal(
+              Integer.valueOf(String.valueOf(allOrderMap.get("orderAmt")))).divide(new BigDecimal(100),
               2, RoundingMode.DOWN);
           sumAllSaleAmt = sumAllSaleAmt.add(allOrderAmt);