moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复结算记录问题3

Browse Source
This commit is contained in:
liaozetao
2023-10-26 19:57:28 +08:00
parent 8a2a80d7e7
commit 964e180a4a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/flow/FlowTeamSettlementBizService.java
View File

@@ -11,6 +11,7 @@
package com.accompany.business.service.flow; package com.accompany.business.service.flow;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.accompany.common.constant.Constant; import com.accompany.common.constant.Constant;
import com.accompany.common.redis.RedisKey; import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus; import com.accompany.common.status.BusiStatus;
@@ -171,7 +172,7 @@ public class FlowTeamSettlementBizService {
List<FlowTeamSettlementInfo> withoutDataMonth = handleWithoutDataMonth(last12Months); List<FlowTeamSettlementInfo> withoutDataMonth = handleWithoutDataMonth(last12Months);
resInfos.addAll(settlementInfos); resInfos.addAll(settlementInfos);
resInfos.addAll(withoutDataMonth); resInfos.addAll(withoutDataMonth);
resInfos = resInfos.stream().sorted(Comparator.comparing(FlowTeamSettlementInfo::getMonth).reversed()).collect(Collectors.toList()); resInfos = resInfos.stream().filter(v -> StrUtil.isNotEmpty(v.getMonth())).sorted(Comparator.comparing(FlowTeamSettlementInfo::getMonth).reversed()).collect(Collectors.toList());
return resInfos; return resInfos;
} }

2
xuanyin-flow-team/xuanyin-flow-team-service/src/main/resources/xuanyin/mappers/FlowTeamSettlementInfoMapper.xml
View File

@@ -182,7 +182,7 @@
count(1) as totalGiveNum, count(1) as totalGiveNum,
ifnull(sum(dgh.diamond_num / 1000), 0) as totalGiveAmount ifnull(sum(dgh.diamond_num / 1000), 0) as totalGiveAmount
from flow_team_member_invite_user as fi from flow_team_member_invite_user as fi
left join diamond_give_history as dgh on dgh.to_uid = fi.uid inner join diamond_give_history as dgh on dgh.to_uid = fi.uid
where 1 = 1 where 1 = 1
<if test="queryLimitTime != null"> <if test="queryLimitTime != null">
and dgh.create_time >= #{queryLimitTime} and dgh.create_time >= #{queryLimitTime}