diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessFinancialController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessFinancialController.java index 6d6d4e70a..a37e9cc1f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessFinancialController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessFinancialController.java @@ -122,9 +122,12 @@ public class BusinessFinancialController extends BaseController { * @param dto 查询参数 */ private void validateBusinessOperationQuery(BusinessOperationAnalysisQueryDTO dto) { - if (dto == null - || StringUtils.isBlank(dto.getStartTime()) - || StringUtils.isBlank(dto.getEndTime())) { + if (dto == null) { + throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); + } + boolean startTimeBlank = StringUtils.isBlank(dto.getStartTime()); + boolean endTimeBlank = StringUtils.isBlank(dto.getEndTime()); + if (startTimeBlank ^ endTimeBlank) { throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); } } diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index 657922925..5de23e895 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -38,7 +38,7 @@ spring: master: # url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: jsowell_pre - url: jdbc:mysql://192.168.0.4:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://192.168.0.32:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: jsowell_dev password: 123456 # 从库数据源 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/BusinessFinancialServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/BusinessFinancialServiceImpl.java index 550cee72d..d78eaf7c1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/BusinessFinancialServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/BusinessFinancialServiceImpl.java @@ -28,6 +28,7 @@ import com.jsowell.pile.vo.uniapp.business.BusinessOperationMetricVO; import com.jsowell.pile.vo.web.MerchantOrderReportVO; import com.jsowell.pile.vo.web.ParkingCouponRecordVO; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -48,6 +49,7 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService { private static final String METRIC_ORDER_AMOUNT = "ORDER_AMOUNT"; private static final String METRIC_AVG_SERVICE_FEE = "AVG_SERVICE_FEE"; private static final String METRIC_AVG_ELECTRICITY = "AVG_ELECTRICITY"; + private static final String FACTOR_ORDER_COUNT = "ORDER_COUNT"; private static final String FACTOR_AVG_ELECTRICITY = "AVG_ELECTRICITY"; private static final String FACTOR_AVG_CHARGE_TIME = "AVG_CHARGE_TIME"; @@ -178,6 +180,16 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService { */ @Override public BusinessOperationAnalysisVO getBusinessOperationAnalysis(BusinessOperationAnalysisQueryDTO dto) { + if (dto == null) { + return null; + } + if (StringUtils.isBlank(dto.getStartTime()) && StringUtils.isBlank(dto.getEndTime())) { + LocalDate endDate = LocalDate.now(); + LocalDate startDate = endDate.minusDays(6); + dto.setStartTime(startDate.toString()); + dto.setEndTime(endDate.toString()); + } + BusinessOperationDateRangeDTO range = buildDateRange(dto); List stationIdList = resolveStationIds(dto.getStationIdList()); BusinessOperationSummaryDTO currentSummary = buildOperationSummary( @@ -227,7 +239,7 @@ public class BusinessFinancialServiceImpl implements BusinessFinancialService { FACTOR_AVG_CHARGE_TIME, "单均充电时长", currentSummary.getAvgChargeTime(), previousSummary.getAvgChargeTime()); } - return buildDiagnosis(METRIC_ORDER_AMOUNT, "订单总额", + return buildDiagnosis(METRIC_ORDER_AMOUNT, "订单总数", FACTOR_ORDER_COUNT, "订单量", currentSummary.getOrderCount(), previousSummary.getOrderCount()); }