From 76fe4f16513e48c2e59ca9c0169e5cc642a2f4af Mon Sep 17 00:00:00 2001 From: van Date: Sat, 7 Nov 2026 15:11:14 +0800 Subject: [PATCH] 1 --- .../impl/OrderProfitAnalysisServiceImpl.java | 56 ++++++++++++++++--- 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/OrderProfitAnalysisServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/OrderProfitAnalysisServiceImpl.java index db17ea8..571326d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/OrderProfitAnalysisServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/OrderProfitAnalysisServiceImpl.java @@ -221,6 +221,12 @@ public class OrderProfitAnalysisServiceImpl implements IOrderProfitAnalysisServi ka.refundCount++; continue; } + BigDecimal pay = money(o.getPaymentAmount()); + BigDecimal reb = money(o.getRebateAmount()); + acc.payment = acc.payment.add(pay); + acc.rebate = acc.rebate.add(reb); + ka.payment = ka.payment.add(pay); + ka.rebate = ka.rebate.add(reb); if (o.getProfit() == null) { acc.missingProfit++; ka.missingProfit++; @@ -246,18 +252,21 @@ public class OrderProfitAnalysisServiceImpl implements IOrderProfitAnalysisServi MonthAcc first = series.get(0); MonthAcc last = series.get(series.size() - 1); String thisMonth = today.format(DateTimeFormatter.ofPattern("yyyy-MM")); - sb.append("慢单月度利润与单量\n"); + sb.append("慢单月度利润、单量与垫资\n"); sb.append("区间:").append(first.label).append(" 至 ").append(last.label); if (thisMonth.equals(last.key)) { sb.append("(").append(last.label).append("截至 ").append(today.format(DAY)).append(")"); } sb.append("\n"); - sb.append("口径:只含参与统计的单。退款计入总单量,不计入利润。利润是订单上已经算好的 profit,单位元。\n"); - sb.append("类型:自有单=F开头且除去F-W、F-H;代下单=仅F-W、F-H;代下单单=其余前缀。三类分开,不要合并。后返不是收入。\n\n"); + sb.append("口径:只含参与统计的单。退款计入总单量,不计入垫资、后返、利润。金额单位元。\n"); + sb.append("垫资=有效单付款(垫给京东的钱)。后返=垫资里稍后收回的部分,不是收入。净垫资=垫资-后返。利润是订单上已经算好的 profit。\n"); + sb.append("类型:自有单=F开头且除去F-W、F-H;代下单=仅F-W、F-H;代下单单=其余前缀。三类分开,不要合并。\n\n"); int sumOrder = 0; int sumRefund = 0; int sumMissing = 0; + BigDecimal sumPayment = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP); + BigDecimal sumRebate = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP); BigDecimal sumProfit = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP); Map sumKind = new LinkedHashMap<>(); MonthAcc prev = null; @@ -268,9 +277,8 @@ public class OrderProfitAnalysisServiceImpl implements IOrderProfitAnalysisServi .append(" 退款 ").append(m.refundCount) .append(" 有效 ").append(valid) .append(" 缺利润 ").append(m.missingProfit) - .append(" 利润 ").append(plain(m.profit)) - .append(" 单均 ").append(plain(avgOf(m.profit, valid))) .append('\n'); + appendMoneyLine(sb, "合计", m.payment, m.rebate, m.profit, valid); appendKindLine(sb, "自有单", m.byKind.get("自有单")); appendKindLine(sb, "代下单", m.byKind.get("代下单")); appendKindLine(sb, "代下单单", m.byKind.get("代下单单")); @@ -283,6 +291,9 @@ public class OrderProfitAnalysisServiceImpl implements IOrderProfitAnalysisServi } else { int prevValid = prev.orderCount - prev.refundCount; sb.append("较上月 有效 ").append(signedInt(valid - prevValid)) + .append(" 垫资 ").append(signedMoney(m.payment.subtract(prev.payment))) + .append(" 后返 ").append(signedMoney(m.rebate.subtract(prev.rebate))) + .append(" 净垫资 ").append(signedMoney(netAdvance(m).subtract(netAdvance(prev)))) .append(" 利润 ").append(signedMoney(m.profit.subtract(prev.profit))) .append('\n'); } @@ -290,6 +301,8 @@ public class OrderProfitAnalysisServiceImpl implements IOrderProfitAnalysisServi sumOrder += m.orderCount; sumRefund += m.refundCount; sumMissing += m.missingProfit; + sumPayment = sumPayment.add(m.payment); + sumRebate = sumRebate.add(m.rebate); sumProfit = sumProfit.add(m.profit); mergeKind(sumKind, m.byKind); prev = m; @@ -300,9 +313,8 @@ public class OrderProfitAnalysisServiceImpl implements IOrderProfitAnalysisServi .append(" 退款 ").append(sumRefund) .append(" 有效 ").append(sumValid) .append(" 缺利润 ").append(sumMissing) - .append(" 利润 ").append(plain(sumProfit)) - .append(" 单均 ").append(plain(avgOf(sumProfit, sumValid))) .append('\n'); + appendMoneyLine(sb, "合计", sumPayment, sumRebate, sumProfit, sumValid); appendKindLine(sb, "自有单", sumKind.get("自有单")); appendKindLine(sb, "代下单", sumKind.get("代下单")); appendKindLine(sb, "代下单单", sumKind.get("代下单单")); @@ -311,14 +323,36 @@ public class OrderProfitAnalysisServiceImpl implements IOrderProfitAnalysisServi appendKindLine(sb, "未标记", unmarkedSum); } sb.append('\n'); - sb.append("请根据以上各月利润和单量分析收入情况:趋势、三类各自的单量和利润、哪几个月更好或更差。不要编造上面没有的数字。\n"); + sb.append("请根据以上各月垫资规模、后返、净垫资、利润和单量分析收入与资金占用:趋势、三类各自占了多少垫资、后返和利润。后返不是收入。不要编造上面没有的数字。\n"); return sb.toString(); } private static void appendKindLine(StringBuilder sb, String name, KindAcc src) { KindAcc a = src == null ? new KindAcc() : src; int valid = a.orderCount - a.refundCount; - sb.append(name).append(" 有效 ").append(valid).append(" 利润 ").append(plain(a.profit)).append('\n'); + sb.append(name).append(" 有效 ").append(valid).append(' '); + appendMoneyLine(sb, null, a.payment, a.rebate, a.profit, valid); + } + + private static void appendMoneyLine(StringBuilder sb, String prefix, BigDecimal payment, BigDecimal rebate, + BigDecimal profit, int valid) { + if (prefix != null) { + sb.append(prefix).append(' '); + } + BigDecimal pay = payment == null ? BigDecimal.ZERO : payment; + BigDecimal reb = rebate == null ? BigDecimal.ZERO : rebate; + sb.append("垫资 ").append(plain(pay)) + .append(" 后返 ").append(plain(reb)) + .append(" 净垫资 ").append(plain(pay.subtract(reb))) + .append(" 利润 ").append(plain(profit)) + .append(" 单均 ").append(plain(avgOf(profit, valid))) + .append('\n'); + } + + private static BigDecimal netAdvance(MonthAcc m) { + BigDecimal pay = m.payment == null ? BigDecimal.ZERO : m.payment; + BigDecimal reb = m.rebate == null ? BigDecimal.ZERO : m.rebate; + return pay.subtract(reb); } private static void mergeKind(Map sum, Map part) { @@ -328,6 +362,8 @@ public class OrderProfitAnalysisServiceImpl implements IOrderProfitAnalysisServi dst.orderCount += src.orderCount; dst.refundCount += src.refundCount; dst.missingProfit += src.missingProfit; + dst.payment = dst.payment.add(src.payment); + dst.rebate = dst.rebate.add(src.rebate); dst.profit = dst.profit.add(src.profit); } } @@ -1678,6 +1714,8 @@ public class OrderProfitAnalysisServiceImpl implements IOrderProfitAnalysisServi int orderCount; int refundCount; int missingProfit; + BigDecimal payment = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP); + BigDecimal rebate = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP); BigDecimal profit = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP); Map byKind = new LinkedHashMap<>(); }