diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index fa691a152..f753e4afb 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1989,7 +1989,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { // return orderBasicInfoMapper.getIndexOrderInfo(dto); List voList = orderBasicInfoMapper.getIndexOrderInfoV2(dto); - Map> map = voList.stream().collect(Collectors.groupingBy(IndexOrderInfoVO::getDate)); List resultList = Lists.newArrayList(); diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 255a58668..14668798e 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -2701,7 +2701,8 @@ use_electricity AS totalElectricity, total_amount as totalOrderAmount from settle_order_report - where date(trade_date) >= DATE_SUB(CURDATE(), INTERVAL 30 day) + where del_flag = '0' + and date(trade_date) >= DATE_SUB(CURDATE(), INTERVAL 30 day) and station_id = #{dto.stationId,jdbcType=VARCHAR}