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

重载计算站点订单报表方法

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-03-13 14:35:11 +08:00
parent c506c390ed
commit f232dd614c
3 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jsowell-pile/src/main/java/com/jsowell/pile/service/SettleOrderReportService.java
View File

@@ -6,6 +6,7 @@ import com.jsowell.pile.dto.GetClearingBillDTO;
import com.jsowell.pile.dto.MerchantOrderReportDTO;
import com.jsowell.pile.dto.SettleOrderReportDTO;
import com.jsowell.pile.vo.web.MerchantOrderReportVO;
import com.jsowell.pile.vo.web.PileStationVO;
import java.util.List;
import java.util.Map;
@@ -111,6 +112,15 @@ public interface SettleOrderReportService {
* @param tradeDate 交易日期
*/
void generateDailyOrderReports(String stationId, String tradeDate);
/**
* 计算站点订单报表
*
* @param stationInfo 站点信息
* @param tradeDate 交易日期
*/
void generateDailyOrderReports(PileStationVO stationInfo, String tradeDate);
Map<String, Object> queryUndividedOrder(SettleOrderReportDTO dto);
/**
@@ -120,5 +130,4 @@ public interface SettleOrderReportService {
*/
public PageResponse getMerchantClearingBillList(GetClearingBillDTO dto);
}

31
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
View File

@@ -40,10 +40,7 @@ import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -571,6 +568,28 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
tradeDate = LocalDate.now().plusDays(-1).toString();
}
PileStationVO stationInfo = pileStationInfoService.getStationInfo(stationId);
// 方法重载
generateDailyOrderReports(stationInfo, tradeDate);
}
/**
* 计算站点订单报表
*
* @param stationInfo 站点信息
* @param tradeDate 交易日期
*/
@Override
public void generateDailyOrderReports(PileStationVO stationInfo, String tradeDate) {
// logger.info("线程名===={}", Thread.currentThread().getName());
if (Objects.isNull(stationInfo)) {
return;
}
if (StringUtils.isBlank(tradeDate)) {
// 日期为空默认昨天
tradeDate = LocalDate.now().plusDays(-1).toString();
}
String stationId = stationInfo.getId();
// 查询站点前一天结算完成的订单
QueryOrderDTO dto = new QueryOrderDTO();
dto.setStationId(stationId);
@@ -583,10 +602,6 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
dto.setMerchantId(stationInfo.getMerchantId());
// 查询结算完成的订单
List<OrderListVO> orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto);
// if (CollectionUtils.isEmpty(orderListVOS)) {
// logger.info("站点:{}, 在{}-{}没有查询到订单数据", stationInfo.getStationName(), startTime, endTime);
// return;
// }
List<String> collect = orderListVOS.stream().map(OrderListVO::getOrderCode).collect(Collectors.toList());
log.info("站点:{}, 在{}-{}查询到订单数据{}条，订单编号:{}", stationInfo.getStationName(), startTime, endTime, orderListVOS.size(), collect);
// 统计出日报信息