app 今天轮胎销售统计改为和pc端一致

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/statistics/service/impl/StatisticsServiceImpl.java

@@ -25,8 +25,10 @@ import org.springblade.common.enums.BsTypeEnum;
 import org.springblade.common.enums.CommonEnum;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.salesPart.corps.service.ICorpsDescService;
 import org.springblade.salesPart.dto.*;
 import org.springblade.salesPart.entity.PjCorpsDesc;
@@ -422,7 +424,28 @@ public class StatisticsServiceImpl implements IStatisticsService {
 
 	@Override
 	public R dayNumber() {
-		List<PjOrder> pjOrderList = orderService.list(new LambdaQueryWrapper<PjOrder>()
+		BladeUser bladeUser = AuthUtil.getUser();
+		Date nowDate = DateUtil.now();
+		SaleDetail saleDetailDto = new SaleDetail();
+		saleDetailDto.setTenantId(bladeUser.getTenantId());
+		saleDetailDto.setSalesCompanyId(bladeUser.getDeptId());
+		saleDetailDto.setBsType("XS,TKXS");
+		saleDetailDto.setIsContain("0");
+		String nowDateStr = DateUtil.format(nowDate, DateUtil.PATTERN_DATE);
+		saleDetailDto.setBusinesDateStart(nowDateStr);
+		saleDetailDto.setBusinesDateEnd(nowDateStr);
+		List<SaleDetailDto> saleDetailDtoList = orderItemsService.saleDetailList(saleDetailDto);
+		if (CollectionUtils.isEmpty(saleDetailDtoList)) {
+			return R.data(BigDecimal.ZERO);
+		}
+		BigDecimal goodsNumActualDay = saleDetailDtoList.stream().filter(e -> !"已取消".equals(e.getStatus()) && !"已完成".equals(e.getStatus()))
+			.map(SaleDetailDto::getGoodsNum).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)
+			.setScale(0, RoundingMode.HALF_UP).abs();
+		BigDecimal goodsNumReturnsDay = saleDetailDtoList.stream().filter(e -> "已完成".equals(e.getStatus()))
+			.map(SaleDetailDto::getGoodsNum).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)
+			.setScale(0, RoundingMode.HALF_UP).abs();
+		return R.data(goodsNumActualDay.subtract(goodsNumReturnsDay));
+/*		List<PjOrder> pjOrderList = orderService.list(new LambdaQueryWrapper<PjOrder>()
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
 			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(PjOrder::getIsDeleted, 0)
@@ -448,7 +471,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 		} else {
 
 			return R.data(0);
-		}
+		}*/
 	}
 
 	@Override