From 21e5cc3dd01c5f9d7a9341287e921e324e199b41 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: Mon, 17 Mar 2025 15:57:13 +0800 Subject: [PATCH] 1 --- .../java/cn/van/business/util/JDUtil.java | 3 +- .../java/cn/van/business/util/OrderUtil.java | 44 ++++++++++--------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index 688efcf..4da00f8 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -127,8 +127,7 @@ public class JDUtil { private StringBuilder buildStatsContent(String title, OrderStats stats) { StringBuilder content = new StringBuilder(); - content.append("━━━━━━━━━━━━\n") - //[爱心][Wow][Packet][Party][Broken][心碎][亲亲][色] + content//[爱心][Wow][Packet][Party][Broken][心碎][亲亲][色] .append("* ").append(title).append(" *\n") .append("━━━━━━━━━━━━\n") .append("[爱心] 订单总数：").append(stats.getTotalOrders()).append("\n") // [文件] diff --git a/src/main/java/cn/van/business/util/OrderUtil.java b/src/main/java/cn/van/business/util/OrderUtil.java index 210bc7d..94d50a5 100644 --- a/src/main/java/cn/van/business/util/OrderUtil.java +++ b/src/main/java/cn/van/business/util/OrderUtil.java @@ -98,7 +98,7 @@ public class OrderUtil { SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); ValidCodeConverter converter = new ValidCodeConverter(); String orderInfo = - "状态：" +getEmjoy(orderRow.getValidCode())+" "+ (converter.getCodeDescription(orderRow.getValidCode())) + "\r" + + " " +getEmjoy(orderRow.getValidCode())+" "+ (converter.getCodeDescription(orderRow.getValidCode())) + "\r" + //+ "订单+sku：" + orderRow.getId() + "\r" "订单：" + orderRow.getOrderId() + " (" + (orderRow.getPlus() == 1 ? "plus" : "非plus") + ")\r" + @@ -151,24 +151,13 @@ public class OrderUtil { public String getFormattedOrderInfoBatch(OrderRow orderRow) { SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); ValidCodeConverter converter = new ValidCodeConverter(); - String orderInfo = - //+ "订单+sku：" + orderRow.getId() + "\r" - "订单：" + orderRow.getOrderId() + " (" + (orderRow.getPlus() == 1 ? "plus" : "非plus") + ")\r" + - - "状态：" + (converter.getCodeDescription(orderRow.getValidCode())) + "\r" - - + "名称：" + orderRow.getSkuName() + "\r\n" - //+ "商品单价：" + orderRow.getPrice() + "\r" - //+ "商品数量：" + orderRow.getSkuNum() + "\r" - //+ "商品总价：" + (orderRow.getPrice() * orderRow.getSkuNum()) + "\r" - //+ "计佣金额：" + orderRow.getEstimateCosPrice() + "\r" - - //+ "金额：" + orderRow.getActualCosPrice() + "\r" - //+ "比例：" + orderRow.getCommissionRate() + "\r" - + "佣金：" + orderRow.getEstimateFee() + "\r\n" - - + "下单：" + formatter.format(orderRow.getOrderTime()) + "\r" - + "完成：" + (orderRow.getFinishTime() != null ? formatter.format(orderRow.getFinishTime()) : "未完成") + "\r"; + //+ "订单+sku：" + orderRow.getId() + "\r" + //+ "商品单价：" + orderRow.getPrice() + "\r" + //+ "商品数量：" + orderRow.getSkuNum() + "\r" + //+ "商品总价：" + (orderRow.getPrice() * orderRow.getSkuNum()) + "\r" + //+ "计佣金额：" + orderRow.getEstimateCosPrice() + "\r" + //+ "金额：" + orderRow.getActualCosPrice() + "\r" + //+ "比例：" + orderRow.getCommissionRate() + "\r" //if (oldValidCode != -100) { // if (!oldValidCode.equals(orderRow.getValidCode())) // orderInfo = "从 ：" + (converter.getCodeDescription(oldValidCode)) + "\r变成 " + @@ -176,6 +165,21 @@ public class OrderUtil { //} - return orderInfo; + return "订单：" + orderRow.getOrderId() + " (" + (orderRow.getPlus() == 1 ? "plus" : "非plus") + ")\r" + + + "状态：" + (converter.getCodeDescription(orderRow.getValidCode())) + "\r" + + + "名称：" + orderRow.getSkuName() + "\r\n" + //+ "商品单价：" + orderRow.getPrice() + "\r" + //+ "商品数量：" + orderRow.getSkuNum() + "\r" + //+ "商品总价：" + (orderRow.getPrice() * orderRow.getSkuNum()) + "\r" + //+ "计佣金额：" + orderRow.getEstimateCosPrice() + "\r" + + //+ "金额：" + orderRow.getActualCosPrice() + "\r" + //+ "比例：" + orderRow.getCommissionRate() + "\r" + + "佣金：" + orderRow.getEstimateFee() + "\r\n" + + + "下单：" + formatter.format(orderRow.getOrderTime()) + "\r" + + "完成：" + (orderRow.getFinishTime() != null ? formatter.format(orderRow.getFinishTime()) : "未完成") + "\r"; } }