autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-17 16:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增刷数据接口

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-05-25 14:35:15 +08:00
parent 202bda62a9
commit 2e4d905d22
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,7 +170,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
private void tempUpdateVirtualAmount(List<OrderListVO> orderListVOS) { private void tempUpdateVirtualAmount(List<OrderListVO> orderListVOS) {
for (OrderListVO orderListVO : orderListVOS) { for (OrderListVO orderListVO : orderListVOS) {
if (orderListVO.getVirtualAmount() != null) { if (orderListVO.getVirtualAmount() != null) {
// continue; continue;
} }
// 订单总消费金额 // 订单总消费金额
BigDecimal orderAmount = new BigDecimal(orderListVO.getOrderAmount()); BigDecimal orderAmount = new BigDecimal(orderListVO.getOrderAmount());
@@ -190,15 +190,17 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
List<OrderPayRecord> orderPayRecordList = orderPayRecordService.getOrderPayRecordList(orderListVO.getOrderCode()); List<OrderPayRecord> orderPayRecordList = orderPayRecordService.getOrderPayRecordList(orderListVO.getOrderCode());
for (OrderPayRecord orderPayRecord : orderPayRecordList) { for (OrderPayRecord orderPayRecord : orderPayRecordList) {
if (StringUtils.equals(orderPayRecord.getPayMode(), OrderPayRecordEnum.GIFT_BALANCE_PAYMENT.getValue())) { if (StringUtils.equals(orderPayRecord.getPayMode(), OrderPayRecordEnum.GIFT_BALANCE_PAYMENT.getValue())) {
if (orderPayRecord.getRefundAmount() == null) { BigDecimal refundAmount = orderPayRecord.getRefundAmount();
// 需要退款的金额 = 支付金额 - 订单金额 if (refundAmount == null) {
BigDecimal refundAmount = orderPayRecord.getPayAmount().subtract(orderAmount); // 退款金额为null, 需要退款的金额 = 支付金额 - 订单金额
// 赠送金额消费部分 = 支付金额 - 需要退款金额 refundAmount = orderPayRecord.getPayAmount().subtract(orderAmount);
virtualAmount = orderPayRecord.getPayAmount().subtract(refundAmount);
} }
// 赠送金额消费部分 = 支付金额 - 需要退款金额
virtualAmount = orderPayRecord.getPayAmount().subtract(refundAmount);
// 结算金额 = 订单金额 - 赠送金额消费部分 // 结算金额 = 订单金额 - 赠送金额消费部分
settleAmount = orderAmount.subtract(virtualAmount); settleAmount = orderAmount.subtract(virtualAmount);
} else { } else {
// 没有使用赠送金额支付，那么虚拟金额就是0，结算金额就等于订单金额
settleAmount = orderAmount; settleAmount = orderAmount;
} }
} }