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 4b8edcc68..8b1f07a39 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 @@ -95,7 +95,7 @@ public class SettleOrderReportController extends BaseController { * @param dto * @return */ - @PreAuthorize("@ss.hasPermi('pile:report:query')") + @PreAuthorize("@ss.hasPermi('pile:merchant:query')") @PostMapping("/getMerchantOrderReport") public AjaxResult getMerchantOrderReport(@RequestBody MerchantOrderReportDTO dto) { return AjaxResult.success(settleOrderReportService.getMerchantOrderReport(dto)); 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 7ab599282..deacdc517 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 @@ -117,11 +117,12 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService { MerchantOrderReportVO vo = new MerchantOrderReportVO(); MerchantOrderReportVO.MerchantOrderReport report = new MerchantOrderReportVO.MerchantOrderReport(); PageUtils.startPage(pageNum, pageSize); - List list = settleOrderReportMapper.getMerchantOrderReport(dto); - if (CollectionUtils.isEmpty(list)) { + List pageList = settleOrderReportMapper.getMerchantOrderReport(dto); + if (CollectionUtils.isEmpty(pageList)) { return null; } - PageInfo pageInfo = new PageInfo<>(list); + List list = settleOrderReportMapper.getMerchantOrderReport(dto); + PageInfo pageInfo = new PageInfo<>(pageList); vo.setMerchantId(dto.getMerchantId()); // vo.setReportList(pageInfo.getList()); diff --git a/jsowell-ui/src/views/pile/merchant/components/revenue.vue b/jsowell-ui/src/views/pile/merchant/components/revenue.vue index 7ac0cca25..c992317e7 100644 --- a/jsowell-ui/src/views/pile/merchant/components/revenue.vue +++ b/jsowell-ui/src/views/pile/merchant/components/revenue.vue @@ -10,7 +10,7 @@ {{merchantOrderReport.serviceAmount}}元 {{merchantOrderReport.totalAmount}}元 {{merchantOrderReport.tradeAmount}}元 - {{merchantOrderReport.tradeFee}} + {{merchantOrderReport.tradeFee}}元 {{merchantOrderReport.virtualAmount}}元 @@ -176,7 +176,7 @@ export default { this.queryParams.startTime = beg this.queryParams.endTime = end }, - + }, async created() { await this.defaultDate()