autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-19 18:45:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

查询运营商订单报表V3

Browse Source
This commit is contained in:
Guoqs
2025-01-10 15:31:00 +08:00
parent 841ae04fba
commit ba38feb27a
3 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/SettleOrderReportController.java
View File

@@ -114,6 +114,17 @@ public class SettleOrderReportController extends BaseController {
return AjaxResult.success(settleOrderReportService.getMerchantOrderReportV2(dto));
}
/**
* 查询运营商订单报表V3
* @param dto
* @return
*/
// @PreAuthorize("@ss.hasPermi('pile:merchant:query')")
@PostMapping("/getMerchantOrderReportV3")
public AjaxResult getMerchantOrderReportV3(@RequestBody MerchantOrderReportDTO dto) {
return AjaxResult.success(settleOrderReportService.getMerchantOrderReportV3(dto));
}
/**
* 查询站点订单日报详情
* http://localhost:8080/order/report/getStationOrderReportDetail

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

@@ -81,6 +81,8 @@ public interface SettleOrderReportService {
MerchantOrderReportVO getMerchantOrderReportV2(MerchantOrderReportDTO dto);
MerchantOrderReportVO getMerchantOrderReportV3(MerchantOrderReportDTO dto);
int deleteByPrimaryKey(Integer id);
// int insert(SettleOrderReport record);

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

@@ -364,6 +364,36 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
return vo;
}
@Override
public MerchantOrderReportVO getMerchantOrderReportV3(MerchantOrderReportDTO dto) {
int pageNum = dto.getPageNum() == null ? 1 : dto.getPageNum();
int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
if (StringUtils.isBlank(dto.getStartTime())) {
dto.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(new Date(), -7)));
}
if (StringUtils.isBlank(dto.getEndTime())) {
dto.setEndTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, new Date()));
}
MerchantOrderReportVO vo = new MerchantOrderReportVO();
vo.setMerchantId(dto.getMerchantId());
PageUtils.startPage(pageNum, pageSize);
GetClearingBillDTO clearingBillDTO = GetClearingBillDTO.builder()
.merchantId(dto.getMerchantId())
.startTime(dto.getStartTime())
.endTime(dto.getEndTime())
.pageNum(dto.getPageNum())
.pageSize(dto.getPageSize())
.build();
// 清分账单列表
PageResponse pageResponse = getMerchantClearingBillList(clearingBillDTO);
vo.setPageResponse(pageResponse);
// 进行数据汇总
MerchantOrderReportVO.MerchantOrderReport report = queryMerchantOrderReport(dto);
vo.setMerchantOrderReport(report);
return vo;
}
private MerchantOrderReportVO.MerchantOrderReport queryMerchantOrderReport(MerchantOrderReportDTO dto) {
// 进行数据汇总
MerchantOrderReportVO.MerchantOrderReport report = new MerchantOrderReportVO.MerchantOrderReport();