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

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-03 14:54:46 +08:00
parent 382d9bdcac
commit bf14149db3
2 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1548,25 +1548,58 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
dto.setStationIdList(stationIdList); dto.setStationIdList(stationIdList);
// return orderBasicInfoMapper.getIndexOrderInfo(dto); // return orderBasicInfoMapper.getIndexOrderInfo(dto);
List<IndexOrderInfoVO> voList = orderBasicInfoMapper.getIndexOrderInfoV2(dto); List<IndexOrderInfoVO> voList = orderBasicInfoMapper.getIndexOrderInfoV2(dto);
for (IndexOrderInfoVO indexOrderInfoVO : voList) {
String orderCodes = indexOrderInfoVO.getOrderCodes();
// 获取到所有的订单号列表 Map<String, List<IndexOrderInfoVO>> map = voList.stream().collect(Collectors.groupingBy(IndexOrderInfoVO::getDate));
if (StringUtils.isBlank(orderCodes)) {
continue; List<IndexOrderInfoVO> resultList = Lists.newArrayList();
IndexOrderInfoVO vo;
for (Map.Entry<String, List<IndexOrderInfoVO>> entry : map.entrySet()) {
vo = new IndexOrderInfoVO();
vo.setDate(entry.getKey());
BigDecimal totalElectricity = BigDecimal.ZERO;
BigDecimal totalOrderAmount = BigDecimal.ZERO;
List<String> orderCodeList = Lists.newArrayList();
for (IndexOrderInfoVO indexOrderInfoVO : entry.getValue()) {
totalOrderAmount = totalOrderAmount.add(new BigDecimal(indexOrderInfoVO.getTotalOrderAmount()));
totalElectricity = totalElectricity.add(new BigDecimal(indexOrderInfoVO.getTotalElectricity()));
orderCodeList.addAll(Lists.newArrayList(StringUtils.split(indexOrderInfoVO.getOrderCodes(), ",")))
} }
List<String> orderCodeList = Arrays.asList(orderCodes.split(","));
// 查询对应数据 // 查询对应数据
IndexOrderInfoVO detailInfo = orderBasicInfoMapper.getIndexOrderDetail(orderCodeList); IndexOrderInfoVO detailInfo = orderBasicInfoMapper.getIndexOrderDetail(orderCodeList);
if (detailInfo == null) {
continue;
}
indexOrderInfoVO.setTotalSharpUsedElectricity(detailInfo.getTotalSharpUsedElectricity());
indexOrderInfoVO.setTotalPeakUsedElectricity(detailInfo.getTotalPeakUsedElectricity());
indexOrderInfoVO.setTotalFlatUsedElectricity(detailInfo.getTotalFlatUsedElectricity());
indexOrderInfoVO.setTotalValleyUsedElectricity(detailInfo.getTotalValleyUsedElectricity());
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);
} }
return voList;
// for (IndexOrderInfoVO indexOrderInfoVO : voList) {
// String orderCodes = indexOrderInfoVO.getOrderCodes();
// // 获取到所有的订单号列表
// if (StringUtils.isBlank(orderCodes)) {
// continue;
// }
// List<String> orderCodeList = Arrays.asList(orderCodes.split(","));
// // 查询对应数据
// IndexOrderInfoVO detailInfo = orderBasicInfoMapper.getIndexOrderDetail(orderCodeList);
// if (detailInfo == null) {
// continue;
// }
// indexOrderInfoVO.setTotalSharpUsedElectricity(detailInfo.getTotalSharpUsedElectricity());
// indexOrderInfoVO.setTotalPeakUsedElectricity(detailInfo.getTotalPeakUsedElectricity());
// indexOrderInfoVO.setTotalFlatUsedElectricity(detailInfo.getTotalFlatUsedElectricity());
// indexOrderInfoVO.setTotalValleyUsedElectricity(detailInfo.getTotalValleyUsedElectricity());
//
// }
return resultList;
} }
/** /**

1
jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
View File

@@ -1127,7 +1127,6 @@
#{item,jdbcType=VARCHAR} #{item,jdbcType=VARCHAR}
</foreach> </foreach>
</if> </if>
group by trade_date
</select> </select>
<select id="getIndexOrderDetail" resultType="com.jsowell.pile.vo.web.IndexOrderInfoVO"> <select id="getIndexOrderDetail" resultType="com.jsowell.pile.vo.web.IndexOrderInfoVO">