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

优化

See merge request quanshu/mp-server!740

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

@@ -240,7 +240,9 @@ public class DayStatTask {
         }
       }
     }
-
+    sumSaleAmt = BigDecimal.ZERO.add(onlineSumSaleAmt).add(offlineSumSaleAmt);
+    sumAllSaleAmt = BigDecimal.ZERO.add(onlineSumAllSaleAmt).add(offlineSumAllSaleAmt);
+    sb.append("累计零售总销售金额：").append(sumAllSaleAmt).append("元，当日：").append(sumSaleAmt).append("元\n");
     sb.append("线上累计零售销售金额：").append(onlineSumAllSaleAmt).append("元，当日：").append(onlineSumSaleAmt).append("元\n");
     sb.append("线下累计零售销售金额：").append(offlineSumAllSaleAmt).append("元，当日：").append(offlineSumSaleAmt).append("元，").append("累计预付销售金额：").append(sumAllPreSaleAmt).append("元，当日：").append(sumPreSaleAmt).append("元\n");