hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rechargeAgentAmount 查询逻辑修复

Browse Source
This commit is contained in:
tianfeng 2026-03-02 16:41:53 +08:00
parent bcabd67844
commit f686b95e30
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/user/RechargeUserServiceImpl.java
View File

@ -110,14 +110,12 @@ public class RechargeUserServiceImpl implements RechargeUserService {
BigDecimal currentMonthRecharge = BigDecimal.ZERO;
for (AdminRechargeAgentRelation relation : relations) {
String monthStart = relation.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
String monthEnd = YearMonth.now().atEndOfMonth().atTime(23, 59, 59).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
// LocalDateTime actualStartTime = relation.getCreateTime().isAfter(startTime)
// ? relation.getCreateTime()
// : startTime;
//
// String monthStart = actualStartTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
// String monthEnd = endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
LocalDateTime actualStartTime = relation.getCreateTime().isAfter(startTime)
? relation.getCreateTime()
: startTime;
String monthStart = actualStartTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
String monthEnd = endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
BigDecimal monthRecharge = freightGoldClient.getTotalAmountByCondition(relation.getUserId(), monthStart, monthEnd, RECHARGE_TYPE).getBody();
currentMonthRecharge = currentMonthRecharge.add(monthRecharge != null ? monthRecharge : BigDecimal.ZERO);