diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/SettleOrderReportController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/SettleOrderReportController.java index f173d42c6..ed0eddc12 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/SettleOrderReportController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/SettleOrderReportController.java @@ -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 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/SettleOrderReportService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/SettleOrderReportService.java index fc3f374b2..fb2d96257 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/SettleOrderReportService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/SettleOrderReportService.java @@ -81,6 +81,8 @@ public interface SettleOrderReportService { MerchantOrderReportVO getMerchantOrderReportV2(MerchantOrderReportDTO dto); + MerchantOrderReportVO getMerchantOrderReportV3(MerchantOrderReportDTO dto); + int deleteByPrimaryKey(Integer id); // int insert(SettleOrderReport record); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java index 9e8caecae..db9b92b0a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java @@ -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();