diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java index 60464e16c..13eb04c60 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java @@ -73,4 +73,14 @@ public class QueryOrderDTO extends BaseEntity { // private int pageNum; private List orderCodeList; + + /** + * 结算开始时间 + */ + private String startSettleTime; + + /** + * 结算结束时间 + */ + private String endSettleTime; } 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 f18637711..7daedf0c6 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 @@ -1985,7 +1985,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { return; } PileStationVO stationInfo = pileStationInfoService.getStationInfo(stationId); - // 查询站点前一天完成的订单 + // 查询站点前一天结算完成的订单 QueryOrderDTO dto = new QueryOrderDTO(); dto.setStationId(stationId); @@ -1998,8 +1998,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { String startTime = DateUtils.formatDateTime(LocalDateTime.of(parse, LocalTime.MIN)); String endTime = DateUtils.formatDateTime(LocalDateTime.of(parse, LocalTime.MAX)); - dto.setStartTime(startTime); - dto.setEndTime(endTime); + dto.setStartSettleTime(startTime); + dto.setEndSettleTime(endTime); List orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto); if (CollectionUtils.isEmpty(orderListVOS)) { logger.warn("站点:{}, 在{}-{}没有查询到订单数据", stationInfo.getStationName(), startTime, endTime); diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 4d1ec4489..298c97009 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -226,6 +226,12 @@ and t1.create_time #{endTime,jdbcType=VARCHAR} + + and t1.settlement_time = ]]> #{startSettleTime,jdbcType=VARCHAR} + + + and t1.settlement_time #{endSettleTime,jdbcType=VARCHAR} + and t1.merchant_id = #{merchantId,jdbcType=VARCHAR}