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

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-07-01 13:33:02 +08:00
parent 597bc7520f
commit 00822174fd
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -298,6 +298,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
List<OrderListVO> list = selectOrderBasicInfoList(dto); List<OrderListVO> list = selectOrderBasicInfoList(dto);
BigDecimal sumOrderAmount = BigDecimal.ZERO; BigDecimal sumOrderAmount = BigDecimal.ZERO;
BigDecimal sumUsedElectricity = 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)) { if (CollectionUtils.isNotEmpty(list)) {
for (OrderListVO orderListVO : list) { for (OrderListVO orderListVO : list) {
@@ -310,10 +311,16 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
? BigDecimal.ZERO ? BigDecimal.ZERO
: new BigDecimal(orderListVO.getChargingDegree()); : new BigDecimal(orderListVO.getChargingDegree());
sumUsedElectricity = sumUsedElectricity.add(chargingDegree); sumUsedElectricity = sumUsedElectricity.add(chargingDegree);
BigDecimal settleAmount = StringUtils.isBlank(orderListVO.getSettleAmount())
? BigDecimal.ZERO
: new BigDecimal(orderListVO.getSettleAmount());
sumSettleAmount = sumSettleAmount.add(settleAmount);
} }
} }
vo.setSumOrderAmount(sumOrderAmount); vo.setSumOrderAmount(sumOrderAmount);
vo.setSumUsedElectricity(sumUsedElectricity); vo.setSumUsedElectricity(sumUsedElectricity);
vo.setSumSettleAmount(sumSettleAmount);
return vo; return vo;
} }

3
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderTotalDataVO.java
View File

@@ -20,4 +20,7 @@ public class OrderTotalDataVO {
// 总用电量 // 总用电量
private BigDecimal sumUsedElectricity; private BigDecimal sumUsedElectricity;
// 总结算金额
private BigDecimal sumSettleAmount;
} }