2023年9月20日17:23:40

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderController.java

@@ -821,4 +821,16 @@ public class OrderController extends BladeController {
 		}
 	}
 
+
+	/**
+	 * 获得app今日收入
+	 *
+	 * @param order
+	 * @return
+	 */
+	@GetMapping("/todayIncome")
+	public R todayIncome(PjOrder order) {
+		return orderService.todayIncome(order);
+	}
+
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/IOrderService.java

@@ -152,4 +152,6 @@ public interface IOrderService extends IService<PjOrder> {
 	IPage<PjOrderStatisticsWeb> statisticsPage(IPage<PjOrderStatisticsWeb> page, PjOrderStatisticsWeb order);
 
 	List<PjOrderStatisticsExcel> statisticsExport(PjOrderStatisticsWeb order);
+
+	R todayIncome(PjOrder order);
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -75,6 +75,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
 import java.math.MathContext;
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.YearMonth;
@@ -313,6 +314,25 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		return baseMapper.statisticsExport(order);
 	}
 
+	@Override
+	public R todayIncome(PjOrder order) {
+		Date date = new Date();
+		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+		String dateS = formatter.format(date);
+		List<PjOrder> orderList = baseMapper.selectList(new LambdaQueryWrapper<PjOrder>()
+			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
+			.eq(PjOrder::getIsDeleted, 0)
+			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())
+			.eq(PjOrder::getBsType, "XS")
+			.eq(PjOrder::getBusinesDate, dateS)
+			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))"));
+		if (orderList.size() > 0) {
+			return R.data(orderList.stream().map(PjOrder::getTotalMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+		} else {
+			return R.data(0);
+		}
+	}
+
 	/**
 	 * 保存订单信息
 	 *
@@ -890,7 +910,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			.eq(PjOrderItems::getIsDeleted, 0)
 			.eq(PjOrderItems::getPid, detail.getId());
 		List<PjOrderItems> orderItems = orderItemsMapper.selectList(itemsLambdaQueryWrapper);
-		for (PjOrderItems item:orderItems){
+		for (PjOrderItems item : orderItems) {
 			List<PjGoodsFiles> pjGoodsFiles = goodsFilesService.list(new LambdaQueryWrapper<PjGoodsFiles>()
 				.eq(PjGoodsFiles::getTenantId, AuthUtil.getTenantId())
 				.eq(PjGoodsFiles::getIsDeleted, 0)