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

订单日报计算前一天结算完成的订单

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-07-24 14:23:38 +08:00
parent a17412968c
commit 332d2f7d92
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java
View File

@@ -73,4 +73,14 @@ public class QueryOrderDTO extends BaseEntity {
// private int pageNum; // private int pageNum;
private List<String> orderCodeList; private List<String> orderCodeList;
/**
* 结算开始时间
*/
private String startSettleTime;
/**
* 结算结束时间
*/
private String endSettleTime;
} }

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

@@ -1985,7 +1985,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
return; return;
} }
PileStationVO stationInfo = pileStationInfoService.getStationInfo(stationId); PileStationVO stationInfo = pileStationInfoService.getStationInfo(stationId);
// 查询站点前一天完成的订单 // 查询站点前一天结算完成的订单
QueryOrderDTO dto = new QueryOrderDTO(); QueryOrderDTO dto = new QueryOrderDTO();
dto.setStationId(stationId); dto.setStationId(stationId);
@@ -1998,8 +1998,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
String startTime = DateUtils.formatDateTime(LocalDateTime.of(parse, LocalTime.MIN)); String startTime = DateUtils.formatDateTime(LocalDateTime.of(parse, LocalTime.MIN));
String endTime = DateUtils.formatDateTime(LocalDateTime.of(parse, LocalTime.MAX)); String endTime = DateUtils.formatDateTime(LocalDateTime.of(parse, LocalTime.MAX));
dto.setStartTime(startTime); dto.setStartSettleTime(startTime);
dto.setEndTime(endTime); dto.setEndSettleTime(endTime);
List<OrderListVO> orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto); List<OrderListVO> orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto);
if (CollectionUtils.isEmpty(orderListVOS)) { if (CollectionUtils.isEmpty(orderListVOS)) {
logger.warn("站点:{}, 在{}-{}没有查询到订单数据", stationInfo.getStationName(), startTime, endTime); logger.warn("站点:{}, 在{}-{}没有查询到订单数据", stationInfo.getStationName(), startTime, endTime);

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

@@ -226,6 +226,12 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and t1.create_time <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR} and t1.create_time <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR}
</if> </if>
<if test="startSettleTime != null and startSettleTime != ''">
and t1.settlement_time <![CDATA[ >= ]]> #{startSettleTime,jdbcType=VARCHAR}
</if>
<if test="endSettleTime != null and endSettleTime != ''">
and t1.settlement_time <![CDATA[ <= ]]> #{endSettleTime,jdbcType=VARCHAR}
</if>
<if test="merchantId != null and merchantId != ''"> <if test="merchantId != null and merchantId != ''">
and t1.merchant_id = #{merchantId,jdbcType=VARCHAR} and t1.merchant_id = #{merchantId,jdbcType=VARCHAR}
</if> </if>