From 1d33162c1f3553f783cd5c0defc29db10a43060c Mon Sep 17 00:00:00 2001 From: Van0313 <60689272+Van0313@users.noreply.github.com> Date: Mon, 21 Apr 2025 23:02:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=20=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=99=84=E5=B8=A6=E4=BA=AC=E7=B2=89=E6=AF=8F=E6=97=A5=E7=BB=9F?= =?UTF-8?q?=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/OrderUtil.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/cn/van/business/util/OrderUtil.java b/src/main/java/cn/van/business/util/OrderUtil.java index 650e03d..15f2702 100644 --- a/src/main/java/cn/van/business/util/OrderUtil.java +++ b/src/main/java/cn/van/business/util/OrderUtil.java @@ -5,8 +5,6 @@ import cn.van.business.model.jd.OrderRow; import cn.van.business.repository.OrderRowRepository; import lombok.AllArgsConstructor; import lombok.Getter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.scheduling.annotation.Async; @@ -94,10 +92,13 @@ public class OrderUtil { String unionId = entry.getKey(); List orderRows2 = entry.getValue(); OrderStats stats = calculateStats(orderRows2); - resultContent.append(buildStatsContent("京粉 :" + getRemarkFromJdid(unionId) , stats)); + resultContent.append(buildStatsContent("京粉 : " + getRemarkFromJdid(unionId) , stats)); } wxUtil.sendTextMessage(wxId, resultContent.toString(), 1, wxId, true); + OrderStats orderStats = calculateStats(orderRows); + wxUtil.sendTextMessage(wxId, buildStatsContent("今日订单统计 : ", orderStats), 1, wxId, true); + } } @@ -156,7 +157,7 @@ public class OrderUtil { orderInfo //+ "订单+sku：" + orderRow.getId() + "\r" - .append("京粉备注：").append(remarkFromJdid).append("\r") + .append("京粉：").append(remarkFromJdid).append("\r") .append("订单：").append(orderRow.getOrderId()).append(" (") .append(orderRow.getPlus() == 1 ? "plus" : "非plus").append(")\r") .append("名称：").append(orderRow.getSkuName()).append("\r\n") @@ -258,7 +259,7 @@ public class OrderUtil { 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 String buildStatsContent(String title, OrderStats stats) { StringBuilder content = new StringBuilder(); content//[爱心][Wow][Packet][Party][Broken][心碎][亲亲][色] .append(title).append(" \n").append("[爱心] 订单总数：").append(stats.getTotalOrders()).append("\n") // [文件] @@ -268,7 +269,7 @@ public class OrderUtil { .append("[Packet] 已付款佣金：").append(String.format("%.2f", stats.getPaidCommission())).append("\n") // [钞票] .append("[Wow] 待付款：").append(stats.getPendingOrders()).append("\n") // [时钟] .append("[Packet] 待付款佣金：").append(String.format("%.2f", stats.getPendingCommission())).append("\n").append("━━━━━━━━━━━━\n"); - return content; + return content.toString(); } private Stream getStreamForWeiGui(List todayOrders) { return todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 13 || orderRow.getValidCode() == 25 || orderRow.getValidCode() == 26 || orderRow.getValidCode() == 27 || orderRow.getValidCode() == 28 || orderRow.getValidCode() == 29);