From 6b58e1804d8f34c5b17b694f6db0e3c161f15ad5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 10:59:38 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 81e91a9..877b36a 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
@@ -34,6 +34,7 @@
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import io.swagger.annotations.*;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -437,11 +438,14 @@
public R<IPage<AppUser>> shopGetAppuserPage(@ApiParam("页码") @RequestParam Integer pageCurr,
@ApiParam("每一页数据大小") Integer pageSize,
AppUser appUser) {
- Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
+ Long userid = tokenService.getLoginUser().getUserid();
+ R<SysUser> sysUserR = sysUserClient.getSysUser(userid);
+ SysUser sysUser = sysUserR.getData();
List<Long> userIds = new ArrayList<>();
userIds.add(-1L);
//获取在该本店下单的用户ids
+ Integer objectId = sysUser.getObjectId();
R<List<Order>> listR = remoteOrderGoodsClient.byShopId(objectId);
for (Order datum : listR.getData()) {
userIds.add(datum.getAppUserId());
@@ -546,6 +550,9 @@
@GetMapping("/detail")
@ApiOperation(value = "用户列表-详情", tags = {"管理后台"})
public R<AppUser> detail(Long id) {
+
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserClient.getSysUser(userid).getData();
AppUser byId = appUserService.getById(id);
if (byId.getShopId() != null) {
R<Shop> shopById = shopClient.getShopById(Integer.parseInt(String.valueOf(byId.getShopId())));
@@ -576,6 +583,14 @@
List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, id).list();
byId.setBottomUsers(list);
//消费总金额
+ R<List<Order>> orderR = remoteOrderGoodsClient.byShopId(sysUser.getObjectId());
+ List<Order> orderList = orderR.getData();
+ if (!CollectionUtils.isEmpty(orderList)){
+ BigDecimal paymentAmount = orderList.stream().map(Order::getPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ byId.setShopAmount(paymentAmount);
+ }else {
+ byId.setShopAmount(BigDecimal.ZERO);
+ }
return R.ok(byId);
}
@@ -649,11 +664,14 @@
SysUser data = sysUserClient.getSysUser(userid).getData();
Integer shopId = null;
Set<Long> userId = null;
+ Set<Long> userIdT = null;
if(data.getRoleType() == 2){
shopId = data.getObjectId();
userId = orderClient.getAppUserByShoppingShop(shopId).getData();
}
UserStatistics userStatistics = appUserMapper.getUserStatistics(shopId, userId);
+ UserStatistics userStatistics1 = appUserMapper.getUserStatistics(shopId, userIdT);
+ userStatistics.setShopUser(userStatistics1.getShopUser());
return R.ok(userStatistics);
}
--
Gitblit v1.7.1