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

update

Browse Source
This commit is contained in:
Guoqs
2025-09-27 15:51:08 +08:00
parent 15677b0dfe
commit 94655706dc
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -424,19 +424,17 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
chargeTime = chargeTime.add(new BigDecimal(settleOrderReportVO.getChargeTime())); chargeTime = chargeTime.add(new BigDecimal(settleOrderReportVO.getChargeTime()));
electricityAmount = electricityAmount.add(settleOrderReportVO.getElectricityAmount()); electricityAmount = electricityAmount.add(settleOrderReportVO.getElectricityAmount());
serviceAmount = serviceAmount.add(settleOrderReportVO.getServiceAmount()); serviceAmount = serviceAmount.add(settleOrderReportVO.getServiceAmount());
// 2024年11月12日14点30分使用结算金额计算收入金额 // 2024年11月12日14点30分使用结算金额计算收入金额
BigDecimal amount = settleOrderReportVO.getSettleAmount() != null BigDecimal amount = settleOrderReportVO.getSettleAmount() != null
? settleOrderReportVO.getSettleAmount() ? settleOrderReportVO.getSettleAmount()
: settleOrderReportVO.getTotalAmount(); : settleOrderReportVO.getTotalAmount();
// 2025年6月19日15点11分 修改逻辑, 使用实收金额进行计算 // 2025年6月19日15点11分 修改逻辑, 使用实收金额进行计算
totalAmount = totalAmount.add(amount); totalAmount = totalAmount.add(amount);
virtualAmount = virtualAmount.add(settleOrderReportVO.getVirtualAmount()); virtualAmount = virtualAmount.add(settleOrderReportVO.getVirtualAmount());
} }
// 从清分账单中计算交易金额，交易手续费 // 从清分账单中计算交易金额，交易手续费
GetClearingBillDTO clearingBillDTO = GetClearingBillDTO.builder() GetClearingBillDTO clearingBillDTO = GetClearingBillDTO.builder()
.merchantId(dto.getMerchantId()) .merchantId(dto.getMerchantId())
@@ -448,12 +446,6 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
BigDecimal tradeAmount = BigDecimal.ZERO; BigDecimal tradeAmount = BigDecimal.ZERO;
BigDecimal tradeFee = BigDecimal.ZERO; BigDecimal tradeFee = BigDecimal.ZERO;
// List<MerchantClearingBillVO> merchantClearingBillList = clearingBillInfoService.getMerchantClearingBillList(clearingBillDTO);
// for (MerchantClearingBillVO merchantClearingBillVO : merchantClearingBillList) {
// tradeAmount = tradeAmount.add(new BigDecimal(merchantClearingBillVO.getWithdrawAbleAmount()));
// tradeFee = tradeFee.add(new BigDecimal(merchantClearingBillVO.getFeeAmount()));
// }
// 获取他人分账金额 // 获取他人分账金额
List<OrderSplitDailySummaryData> orderSplitDailySummaryData = orderSplitRecordService.queryOrderSplitData(dto.getMerchantId(), null, dto.getStartTime(), dto.getEndTime()); List<OrderSplitDailySummaryData> orderSplitDailySummaryData = orderSplitRecordService.queryOrderSplitData(dto.getMerchantId(), null, dto.getStartTime(), dto.getEndTime());
log.info("orderSplitDailySummaryData: {}", orderSplitDailySummaryData); log.info("orderSplitDailySummaryData: {}", orderSplitDailySummaryData);
@@ -463,6 +455,7 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
// 2025年7月14日15点22分 从order_split_record表中计算订单分账金额 // 2025年7月14日15点22分 从order_split_record表中计算订单分账金额
tradeAmount = orderSplitDailySummaryData.stream().map(OrderSplitDailySummaryData::getMerchantSplitAmount) tradeAmount = orderSplitDailySummaryData.stream().map(OrderSplitDailySummaryData::getMerchantSplitAmount)
.reduce(BigDecimal.ZERO, BigDecimal::add); .reduce(BigDecimal.ZERO, BigDecimal::add);
tradeFee = orderSplitDailySummaryData.stream().map(OrderSplitDailySummaryData::getMerchantFeeAmount) tradeFee = orderSplitDailySummaryData.stream().map(OrderSplitDailySummaryData::getMerchantFeeAmount)
.reduce(BigDecimal.ZERO, BigDecimal::add); .reduce(BigDecimal.ZERO, BigDecimal::add);

6
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
View File

@@ -543,12 +543,6 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
return; return;
} }
// 获取更新数据后的orderBasicInfo对象
// returnUpdateOrderBasicInfo(orderBasicInfo, data);
// 获取更新数据后的orderDetail对象/更新订单详情 查询订单详情 修改订单数据
// OrderDetail orderDetail = returnUpdateOrderDetail(orderBasicInfo, data);
// 查询订单详情 // 查询订单详情
OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderBasicInfo.getOrderCode()); OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderBasicInfo.getOrderCode());