From b44b719cff3f7484e95bbc2b39bd6de6640c4bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?= =?UTF-8?q?=EF=BC=89?= Date: Wed, 4 Jun 2025 13:37:03 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/van/business/util/JDUtil.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index f93c7df..1a596ea 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -2060,8 +2060,7 @@ public class JDUtil { } // 添加合计 - summaryBuilder.append("总计：") - .append("\n总数量：").append(totalCount); + summaryBuilder.append("总计：").append(totalCount).append("\n详情："); // 发送总统计消息 //wxUtil.sendTextMessage(fromWxid, "分销标记：" + distributionMark + "\n" + summaryBuilder, 1, fromWxid, true); @@ -2074,7 +2073,7 @@ public class JDUtil { .append("\n下单付款：").append(order.getPaymentAmount() != null ? String.format("%.2f", order.getPaymentAmount()) : "0.00").append(" 元") .append("\n后返金额：").append(order.getRebateAmount() != null ? String.format("%.2f", order.getRebateAmount()) : "0.00").append(" 元") .append("\n地址：").append(order.getAddress() != null ? order.getAddress() : "未提供") - .append("\n物流链接：").append(order.getLogisticsLink() != null ? order.getLogisticsLink() : "无") + .append("\n物流链接：\n").append(order.getLogisticsLink() != null ? order.getLogisticsLink() : "无") .append("\n────────────\n"); } @@ -2091,7 +2090,7 @@ public class JDUtil { return; } JDOrder byRemark = jdOrderRepository.findByRemark(jdOrder.getRemark()); - String info = ""; + String info; if (byRemark != null) { logger.info("订单已存在：{}", byRemark); info = "更新成功"; From e3c368fd3ac3dd4d477854031167570228e1ffb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?= =?UTF-8?q?=EF=BC=89?= Date: Wed, 4 Jun 2025 13:59:44 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/van/business/util/JDScheduleJob.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/van/business/util/JDScheduleJob.java b/src/main/java/cn/van/business/util/JDScheduleJob.java index bea7445..55f47d1 100644 --- a/src/main/java/cn/van/business/util/JDScheduleJob.java +++ b/src/main/java/cn/van/business/util/JDScheduleJob.java @@ -460,8 +460,8 @@ public class JDScheduleJob { String currentHour = String.valueOf(now.getHour()); // 如果今天已经执行了3次，则跳过 - if (executedHours.size() >= 3) { - logger.info("今天已经执行了3次，跳过本次任务"); + if (executedHours.size() >= 2) { + logger.info("今天已经执行了2次，跳过本次任务"); return; } From 5b4e861f7423a698f2f2109947b0cf4a1c9f30d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?= =?UTF-8?q?=EF=BC=89?= Date: Wed, 4 Jun 2025 14:03:29 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/van/business/util/JDUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index 9fd3ccd..0b01720 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -115,7 +115,7 @@ public class JDUtil { *

* 订单号： */ - private static final String WENAN_D = "单：{单的备注}\n" + "{单号} \n" + "分销标记：{分销标记}\n" + "型号：\n" + "{型号}" + "\n" + "链接：\n" + "{链接}" + "\n" + "下单付款：\n" + "\n" + "后返金额：\n" + "\n" + "地址：\n" + "{地址}" + "\n" + "物流链接：\n" + "\n" + "订单号：\n" + "\n" + "下单人：\n" + "\n"; + private static final String WENAN_D = "单：\n" + "{单号} \n备注：{单的备注}\n" + "分销标记：{分销标记}\n" + "型号：\n" + "{型号}" + "\n" + "链接：\n" + "{链接}" + "\n" + "下单付款：\n" + "\n" + "后返金额：\n" + "\n" + "地址：\n" + "{地址}" + "\n" + "物流链接：\n" + "\n" + "订单号：\n" + "\n" + "下单人：\n" + "\n"; final WXUtil wxUtil; private final StringRedisTemplate redisTemplate; @@ -2136,7 +2136,7 @@ public class JDUtil { Map fields = new HashMap<>(); // 定义正则表达式提取各个字段 - extractField(input, fields, "单：", "分销标记："); + extractField(input, fields, "单：", "备注："); extractField(input, fields, "分销标记：", "型号："); extractField(input, fields, "型号：", "链接："); extractField(input, fields, "链接：", "下单付款："); From 6d22c906eca51ee077271981d883786887107ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?= =?UTF-8?q?=EF=BC=89?= Date: Wed, 4 Jun 2025 14:28:38 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/van/business/util/JDUtil.java | 69 ++++++++++++------- 1 file changed, 44 insertions(+), 25 deletions(-) diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index 0b01720..7cc1bd8 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -197,7 +197,7 @@ public class JDUtil { return new OrderStats(orders.size(), orders.size() - canceled, paid, orders.stream().filter(o -> o.getValidCode() == 16).mapToDouble(OrderRow::getEstimateFee).sum(), pending, orders.stream().filter(o -> o.getValidCode() == 15).mapToDouble(OrderRow::getEstimateFee).sum(), canceled, completed, orders.stream().filter(o -> o.getValidCode() == 17).mapToDouble(OrderRow::getEstimateFee).sum(), getStreamForWeiGui(orders).count(), getStreamForWeiGui(orders).mapToDouble(o -> o.getEstimateCosPrice() * o.getCommissionRate() * 0.01).sum()); } - private StringBuilder buildStatsContent(String title, OrderStats stats) { + private StringBuilder buildStatsContentAll(String title, OrderStats stats) { StringBuilder content = new StringBuilder(); content//[爱心][Wow][Packet][Party][Broken][心碎][亲亲][色] .append("* ").append(title).append(" *\n").append("━━━━━━━━━━━━\n").append("[爱心] 订单总数：").append(stats.getTotalOrders()).append("\n") // [文件] @@ -215,6 +215,25 @@ public class JDUtil { .append("━━━━━━━━━━━━"); return content; } + private StringBuilder buildStatsContentMin(String title, OrderStats stats) { + StringBuilder content = new StringBuilder(); + content//[爱心][Wow][Packet][Party][Broken][心碎][亲亲][色] + .append(title).append("\n").append("━━━━━━━━━━━━\n") + //.append("[爱心] 订单总数：").append(stats.getTotalOrders()).append("\n") // [文件] + .append("[Party] 有效订单：").append(stats.getValidOrders()).append("\n") // [OK] + //.append("[心碎]已取消：").append(stats.getCanceledOrders()).append("\n") // [禁止] + + .append("────────────\n").append("[爱心]已付款：").append(stats.getPaidOrders()).append("\n") // [钱袋] + .append("[Packet] 已付款佣金：").append(String.format("%.2f", stats.getPaidCommission())).append("\n") // [钞票] + //.append("────────────\n").append("[Wow] 待付款：").append(stats.getPendingOrders()).append("\n") // [时钟] + //.append("[Packet] 待付款佣金：").append(String.format("%.2f", stats.getPendingCommission())).append("\n") // [钱] + .append("────────────\n").append("[亲亲] 已完成：").append(stats.getCompletedOrders()).append("\n") // [旗帜] + .append("[Packet] 已完成佣金：").append(String.format("%.2f", stats.getCompletedCommission())).append("\n") // [信用卡] + .append("────────────\n").append("[Emm] 违规订单：").append(stats.getViolations()).append("\n") // [警告] + .append("[Broken] 违规佣金：").append(String.format("%.2f", stats.getViolationCommission())).append("\n") // [炸弹] + .append("━━━━━━━━━━━━"); + return content; + } /** * 接收京粉指令指令 @@ -284,14 +303,14 @@ public class JDUtil { // 订单总数，已付款，已取消，佣金总计 List todayOrders = filterOrdersByDate(orderRows, 0); OrderStats stats = calculateStats(todayOrders); - contents.add(buildStatsContent("今日统计", stats)); + contents.add(buildStatsContentAll("今日统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(todayOrders); - StringBuilder stringBuilder = new StringBuilder().append("详："); + StringBuilder stringBuilder = new StringBuilder().append("详：\n"); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); String remarkFromJdid = getRemarkFromJdid(String.valueOf(entry.getKey())); - stringBuilder.append(buildStatsContent("\n粉：" + remarkFromJdid + "\n", statsDetail)); + stringBuilder.append(buildStatsContentMin("粉：" + remarkFromJdid, statsDetail)); } } contents.add(stringBuilder); @@ -300,14 +319,14 @@ public class JDUtil { case "昨日统计": { List yesterdayOrders = filterOrdersByDate(orderRows, 1); OrderStats stats = calculateStats(yesterdayOrders); - contents.add(buildStatsContent("昨日统计", stats)); + contents.add(buildStatsContentAll("昨日统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(yesterdayOrders); StringBuilder stringBuilder = new StringBuilder().append("详："); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); String remarkFromJdid = getRemarkFromJdid(String.valueOf(entry.getKey())); - stringBuilder.append(buildStatsContent("\n粉：" + remarkFromJdid + "\n", statsDetail)); + stringBuilder.append(buildStatsContentMin("粉：" + remarkFromJdid, statsDetail)); } } contents.add(stringBuilder); @@ -317,14 +336,14 @@ public class JDUtil { case "三日统计": { List last3DaysOrders = filterOrdersByDate(orderRows, 3); OrderStats stats = calculateStats(last3DaysOrders); - contents.add(buildStatsContent("三日统计", stats)); + contents.add(buildStatsContentAll("三日统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(last3DaysOrders); StringBuilder stringBuilder = new StringBuilder().append("详："); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); String remarkFromJdid = getRemarkFromJdid(String.valueOf(entry.getKey())); - stringBuilder.append(buildStatsContent("\n粉：" + remarkFromJdid + "\n", statsDetail)); + stringBuilder.append(buildStatsContentMin("粉：" + remarkFromJdid, statsDetail)); } } contents.add(stringBuilder); @@ -334,14 +353,14 @@ public class JDUtil { case "七日统计": { List last7DaysOrders = filterOrdersByDate(orderRows, 7); OrderStats stats = calculateStats(last7DaysOrders); - contents.add(buildStatsContent("七日统计", stats)); + contents.add(buildStatsContentAll("七日统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(last7DaysOrders); StringBuilder stringBuilder = new StringBuilder().append("详："); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); String remarkFromJdid = getRemarkFromJdid(String.valueOf(entry.getKey())); - stringBuilder.append(buildStatsContent("\n粉：" + remarkFromJdid + "\n", statsDetail)); + stringBuilder.append(buildStatsContentMin("粉：" + remarkFromJdid, statsDetail)); } } contents.add(stringBuilder); @@ -351,14 +370,14 @@ public class JDUtil { case "一个月统计": { List last30DaysOrders = filterOrdersByDate(orderRows, 30); OrderStats stats = calculateStats(last30DaysOrders); - contents.add(buildStatsContent("一个月统计", stats)); + contents.add(buildStatsContentAll("一个月统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(last30DaysOrders); StringBuilder stringBuilder = new StringBuilder().append("详："); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); String remarkFromJdid = getRemarkFromJdid(String.valueOf(entry.getKey())); - stringBuilder.append(buildStatsContent("\n粉：" + remarkFromJdid + "\n", statsDetail)); + stringBuilder.append(buildStatsContentMin("粉：" + remarkFromJdid, statsDetail)); } } contents.add(stringBuilder); @@ -367,14 +386,14 @@ public class JDUtil { case "两个月统计": { List last60DaysOrders = filterOrdersByDate(orderRows, 60); OrderStats stats = calculateStats(last60DaysOrders); - contents.add(buildStatsContent("两个月统计", stats)); + contents.add(buildStatsContentAll("两个月统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(last60DaysOrders); StringBuilder stringBuilder = new StringBuilder().append("详："); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); String remarkFromJdid = getRemarkFromJdid(String.valueOf(entry.getKey())); - stringBuilder.append(buildStatsContent("\n粉：" + remarkFromJdid + "\n", statsDetail)); + stringBuilder.append(buildStatsContentMin("粉：" + remarkFromJdid, statsDetail)); } } contents.add(stringBuilder); @@ -383,14 +402,14 @@ public class JDUtil { case "三个月统计": { List last90DaysOrders = filterOrdersByDate(orderRows, 90); OrderStats stats = calculateStats(last90DaysOrders); - contents.add(buildStatsContent("三个月统计", stats)); + contents.add(buildStatsContentAll("三个月统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(last90DaysOrders); StringBuilder stringBuilder = new StringBuilder().append("详："); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); String remarkFromJdid = getRemarkFromJdid(String.valueOf(entry.getKey())); - stringBuilder.append(buildStatsContent("\n粉：" + remarkFromJdid + "\n", statsDetail)); + stringBuilder.append(buildStatsContentMin("粉：" + remarkFromJdid, statsDetail)); } } contents.add(stringBuilder); @@ -401,14 +420,14 @@ public class JDUtil { int days = LocalDate.now().getDayOfMonth(); List thisMonthOrders = filterOrdersByDate(orderRows, days); OrderStats stats = calculateStats(thisMonthOrders); - contents.add(buildStatsContent("这个月统计", stats)); + contents.add(buildStatsContentAll("这个月统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(thisMonthOrders); StringBuilder stringBuilder = new StringBuilder().append("详："); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); String remarkFromJdid = getRemarkFromJdid(String.valueOf(entry.getKey())); - stringBuilder.append(buildStatsContent("\n粉：" + remarkFromJdid + "\n", statsDetail)); + stringBuilder.append(buildStatsContentMin("粉：" + remarkFromJdid, statsDetail)); } } contents.add(stringBuilder); @@ -423,14 +442,14 @@ public class JDUtil { lastMonthOrders = lastMonthOrders.stream().filter(orderRow -> !thisMonthOrders.contains(orderRow)).collect(Collectors.toList()); OrderStats stats = calculateStats(lastMonthOrders); - contents.add(buildStatsContent("上个月统计", stats)); + contents.add(buildStatsContentAll("上个月统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(lastMonthOrders); StringBuilder stringBuilder = new StringBuilder().append("详："); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); String remarkFromJdid = getRemarkFromJdid(String.valueOf(entry.getKey())); - stringBuilder.append(buildStatsContent("\n粉：" + remarkFromJdid + "\n", statsDetail)); + stringBuilder.append(buildStatsContentMin("粉：" + remarkFromJdid, statsDetail)); } } contents.add(stringBuilder); @@ -441,14 +460,14 @@ public class JDUtil { case "总统计": { OrderStats stats = calculateStats(orderRows); - contents.add(buildStatsContent("总统计", stats)); + contents.add(buildStatsContentAll("总统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(orderRows); StringBuilder stringBuilder = new StringBuilder().append("详："); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); String remarkFromJdid = getRemarkFromJdid(String.valueOf(entry.getKey())); - stringBuilder.append(buildStatsContent("\n粉：" + remarkFromJdid + "\n", statsDetail)); + stringBuilder.append(buildStatsContentMin("粉：" + remarkFromJdid, statsDetail)); } } contents.add(stringBuilder); @@ -461,7 +480,7 @@ public class JDUtil { List todayOrders = filterOrdersByDate(orderRows, 0); // 订单总数，已付款，已取消，佣金总计 OrderStats stats = calculateStats(todayOrders); - contents.add(buildStatsContent("今日统计", stats)); + contents.add(buildStatsContentAll("今日统计", stats)); if (!todayOrders.isEmpty()) { orderUtil.orderToWxBatch(todayOrders); } @@ -478,7 +497,7 @@ public class JDUtil { logger.info("今日过滤后数量：{}", todayOrders.size()); logger.info("最终昨日订单数量：{}", yesterdayOrders.size()); OrderStats stats = calculateStats(yesterdayOrders); - contents.add(buildStatsContent("昨日统计", stats)); + contents.add(buildStatsContentAll("昨日统计", stats)); if (!yesterdayOrders.isEmpty()) { orderUtil.orderToWxBatch(yesterdayOrders); } @@ -489,7 +508,7 @@ public class JDUtil { List todayOrders = filterOrdersByDate(orderRows, 0); last7DaysOrders.removeAll(todayOrders); OrderStats stats = calculateStats(last7DaysOrders); - contents.add(buildStatsContent("七日统计", stats)); + contents.add(buildStatsContentAll("七日统计", stats)); if (!last7DaysOrders.isEmpty()) { orderUtil.orderToWxBatch(last7DaysOrders); From 95c466dbc347920008bcb455ce2ee268a6066706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?= =?UTF-8?q?=EF=BC=89?= Date: Wed, 4 Jun 2025 14:33:46 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/van/business/util/JDUtil.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index 7cc1bd8..2be4bb5 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -204,7 +204,7 @@ public class JDUtil { .append("[Party] 有效订单：").append(stats.getValidOrders()).append("\n") // [OK] .append("[心碎]已取消：").append(stats.getCanceledOrders()).append("\n") // [禁止] - .append("────────────\n").append("[爱心]已付款：").append(stats.getPaidOrders()).append("\n") // [钱袋] + .append("────────────\n").append("[爱心] 已付款：").append(stats.getPaidOrders()).append("\n") // [钱袋] .append("[Packet] 已付款佣金：").append(String.format("%.2f", stats.getPaidCommission())).append("\n") // [钞票] .append("────────────\n").append("[Wow] 待付款：").append(stats.getPendingOrders()).append("\n") // [时钟] .append("[Packet] 待付款佣金：").append(String.format("%.2f", stats.getPendingCommission())).append("\n") // [钱] @@ -223,15 +223,13 @@ public class JDUtil { .append("[Party] 有效订单：").append(stats.getValidOrders()).append("\n") // [OK] //.append("[心碎]已取消：").append(stats.getCanceledOrders()).append("\n") // [禁止] - .append("────────────\n").append("[爱心]已付款：").append(stats.getPaidOrders()).append("\n") // [钱袋] - .append("[Packet] 已付款佣金：").append(String.format("%.2f", stats.getPaidCommission())).append("\n") // [钞票] - //.append("────────────\n").append("[Wow] 待付款：").append(stats.getPendingOrders()).append("\n") // [时钟] - //.append("[Packet] 待付款佣金：").append(String.format("%.2f", stats.getPendingCommission())).append("\n") // [钱] - .append("────────────\n").append("[亲亲] 已完成：").append(stats.getCompletedOrders()).append("\n") // [旗帜] - .append("[Packet] 已完成佣金：").append(String.format("%.2f", stats.getCompletedCommission())).append("\n") // [信用卡] - .append("────────────\n").append("[Emm] 违规订单：").append(stats.getViolations()).append("\n") // [警告] - .append("[Broken] 违规佣金：").append(String.format("%.2f", stats.getViolationCommission())).append("\n") // [炸弹] - .append("━━━━━━━━━━━━"); + .append("[爱心] 已付款：").append(stats.getPaidOrders()) + .append(" ").append(String.format("%.2f", stats.getPaidCommission())).append("\n") // [钞票] + .append("[亲亲] 已完成：").append(stats.getCompletedOrders()) + .append(" ").append(String.format("%.2f", stats.getCompletedCommission())).append("\n") // [信用卡] + .append("[Emm] 违规订单：").append(stats.getViolations()) + .append(" ").append(String.format("%.2f", stats.getViolationCommission())).append("\n") // [炸弹] + .append("━━━━━━━━━━━━\n"); return content; } From b04acda600b5b7152d544e1abeffc0ab6a47b4d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?= =?UTF-8?q?=EF=BC=89?= Date: Wed, 4 Jun 2025 14:36:50 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/van/business/util/JDUtil.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index 2be4bb5..8fcbbf6 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -218,17 +218,17 @@ public class JDUtil { private StringBuilder buildStatsContentMin(String title, OrderStats stats) { StringBuilder content = new StringBuilder(); content//[爱心][Wow][Packet][Party][Broken][心碎][亲亲][色] - .append(title).append("\n").append("━━━━━━━━━━━━\n") + .append(title).append("\n") //.append("[爱心] 订单总数：").append(stats.getTotalOrders()).append("\n") // [文件] .append("[Party] 有效订单：").append(stats.getValidOrders()).append("\n") // [OK] //.append("[心碎]已取消：").append(stats.getCanceledOrders()).append("\n") // [禁止] .append("[爱心] 已付款：").append(stats.getPaidOrders()) - .append(" ").append(String.format("%.2f", stats.getPaidCommission())).append("\n") // [钞票] + .append(">>> ").append(String.format("%.2f", stats.getPaidCommission())).append("\n") // [钞票] .append("[亲亲] 已完成：").append(stats.getCompletedOrders()) - .append(" ").append(String.format("%.2f", stats.getCompletedCommission())).append("\n") // [信用卡] - .append("[Emm] 违规订单：").append(stats.getViolations()) - .append(" ").append(String.format("%.2f", stats.getViolationCommission())).append("\n") // [炸弹] + .append(">>> ").append(String.format("%.2f", stats.getCompletedCommission())).append("\n") // [信用卡] + .append("[Emm] 违规单：").append(stats.getViolations()) + .append(">>> ").append(String.format("%.2f", stats.getViolationCommission())).append("\n") // [炸弹] .append("━━━━━━━━━━━━\n"); return content; } From ef0b10ee7874b6008ebbfe6a24629ce940c18230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?= =?UTF-8?q?=EF=BC=89?= Date: Wed, 4 Jun 2025 14:37:32 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/van/business/util/JDUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index 8fcbbf6..a5414f2 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -224,11 +224,11 @@ public class JDUtil { //.append("[心碎]已取消：").append(stats.getCanceledOrders()).append("\n") // [禁止] .append("[爱心] 已付款：").append(stats.getPaidOrders()) - .append(">>> ").append(String.format("%.2f", stats.getPaidCommission())).append("\n") // [钞票] + .append(" >>> ").append(String.format("%.2f", stats.getPaidCommission())).append("\n") // [钞票] .append("[亲亲] 已完成：").append(stats.getCompletedOrders()) - .append(">>> ").append(String.format("%.2f", stats.getCompletedCommission())).append("\n") // [信用卡] + .append(" >>> ").append(String.format("%.2f", stats.getCompletedCommission())).append("\n") // [信用卡] .append("[Emm] 违规单：").append(stats.getViolations()) - .append(">>> ").append(String.format("%.2f", stats.getViolationCommission())).append("\n") // [炸弹] + .append(" >>> ").append(String.format("%.2f", stats.getViolationCommission())).append("\n") // [炸弹] .append("━━━━━━━━━━━━\n"); return content; } From b2fce8c93db673f7556dcd0456e0918e2c7e8db2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?= =?UTF-8?q?=EF=BC=89?= Date: Wed, 4 Jun 2025 15:10:44 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/van/business/util/JDUtil.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index a5414f2..a53d56e 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -319,7 +319,7 @@ public class JDUtil { OrderStats stats = calculateStats(yesterdayOrders); contents.add(buildStatsContentAll("昨日统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(yesterdayOrders); - StringBuilder stringBuilder = new StringBuilder().append("详："); + StringBuilder stringBuilder = new StringBuilder().append("详：\n"); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); @@ -336,7 +336,7 @@ public class JDUtil { OrderStats stats = calculateStats(last3DaysOrders); contents.add(buildStatsContentAll("三日统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(last3DaysOrders); - StringBuilder stringBuilder = new StringBuilder().append("详："); + StringBuilder stringBuilder = new StringBuilder().append("详：\n"); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); @@ -353,7 +353,7 @@ public class JDUtil { OrderStats stats = calculateStats(last7DaysOrders); contents.add(buildStatsContentAll("七日统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(last7DaysOrders); - StringBuilder stringBuilder = new StringBuilder().append("详："); + StringBuilder stringBuilder = new StringBuilder().append("详：\n"); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); @@ -370,7 +370,7 @@ public class JDUtil { OrderStats stats = calculateStats(last30DaysOrders); contents.add(buildStatsContentAll("一个月统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(last30DaysOrders); - StringBuilder stringBuilder = new StringBuilder().append("详："); + StringBuilder stringBuilder = new StringBuilder().append("详：\n"); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); @@ -386,7 +386,7 @@ public class JDUtil { OrderStats stats = calculateStats(last60DaysOrders); contents.add(buildStatsContentAll("两个月统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(last60DaysOrders); - StringBuilder stringBuilder = new StringBuilder().append("详："); + StringBuilder stringBuilder = new StringBuilder().append("详：\n"); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); @@ -402,7 +402,7 @@ public class JDUtil { OrderStats stats = calculateStats(last90DaysOrders); contents.add(buildStatsContentAll("三个月统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(last90DaysOrders); - StringBuilder stringBuilder = new StringBuilder().append("详："); + StringBuilder stringBuilder = new StringBuilder().append("详：\n"); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); @@ -420,7 +420,7 @@ public class JDUtil { OrderStats stats = calculateStats(thisMonthOrders); contents.add(buildStatsContentAll("这个月统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(thisMonthOrders); - StringBuilder stringBuilder = new StringBuilder().append("详："); + StringBuilder stringBuilder = new StringBuilder().append("详：\n"); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); @@ -442,7 +442,7 @@ public class JDUtil { OrderStats stats = calculateStats(lastMonthOrders); contents.add(buildStatsContentAll("上个月统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(lastMonthOrders); - StringBuilder stringBuilder = new StringBuilder().append("详："); + StringBuilder stringBuilder = new StringBuilder().append("详：\n"); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); @@ -460,7 +460,7 @@ public class JDUtil { OrderStats stats = calculateStats(orderRows); contents.add(buildStatsContentAll("总统计", stats)); Map statsByUnionId = OrderStatsUtil.groupByUnionIdAndCalculateStats(orderRows); - StringBuilder stringBuilder = new StringBuilder().append("详："); + StringBuilder stringBuilder = new StringBuilder().append("详：\n"); if (statsByUnionId != null) { for (Map.Entry entry : statsByUnionId.entrySet()) { OrderStats statsDetail = entry.getValue(); @@ -1456,7 +1456,7 @@ public class JDUtil { /*直接生成闲鱼的商品文案*/ StringBuilder sb1 = new StringBuilder(); - sb1.append("(教你买) ").append(title).append(replaceAll).append("\n").append(WENAN_FANAN_LQD.replaceAll("更新", format + "更新")); + sb1.append("(教你买。标价到手) ").append(title).append(replaceAll).append("\n").append(WENAN_FANAN_LQD.replaceAll("更新", format + "更新")); //textList.add("闲鱼方案的文案：\n"); textList.add(String.valueOf(sb1)); StringBuilder sb2 = new StringBuilder(); @@ -1464,7 +1464,7 @@ public class JDUtil { //textList.add("闲鱼正常销售：\n"); textList.add(String.valueOf(sb2)); StringBuilder sb3 = new StringBuilder(); - sb3.append("(教你买) ").append(title).append(replaceAll).append("\n").append(WENAN_FANAN_HG.replaceAll("更新", format + "更新")); + sb3.append("(教你买。标价到手) ").append(title).append(replaceAll).append("\n").append(WENAN_FANAN_HG.replaceAll("更新", format + "更新")); textList.add(String.valueOf(sb3)); StringBuilder sb4 = new StringBuilder(); From 3d3cb5d208c254d6294c823b31c02d06cb33a23d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?= =?UTF-8?q?=EF=BC=89?= Date: Wed, 4 Jun 2025 15:40:35 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/van/business/util/JDUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index a53d56e..f693d23 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -1456,7 +1456,7 @@ public class JDUtil { /*直接生成闲鱼的商品文案*/ StringBuilder sb1 = new StringBuilder(); - sb1.append("(教你买。标价到手) ").append(title).append(replaceAll).append("\n").append(WENAN_FANAN_LQD.replaceAll("更新", format + "更新")); + sb1.append("(标价到手) ").append(title).append(replaceAll).append("\n").append(WENAN_FANAN_LQD.replaceAll("更新", format + "更新")); //textList.add("闲鱼方案的文案：\n"); textList.add(String.valueOf(sb1)); StringBuilder sb2 = new StringBuilder(); @@ -1464,7 +1464,7 @@ public class JDUtil { //textList.add("闲鱼正常销售：\n"); textList.add(String.valueOf(sb2)); StringBuilder sb3 = new StringBuilder(); - sb3.append("(教你买。标价到手) ").append(title).append(replaceAll).append("\n").append(WENAN_FANAN_HG.replaceAll("更新", format + "更新")); + sb3.append("(标价到手) ").append(title).append(replaceAll).append("\n").append(WENAN_FANAN_HG.replaceAll("更新", format + "更新")); textList.add(String.valueOf(sb3)); StringBuilder sb4 = new StringBuilder();