diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java index 54e725bb2..65ab5ab43 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java @@ -157,9 +157,7 @@ public class MerchantStatisticsController { String method = "############pageReconciliationList: "; log.info(method + "请求参数{}", merchantStatisticsDTO); try { - IPage pages = reconciliationOrderInfoService.pageReconciliationList(merchantStatisticsDTO); - return R.data(pages); } catch (CustomerException e) { log.error(e.message, e); diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java index 42d023405..c0c41bcaa 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java @@ -1429,9 +1429,9 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl