autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-12 19:29:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 订单统计根据创建时间查询

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-11-04 15:53:54 +08:00
parent 06b7df417f
commit a3643205d8
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
View File

@@ -9,7 +9,6 @@ import com.jsowell.common.enums.BusinessType;
import com.jsowell.common.exception.BusinessException; import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.SecurityUtils; import com.jsowell.common.util.SecurityUtils;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.common.util.poi.ExcelUtil;
import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.PileMerchantInfo; import com.jsowell.pile.domain.PileMerchantInfo;
@@ -100,7 +99,7 @@ public class OrderBasicInfoController extends BaseController {
dto.setMerchantId(String.valueOf(pileMerchantInfo.getId())); dto.setMerchantId(String.valueOf(pileMerchantInfo.getId()));
} }
} }
return AjaxResult.success(orderBasicInfoService.getOrderTotalDataV2(dto)); return AjaxResult.success(orderBasicInfoService.getOrderTotalData(dto));
} }
/** /**

4
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -343,7 +343,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
BigDecimal sumOrderAmount = BigDecimal.ZERO; BigDecimal sumOrderAmount = BigDecimal.ZERO;
BigDecimal sumUsedElectricity = BigDecimal.ZERO; BigDecimal sumUsedElectricity = BigDecimal.ZERO;
BigDecimal sumSettleAmount = BigDecimal.ZERO; BigDecimal sumSettleAmount = BigDecimal.ZERO;
vo.setDateDescription(dto.getStartTime() + " - " + dto.getEndTime()); vo.setDateDescription("创建时间 " + dto.getStartTime() + " - " + dto.getEndTime());
if (CollectionUtils.isNotEmpty(list)) { if (CollectionUtils.isNotEmpty(list)) {
for (OrderListVO orderListVO : list) { for (OrderListVO orderListVO : list) {
BigDecimal orderAmount = StringUtils.isBlank(orderListVO.getOrderAmount()) 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 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 endTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.parseDate(endTime)); // 2023-08-16
vo.setDateDescription("创建时间 " + startTime + " 至 " + endTime); vo.setDateDescription("结算时间 " + startTime + " 至 " + endTime);
// 查询数据库 // 查询数据库
List<SettleOrderReport> settleOrderReports = settleOrderReportService.queryOrderReport(stationIdList, startTime, endTime); List<SettleOrderReport> settleOrderReports = settleOrderReportService.queryOrderReport(stationIdList, startTime, endTime);