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:
autumn.g@foxmail.com
2023-09-01 14:14:47 +08:00
parent b26074a075
commit 8336fdfa26
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java
View File

@@ -34,7 +34,6 @@ import java.math.BigDecimal;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -321,17 +320,11 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic {
BigDecimal orderAmount = orderBasicInfo.getOrderAmount(); BigDecimal orderAmount = orderBasicInfo.getOrderAmount();
// 查支付记录 // 查支付记录
List<OrderPayRecord> payRecordList = orderPayRecordService.getOrderPayRecordList(orderCode); List<OrderPayRecord> payRecordList = orderPayRecordService.getOrderPayRecordList(orderCode);
// 根据payMode分组
Map<String, OrderPayRecord> payRecordMap = payRecordList.stream() Map<String, List<OrderPayRecord>> payRecordMap = payRecordList.stream().collect(Collectors.groupingBy(OrderPayRecord::getPayMode));
.collect(Collectors.toMap(OrderPayRecord::getPayMode, Function.identity(), (k1, k2) -> k1));
// 取出本金支付金额
BigDecimal principalPay = null;
// 获取本金支付的记录 // 获取本金支付的记录
OrderPayRecord principalPayRecord = payRecordMap.get(Constants.ONE); List<OrderPayRecord> orderPayRecordList = payRecordMap.get(OrderPayRecordEnum.PRINCIPAL_BALANCE_PAYMENT.getValue());
if (principalPayRecord != null) { BigDecimal principalPay = orderPayRecordList.stream().map(OrderPayRecord::getPayAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
principalPay = principalPayRecord.getPayAmount();
}
// 计算需要退回的金额 // 计算需要退回的金额
Map<String, BigDecimal> returnAmountMap = calculateReturnAmount(principalPay, null, orderAmount); Map<String, BigDecimal> returnAmountMap = calculateReturnAmount(principalPay, null, orderAmount);