zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zengtao01
2024-04-22 16:24:47 +08:00
parent f920300cb8 7e398c0fe6
commit f9025080dc
7 changed files with 61 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/customertraffic/CustomerTrafficServiceImpl.java
View File

@ -125,10 +125,10 @@ public class CustomerTrafficServiceImpl implements CustomerTrafficService {
return list;
}else{
List<CustomerTrafficDetailDO> all = customerTrafficMapper.getAllCustomerNum(storeId, startDate, endDate);
all.sort(Comparator.comparing(CustomerTrafficDetailDO::getCustomerNum));
all.sort(Comparator.comparing(CustomerTrafficDetailDO::getCreateTime));
List<CustomerTrafficDetailDO> list=new ArrayList<>();
//拆分
List<List<CustomerTrafficDetailDO>> split = ListUtil.split(list, 3);
List<List<CustomerTrafficDetailDO>> split = ListUtil.split(all, 3);
for (List<CustomerTrafficDetailDO> dos : split) {
CustomerTrafficDetailDO aDo = BeanUtil.toBean(dos.get(0), CustomerTrafficDetailDO.class);
aDo.setCustomerNum(dos.stream().mapToInt(CustomerTrafficDetailDO::getCustomerNum).sum());