czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

充值金额

Browse Source
This commit is contained in:
wangw
2025-11-22 15:44:45 +08:00
parent 840eb10691
commit 0f53f3363f
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
View File

@@ -138,16 +138,21 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl<ShopOrderStatisti
result.setProductCostAmount(productCostAmount); result.setProductCostAmount(productCostAmount);
//会员充值退款 充值退款金额（线上退款+现金退款） //会员充值退款 充值退款金额（线上退款+现金退款）
BigDecimal onlineAmount = Objects.requireNonNullElse( BigDecimal cashRechargeAmount = Objects.requireNonNullElse(result.getCashRechargeAmount(), BigDecimal.ZERO);
BigDecimal onlineRechargeAmount = Objects.requireNonNullElse(result.getOnlineRechargeAmount(), BigDecimal.ZERO);
BigDecimal rechargeAmount = cashRechargeAmount.add(onlineRechargeAmount);
result.setRechargeAmount(rechargeAmount);
//会员充值退款 充值退款金额（线上退款+现金退款）
BigDecimal onlineRefundAmount = Objects.requireNonNullElse(
(onlineStat != null) ? onlineStat.getOnlineRechargeRefundAmount() : null, (onlineStat != null) ? onlineStat.getOnlineRechargeRefundAmount() : null,
BigDecimal.ZERO BigDecimal.ZERO
); );
BigDecimal userFlowAmount = Objects.requireNonNullElse( BigDecimal userFlowRefundAmount = Objects.requireNonNullElse(
(userFlowStat != null) ? userFlowStat.getCashRechargeRefundAmount() : null, (userFlowStat != null) ? userFlowStat.getCashRechargeRefundAmount() : null,
BigDecimal.ZERO BigDecimal.ZERO
); );
BigDecimal total = onlineAmount.add(userFlowAmount); BigDecimal rechargeRefundAmountTotal = onlineRefundAmount.add(userFlowRefundAmount);
result.setRechargeRefundAmount(total); result.setRechargeRefundAmount(rechargeRefundAmountTotal);
//实付金额 (线上付款 现金支付 会员支付 挂账) //实付金额 (线上付款 现金支付 会员支付 挂账)
BigDecimal onlinePayAmount = (onlineStat != null) BigDecimal onlinePayAmount = (onlineStat != null)
? Objects.requireNonNullElse(onlineStat.getOnlinePayAmount(), BigDecimal.ZERO) ? Objects.requireNonNullElse(onlineStat.getOnlinePayAmount(), BigDecimal.ZERO)