完善销售报表

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderStatisticsService.java

@@ -376,20 +376,25 @@ public class KwoTradeOrderStatisticsService {
             }
             
             // 计算累计数据
-            if (createTime != null && createTime.compareTo(queryDto.getEndTime()) <= 0){
+            if (createTime.compareTo(queryDto.getEndTime()) <= 0){
                 vo.setCumulativeQuantity(vo.getCumulativeQuantity().add(amount));
                 vo.setCumulativeAmount(vo.getCumulativeAmount().add(price));
                 if (vo.getCumulativeQuantity().compareTo(BigDecimal.ZERO) > 0) {
                     vo.setCumulativeAveragePrice(vo.getCumulativeAmount().divide(vo.getCumulativeQuantity(), 2, RoundingMode.HALF_UP));
                 }
-            }
-            
-            // 计算当前时间段数据
-            if (createTime != null && createTime.compareTo(queryDto.getStartTime()) >= 0 && createTime.compareTo(queryDto.getEndTime()) <= 0) {
-                vo.setSalesQuantity(vo.getSalesQuantity().add(amount));
-                vo.setSalesAmount(vo.getSalesAmount().add(price));
-                if (vo.getSalesQuantity().compareTo(BigDecimal.ZERO) > 0) {
-                    vo.setAveragePrice(vo.getSalesAmount().divide(vo.getSalesQuantity(), 2, RoundingMode.HALF_UP));
+                // 计算当前时间段数据
+                if(queryDto.getStartTime() == null){
+                    vo.setSalesQuantity(vo.getSalesQuantity().add(amount));
+                    vo.setSalesAmount(vo.getSalesAmount().add(price));
+                    if (vo.getSalesQuantity().compareTo(BigDecimal.ZERO) > 0) {
+                        vo.setAveragePrice(vo.getSalesAmount().divide(vo.getSalesQuantity(), 2, RoundingMode.HALF_UP));
+                    }
+                }else if(createTime.compareTo(queryDto.getStartTime()) >= 0){
+                    vo.setSalesQuantity(vo.getSalesQuantity().add(amount));
+                    vo.setSalesAmount(vo.getSalesAmount().add(price));
+                    if (vo.getSalesQuantity().compareTo(BigDecimal.ZERO) > 0) {
+                        vo.setAveragePrice(vo.getSalesAmount().divide(vo.getSalesQuantity(), 2, RoundingMode.HALF_UP));
+                    }
                 }
             }
         }