This commit is contained in:
雷欧(林平凡)
2025-05-30 11:38:14 +08:00
parent 949bc163af
commit 9ffc04d496

View File

@@ -1338,7 +1338,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();
@@ -1346,7 +1346,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();
@@ -1918,7 +1918,6 @@ public class JDUtil {
public void LD(String input, String fromWxid) {
if (input.equals("")) {
// 查找今天所有订单出来按Remark升序并且拼接成长文本并且先根据distributionMark分组再根据 ModelNumber 分组,最后再进行统计 paymentAmount 和 rebateAmount
// 获取今天的日期
LocalDate today = LocalDate.now();
LocalDateTime startOfDay = today.atStartOfDay();
@@ -1960,19 +1959,9 @@ public class JDUtil {
List<JDOrder> orders = modelEntry.getValue();
int count = orders.size();
double totalPaymentAmount = orders.stream()
.mapToDouble(order -> order.getPaymentAmount() != null ? order.getPaymentAmount() : 0.0)
.sum();
double totalRebateAmount = orders.stream()
.mapToDouble(order -> order.getRebateAmount() != null ? order.getRebateAmount() : 0.0)
.sum();
resultBuilder.append("型号:").append(modelNumber != null ? modelNumber : "未知")
.append("\n数量").append(count)
.append("\n总支付金额").append(String.format("%.2f", totalPaymentAmount))
.append("")
.append("\n总后返金额").append(String.format("%.2f", totalRebateAmount))
.append("")
.append("\n────────────\n");
for (JDOrder order : orders) {
@@ -1992,7 +1981,7 @@ public class JDUtil {
wxUtil.sendTextMessage(fromWxid, resultBuilder.toString(), 1, fromWxid, true);
}
} else {
// 生成当前日期 2025-02-05
// 生成当前日期
String date = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
JDOrder jdOrder = parseOrderFromText(input.trim().replace("", ""));
if (jdOrder.getOrderId() == null) {
@@ -2014,8 +2003,7 @@ public class JDUtil {
jdOrderRepository.save(jdOrder);
StringBuilder sb = new StringBuilder();
//单号 下单日期 型号 内部订单号 地址 物流 外派给谁 后返金额 谁的单 下单价格
// 从jdOrder中获取转化
// 单号 下单日期 型号 内部订单号 地址 物流 外派给谁 后返金额 谁的单 下单价格
String distributionMark = jdOrder.getDistributionMark();
String distributionMark2 = "";
if (distributionMark != null) {
@@ -2025,7 +2013,16 @@ public class JDUtil {
distributionMark2 = "";
}
}
sb.append(jdOrder.getRemark()).append("\t").append(jdOrder.getOrderId()).append("\t").append(date).append("\t").append(jdOrder.getModelNumber()).append("\t").append(jdOrder.getAddress()).append("\t").append(jdOrder.getLogisticsLink()).append("\t").append("\t").append(jdOrder.getBuyer()).append("\t").append(jdOrder.getPaymentAmount()).append("\t").append(distributionMark2);
sb.append(jdOrder.getRemark()).append("\t")
.append(jdOrder.getOrderId()).append("\t")
.append(date).append("\t")
.append(jdOrder.getModelNumber()).append("\t")
.append(jdOrder.getAddress()).append("\t")
.append(jdOrder.getLogisticsLink()).append("\t\t")
.append(jdOrder.getBuyer()).append("\t")
.append(jdOrder.getPaymentAmount()).append("\t")
.append(distributionMark2);
logger.info("订单信息:{}", sb);
if (fromWxid.isEmpty()) {
return;
@@ -2033,10 +2030,9 @@ public class JDUtil {
wxUtil.sendTextMessage(fromWxid, info, 1, null, true);
wxUtil.sendTextMessage(fromWxid, sb.toString(), 1, null, true);
}
}
}
public JDOrder parseOrderFromText(String input) {
// 清理多余的空白字符
input = input.replaceAll("\\s+", " ").trim();