小b首页数据

src/main/java/org/springblade/gateway/shop_gateway/controller/AppShopController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.Map;
 
 
 /**
@@ -53,7 +54,7 @@ public class AppShopController {
 		int newMembers = memberService.getBaseMapper().selectCount(new QueryWrapper<Member>()
 			.lambda()
 			.eq(Member::getShopId,shopId)
-			.gt(Member::getCreateTime, DateUtil.beginOfDay(new Date()))
+			.lt(Member::getCreateTime, DateUtil.beginOfDay(new Date()))
 		);
 		//店铺会员总数
 		int allMembers = memberService.getBaseMapper().selectCount(new QueryWrapper<Member>().lambda().eq(Member::getShopId,shopId));
@@ -62,13 +63,16 @@ public class AppShopController {
 		Shop shop = shopService.getById(shopId);
 		BigDecimal totalValue = shop.getBalance().add(shop.getCharge());
 
-		//店铺今日收入
-		BigDecimal todayCharge = billsService.getOne(new QueryWrapper<Bills>()
-			.select("sum(price) as price")
+		//今日营收
+		QueryWrapper<Bills> queryWrapper = new QueryWrapper<>();
+
+		queryWrapper.select("IFNULL(sum(price),0) as todayCharge")
 			.lambda()
-			.eq(Bills::getReceiveId,shopId)
-			.gt(Bills::getCreateTime, DateUtil.beginOfDay(new Date()))
-		).getPrice();
+			.eq(Bills::getReceiveId, shopId)
+			.lt(Bills::getCreateTime, DateUtil.beginOfDay(new Date()));
+
+		Map<String, Object> map = billsService.getMap(queryWrapper);
+		BigDecimal todayCharge = (BigDecimal) map.get("todayCharge");
 
 		return R.data(
 			IndexVO.builder()