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

金额取订单分账记录表中的值

Browse Source 
(cherry picked from commit 36c635a465)
This commit is contained in:
Guoqs
2025-09-29 13:54:05 +08:00
parent 21b9f3bf35
commit 7c51106b17
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
View File

@@ -19,6 +19,7 @@ import com.jsowell.common.util.PageUtils;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.YKCUtils;
import com.jsowell.common.util.id.IdUtils;
import com.jsowell.pile.domain.OrderSplitRecord;
import com.jsowell.pile.domain.PileStationInfo;
import com.jsowell.pile.domain.SettleOrderReport;
import com.jsowell.pile.dto.GetClearingBillDTO;
@@ -680,8 +681,15 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
dto.setMerchantId(stationInfo.getMerchantId());
// 查询结算完成的订单
List<OrderListVO> orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto);
// 收集订单编号
List<String> collect = orderListVOS.stream().map(OrderListVO::getOrderCode).collect(Collectors.toList());
log.info("站点:{}, 在{}-{}查询到订单数据{}条，订单编号:{}", stationInfo.getStationName(), startTime, endTime, orderListVOS.size(), collect);
// 根据入参拉出时间段内所有订单的分账记录
List<OrderSplitRecord> orderSplitRecords = orderSplitRecordService.queryOrderSplitRecordList(stationInfo.getMerchantId(), stationId, startTime, endTime);
// orderSplitRecords转为map, key为订单编号, value为分账记录
Map<String, OrderSplitRecord> splitRecordMap = orderSplitRecords.stream().collect(Collectors.toMap(OrderSplitRecord::getOrderCode, v -> v));
// 统计出日报信息
BigDecimal useElectricity = BigDecimal.ZERO; // 总电量使用量
int chargeNum = 0; // 总充电次数
@@ -737,12 +745,19 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
chargeTime += l;
}
// 电费金额
BigDecimal e = vo.getTotalElectricityAmount() != null ? vo.getTotalElectricityAmount() : BigDecimal.ZERO;
totalElectricityAmount = totalElectricityAmount.add(e);
// 电费金额， 如果splitRecordMap中存在，取Rrecord.getElectricitySplitAmount()， 如果不存在取vo.getTotalElectricityAmount()
OrderSplitRecord record = splitRecordMap.get(vo.getOrderCode());
BigDecimal electricityAmount = record != null
? record.getElectricitySplitAmount()
: vo.getTotalElectricityAmount() != null ? vo.getTotalElectricityAmount() : BigDecimal.ZERO;
// BigDecimal e = vo.getTotalElectricityAmount() != null ? vo.getTotalElectricityAmount() : BigDecimal.ZERO;
totalElectricityAmount = totalElectricityAmount.add(electricityAmount);
// 服务费金额
BigDecimal serviceAmount = vo.getTotalServiceAmount() != null ? vo.getTotalServiceAmount() : BigDecimal.ZERO;
// 服务费金额，如果splitRecordMap中存在，取Rrecord.getElectricitySplitAmount()， 如果不存在取vo.getTotalElectricityAmount()
BigDecimal serviceAmount = record != null
? record.getServiceSplitAmount()
: vo.getTotalServiceAmount() != null ? vo.getTotalServiceAmount() : BigDecimal.ZERO;
// BigDecimal serviceAmount = vo.getTotalServiceAmount() != null ? vo.getTotalServiceAmount() : BigDecimal.ZERO;
totalServiceAmount = totalServiceAmount.add(serviceAmount);
// 订单金额