diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index 12af5d7ca..0e9944d09 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -9,7 +9,6 @@ import com.jsowell.common.enums.BusinessType; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.SecurityUtils; -import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.PileMerchantInfo; @@ -100,7 +99,7 @@ public class OrderBasicInfoController extends BaseController { dto.setMerchantId(String.valueOf(pileMerchantInfo.getId())); } } - return AjaxResult.success(orderBasicInfoService.getOrderTotalDataV2(dto)); + return AjaxResult.success(orderBasicInfoService.getOrderTotalData(dto)); } /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 12d47ce2d..8c2b377ed 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -343,7 +343,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { BigDecimal sumOrderAmount = BigDecimal.ZERO; BigDecimal sumUsedElectricity = BigDecimal.ZERO; BigDecimal sumSettleAmount = BigDecimal.ZERO; - vo.setDateDescription(dto.getStartTime() + " - " + dto.getEndTime()); + vo.setDateDescription("创建时间 " + dto.getStartTime() + " - " + dto.getEndTime()); if (CollectionUtils.isNotEmpty(list)) { for (OrderListVO orderListVO : list) { BigDecimal orderAmount = StringUtils.isBlank(orderListVO.getOrderAmount()) @@ -401,7 +401,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 格式化时间 startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.parseDate(startTime)); // 2023-08-16 endTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.parseDate(endTime)); // 2023-08-16 - vo.setDateDescription("创建时间 " + startTime + " 至 " + endTime); + vo.setDateDescription("结算时间 " + startTime + " 至 " + endTime); // 查询数据库 List settleOrderReports = settleOrderReportService.queryOrderReport(stationIdList, startTime, endTime);