From 1f09f6daaf73bc83cceb4ae22b862b7b365635cf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 03 四月 2025 19:59:17 +0800
Subject: [PATCH] 修改反馈文档bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 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 5dae7c5..69105c6 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
@@ -99,6 +99,8 @@
@Resource
private BalanceChangeRecordService balanceChangeRecordService;
@Resource
+ private BalanceChangeRecordCopyService balanceChangeRecordCopyService;
+ @Resource
private UserChangeLogService userChangeLogService;
@Resource
private RedisService redisService;
@@ -750,6 +752,8 @@
appUser.setExcludeStatus(3);
IPage<AppUser> appuserPage = appUserService.getAppuserPage(pageNum, pageSize, appUser, shopId, userId);
for (AppUser record : appuserPage.getRecords()) {
+ List<AppUserGiveawayTemporary> list = appUserGiveawayTemporaryService.list(new LambdaQueryWrapper<AppUserGiveawayTemporary>().eq(AppUserGiveawayTemporary::getAppUserId, record.getId()));
+ int sum = list.stream().mapToInt(AppUserGiveawayTemporary::getTotalPoint).sum();
if (record.getInviteUserId() != null) {
AppUser byId1 = appUserService.getById(record.getInviteUserId());
if (byId1!=null) {
@@ -761,7 +765,7 @@
record.setShopName(shop1.getName());
record.setShopId(shop1.getId());
}
- record.setTotalPoint(record.getUserTotalPoint());
+ record.setTotalPoint(record.getUserTotalPoint() + sum);
}
return R.ok(appuserPage);
}
@@ -1163,6 +1167,11 @@
Integer shopId = data.getObjectId();
List<Order> orders = orderClient.getRedeemedOrdersByShop(shopId).getData();
List<Long> userIds = orders.stream().map(Order::getAppUserId).collect(Collectors.toList());
+ Set<Long> shopServerUser = getShopServerUser(shopId);
+ userIds.addAll(shopServerUser);
+ if(userIds.size() == 0){
+ userIds.add(-1L);
+ }
queryWrapper.in(!CollectionUtils.isEmpty(userIds), "id", userIds); // userIds 不为空时，查询 id 在 userIds 中
}
queryWrapper.eq("del_flag", 0);
@@ -1206,8 +1215,8 @@
public R<UserStatisticsDetail> statisticsDetail(@ApiParam(value = "用户id") Long userId) {
Long userid = tokenService.getLoginUser().getUserid();
SysUser data = sysUserClient.getSysUser(userid).getData();
- Integer shopId = null;
- Set<Long> userIds = null;
+ Integer shopId = 0;
+ Set<Long> userIds = new HashSet<>();
if(null != userId){
userIds = new HashSet<>();
userIds.add(userId);
@@ -1225,6 +1234,9 @@
}
UserStatisticsDetail userStatisticsDetail = appUserMapper.getUserStatisticsDetail(null, userIds);
+ List<Order> orderList = orderClient.getOrderByAppUserIdsAndWriteOffShop(shopId, userIds).getData();
+ BigDecimal shopAmount = orderList.stream().map(Order::getPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ userStatisticsDetail.setShopAmount(shopAmount);
return R.ok(userStatisticsDetail);
}
@@ -1264,6 +1276,35 @@
queryWrapper.in(BalanceChangeRecord::getAppUserId, appUserIds);
}
List<BalanceChangeRecord> list = balanceChangeRecordService.list(queryWrapper);
+ for (BalanceChangeRecord balanceChangeRecord : list) {
+ balanceChangeRecord.setChangeAmount(balanceChangeRecord.getChangeAmount().multiply(new BigDecimal(balanceChangeRecord.getChangeDirection())));
+ }
+
+ LambdaQueryWrapper<BalanceChangeRecordCopy> queryWrapper1 = new LambdaQueryWrapper<BalanceChangeRecordCopy>()
+ .between(BalanceChangeRecordCopy::getCreateTime, date, date.plusDays(1))
+ .eq(BalanceChangeRecordCopy::getChangeType, 4)
+ .eq(BalanceChangeRecordCopy::getVipId, i);
+ if(sysUser.getRoleType() == 2){
+ Integer objectId = sysUser.getObjectId();
+ List<AppUser> list1 = appUserService.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getShopId, objectId).eq(AppUser::getDelFlag, 0).ne(AppUser::getStatus, 1));
+ List<Long> appUserIds = list1.stream().map(AppUser::getId).collect(Collectors.toList());
+ Set<Long> data = orderClient.getAppUserByShoppingShop(objectId).getData();
+ if(null != data){
+ appUserIds.addAll(data);
+ }
+ if(appUserIds.size() == 0){
+ appUserIds.add(-1L);
+ }
+ queryWrapper1.in(BalanceChangeRecordCopy::getAppUserId, appUserIds);
+ }
+ List<BalanceChangeRecordCopy> list2 = balanceChangeRecordCopyService.list(queryWrapper1);
+ for (BalanceChangeRecordCopy balanceChangeRecordCopy : list2) {
+ BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
+ BeanUtils.copyProperties(balanceChangeRecordCopy, balanceChangeRecord);
+ balanceChangeRecord.setChangeAmount(balanceChangeRecord.getChangeAmount().multiply(new BigDecimal(balanceChangeRecord.getChangeDirection())));
+ list.add(balanceChangeRecord);
+ }
+
BigDecimal reduce = list.stream().map(BalanceChangeRecord::getChangeAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
String dateKey = date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
dailyVipCommissions.computeIfAbsent(dateKey, k -> new HashMap<>())
--
Gitblit v1.7.1