From 04ce420613f90f8414e87e8fe68484fc32485349 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 24 六月 2025 18:49:06 +0800
Subject: [PATCH] 部署
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index 704a60f..90d1020 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -105,6 +105,12 @@
return appUserService.mobileLogin(mobileLogin);
}
+ @ResponseBody
+ @PostMapping("/registerAccount")
+ @ApiOperation(value = "注册新账号")
+ public R<LoginVo> registerAccount(@RequestBody RegisterAccount registerAccount) {
+ return appUserService.registerAccount(registerAccount);
+ }
@GetMapping("/logout")
@ApiOperation(value = "登出")
@@ -519,11 +525,10 @@
userStatistics.setTotalUser(appUserList.size());//总用户数
userStatistics.setConsumerUser((int) consumerUser);//消费过的用户
- //用户类型统计门店
- long shopUserCount = appUserList.stream()
- .filter(appUser -> appUser.getUserType() == 2)
- .count();
- userStatistics.setShopUser((int) shopUserCount);
+ //拥有店铺用户数
+ Integer shopUserCount = appUserShopService.getHaveShopUserNum();
+
+ userStatistics.setShopUser(shopUserCount);
//门店总数
long shopNum = shopClient.getAllShop().getData().size();
@@ -552,12 +557,19 @@
if (result == null || result.get("total_points") == null) {
userStatistics.setTotalScore(0L);
}else {
- userStatistics.setTotalScore((Long) result.get("total_points"));
+ userStatistics.setTotalScore(((BigDecimal) result.get("total_points")).longValue());
}
-
- //统计消费积分和现金支付数
- Map<String, Object> data = orderClient.getConsumeScoreAndPayAmount(userId).getData();
-
+ //条件构造 消费积分现金支付金额
+ queryWrapper.clear();
+ QueryWrapper<AppUser> queryWrapper1 = new QueryWrapper<>();
+ queryWrapper1.select("sum(exchange_point + transferable_out_point - cancel_point) as total_points");
+ queryWrapper1.select("sum(shop_amount) as payment_amounts ");
+ queryWrapper1.eq("del_flag", 0);//未删除的
+ queryWrapper1.ne("status", 3);//未注销的
+ if (userId != null) {
+ queryWrapper1.eq("id", userId);
+ }
+ Map<String, Object> data = appUserShopService.getPointAndPayAmount(userId);
if (data == null || data.get("total_points") == null) {
userStatistics.setConsumeScore(0L);
}else {
@@ -569,7 +581,6 @@
}else {
userStatistics.setShopAmount(new BigDecimal(data.get("payment_amounts").toString()));
}
-
return R.ok(userStatistics);
}
--
Gitblit v1.7.1