From b876f27c592c5d44e4b32b79d4ef4bc25fe88603 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 20 七月 2025 15:21:04 +0800
Subject: [PATCH] Merge branch 'huliguo' of http://120.76.84.145:10101/gitblit/r/java/ZhengShengXinAdmin into huliguo
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppUserServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppUserServiceImpl.java
index 18678f6..9276ea6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppUserServiceImpl.java
@@ -62,9 +62,12 @@
//2.2计算订单金额 扣减超时订单金额
for(BuyerInfoAndOrder order :orders) {
BigDecimal total = new BigDecimal("0.00");
+ order.setPrice(order.getPrice()==null?BigDecimal.ZERO:order.getPrice());
+ order.setCommissionPrice(order.getCommissionPrice()==null?BigDecimal.ZERO:order.getCommissionPrice());
+ order.setCommissionPlatform(order.getCommissionPlatform()==null?BigDecimal.ZERO:order.getCommissionPlatform());
total = total.add(order.getPrice()).subtract(order.getCommissionPrice()).subtract(order.getCommissionPlatform());
System.out.println(total);
- //扣减超时订单
+ /*//扣减超时订单
//到期时间 支付时间 + 预计时间 + 新增时间
LocalDateTime end = order.getPayTime().plusDays(order.getEstimatedDays()).plusDays(order.getAddDay());
LocalDateTime now = LocalDateTime.now();//计算扣费时间
@@ -78,7 +81,7 @@
long days= (seconds + 86399) / 86400;//24小时
//计算天数差
BigDecimal dailyAmount = new BigDecimal("100.00");
- total = total.subtract((dailyAmount.multiply(BigDecimal.valueOf(days))));
+ total = total.subtract((dailyAmount.multiply(BigDecimal.valueOf(days))));*/
recorded = recorded.add(total);
}
@@ -90,6 +93,10 @@
//3.下级用户
List<InviteUser> list = this.baseMapper.getInviteUserListByInviteId(id);
vo.setInviteUserList(list);
+
+ List<AccountDetail> list1 = accountDetailMapper.selectList(new LambdaQueryWrapper<AccountDetail>().eq(AccountDetail::getCategory, 2).eq(AccountDetail::getStatus, 1).eq(AccountDetail::getUserId, id));
+ BigDecimal reduce2 = list1.stream().map(AccountDetail::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+ vo.setRecorded(reduce2);
return vo;
}
@@ -120,6 +127,7 @@
accountDetail.setUserId(dto.getId());
accountDetail.setType(dto.getType());
accountDetail.setMoney(dto.getMoney());
+ accountDetail.setCategory(6);
accountDetail.setRemark(dto.getRemark());
accountDetailMapper.insert(accountDetail);
//修改用户余额
@@ -133,7 +141,5 @@
user.setUpdateTime(LocalDateTime.now());
user.setUpdateBy(getLoginUser().getUserId());
this.baseMapper.updateById(user);
- //todo 是否需要加消息
-
}
}
--
Gitblit v1.7.1