This commit is contained in:
雷欧(林平凡)
2025-03-17 15:57:13 +08:00
parent 335c940353
commit 21e5cc3dd0
2 changed files with 25 additions and 22 deletions

View File

@@ -127,8 +127,7 @@ public class JDUtil {
private StringBuilder buildStatsContent(String title, OrderStats stats) { private StringBuilder buildStatsContent(String title, OrderStats stats) {
StringBuilder content = new StringBuilder(); StringBuilder content = new StringBuilder();
content.append("━━━━━━━━━━━━\n") content//[爱心][Wow][Packet][Party][Broken][心碎][亲亲][色]
//[爱心][Wow][Packet][Party][Broken][心碎][亲亲][色]
.append("* ").append(title).append(" *\n") .append("* ").append(title).append(" *\n")
.append("━━━━━━━━━━━━\n") .append("━━━━━━━━━━━━\n")
.append("[爱心] 订单总数:").append(stats.getTotalOrders()).append("\n") // [文件] .append("[爱心] 订单总数:").append(stats.getTotalOrders()).append("\n") // [文件]

View File

@@ -98,7 +98,7 @@ public class OrderUtil {
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
ValidCodeConverter converter = new ValidCodeConverter(); ValidCodeConverter converter = new ValidCodeConverter();
String orderInfo = String orderInfo =
"状态:" +getEmjoy(orderRow.getValidCode())+" "+ (converter.getCodeDescription(orderRow.getValidCode())) + "\r" + " " +getEmjoy(orderRow.getValidCode())+" "+ (converter.getCodeDescription(orderRow.getValidCode())) + "\r" +
//+ "订单+sku" + orderRow.getId() + "\r" //+ "订单+sku" + orderRow.getId() + "\r"
"订单:" + orderRow.getOrderId() + " (" + (orderRow.getPlus() == 1 ? "plus" : "非plus") + ")\r" + "订单:" + orderRow.getOrderId() + " (" + (orderRow.getPlus() == 1 ? "plus" : "非plus") + ")\r" +
@@ -151,24 +151,13 @@ public class OrderUtil {
public String getFormattedOrderInfoBatch(OrderRow orderRow) { public String getFormattedOrderInfoBatch(OrderRow orderRow) {
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
ValidCodeConverter converter = new ValidCodeConverter(); ValidCodeConverter converter = new ValidCodeConverter();
String orderInfo = //+ "订单+sku" + orderRow.getId() + "\r"
//+ "订单+sku" + orderRow.getId() + "\r" //+ "商品单价" + orderRow.getPrice() + "\r"
"订单:" + orderRow.getOrderId() + " (" + (orderRow.getPlus() == 1 ? "plus" : "非plus") + ")\r" + //+ "商品数量:" + orderRow.getSkuNum() + "\r"
//+ "商品总价:" + (orderRow.getPrice() * orderRow.getSkuNum()) + "\r"
"状态:" + (converter.getCodeDescription(orderRow.getValidCode())) + "\r" //+ "计佣金额:" + orderRow.getEstimateCosPrice() + "\r"
//+ "金额:" + orderRow.getActualCosPrice() + "\r"
+ "名称:" + orderRow.getSkuName() + "\r\n" //+ "比例:" + orderRow.getCommissionRate() + "\r"
//+ "商品单价:" + 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";
//if (oldValidCode != -100) { //if (oldValidCode != -100) {
// if (!oldValidCode.equals(orderRow.getValidCode())) // if (!oldValidCode.equals(orderRow.getValidCode()))
// orderInfo = "从 " + (converter.getCodeDescription(oldValidCode)) + "\r变成 " + // 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";
} }
} }