autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Lemon
2023-10-27 16:50:23 +08:00
parent 3234590200
commit d49f661eab
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1954,17 +1954,19 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
orderCodeList.addAll(Lists.newArrayList(StringUtils.split(indexOrderInfoVO.getOrderCodes(), ",")));
}
// 查询对应数据
IndexOrderInfoVO detailInfo = orderBasicInfoMapper.getIndexOrderDetail(orderCodeList);
vo.setTotalOrderAmount(totalOrderAmount.toString());
vo.setTotalElectricity(totalElectricity.toString());
vo.setTotalPeakUsedElectricity(detailInfo.getTotalPeakUsedElectricity());
vo.setTotalFlatUsedElectricity(detailInfo.getTotalFlatUsedElectricity());
vo.setTotalSharpUsedElectricity(detailInfo.getTotalSharpUsedElectricity());
vo.setTotalValleyUsedElectricity(detailInfo.getTotalValleyUsedElectricity());
resultList.add(vo);
if (CollectionUtils.isNotEmpty(orderCodeList)) {
// 查询对应数据
IndexOrderInfoVO detailInfo = orderBasicInfoMapper.getIndexOrderDetail(orderCodeList);
vo.setTotalOrderAmount(totalOrderAmount.toString());
vo.setTotalElectricity(totalElectricity.toString());
if (detailInfo != null) {
vo.setTotalPeakUsedElectricity(detailInfo.getTotalPeakUsedElectricity());
vo.setTotalFlatUsedElectricity(detailInfo.getTotalFlatUsedElectricity());
vo.setTotalSharpUsedElectricity(detailInfo.getTotalSharpUsedElectricity());
vo.setTotalValleyUsedElectricity(detailInfo.getTotalValleyUsedElectricity());
}
resultList.add(vo);
}
}
resultList = resultList.stream().sorted(Comparator.comparing(IndexOrderInfoVO::getDate)).collect(Collectors.toList());
return resultList;