Compare commits
4
Commits
a1ad742d96
...
5b4e861f74
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5b4e861f74 | ||
|
|
e3c368fd3a | ||
|
|
c4ef932dba | ||
|
|
b44b719cff |
@@ -460,8 +460,8 @@ public class JDScheduleJob {
|
|||||||
String currentHour = String.valueOf(now.getHour());
|
String currentHour = String.valueOf(now.getHour());
|
||||||
|
|
||||||
// 如果今天已经执行了3次,则跳过
|
// 如果今天已经执行了3次,则跳过
|
||||||
if (executedHours.size() >= 3) {
|
if (executedHours.size() >= 2) {
|
||||||
logger.info("今天已经执行了3次,跳过本次任务");
|
logger.info("今天已经执行了2次,跳过本次任务");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ public class JDUtil {
|
|||||||
* <p>
|
* <p>
|
||||||
* 订单号:
|
* 订单号:
|
||||||
*/
|
*/
|
||||||
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;
|
final WXUtil wxUtil;
|
||||||
private final StringRedisTemplate redisTemplate;
|
private final StringRedisTemplate redisTemplate;
|
||||||
@@ -2054,8 +2054,7 @@ public class JDUtil {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 添加合计
|
// 添加合计
|
||||||
summaryBuilder.append("总计:")
|
summaryBuilder.append("总计:").append(totalCount).append("\n详情:");
|
||||||
.append("\n总数量:").append(totalCount);
|
|
||||||
|
|
||||||
// 发送总统计消息
|
// 发送总统计消息
|
||||||
//wxUtil.sendTextMessage(fromWxid, "分销标记:" + distributionMark + "\n" + summaryBuilder, 1, fromWxid, true);
|
//wxUtil.sendTextMessage(fromWxid, "分销标记:" + distributionMark + "\n" + summaryBuilder, 1, fromWxid, true);
|
||||||
@@ -2070,7 +2069,7 @@ public class JDUtil {
|
|||||||
.append("\n下单付款:").append(order.getPaymentAmount() != null ? String.format("%.2f", order.getPaymentAmount()) : "0.00").append(" 元")
|
.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.getRebateAmount() != null ? String.format("%.2f", order.getRebateAmount()) : "0.00").append(" 元")
|
||||||
.append("\n地址:").append(order.getAddress() != null ? order.getAddress() : "未提供")
|
.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");
|
.append("\n────────────\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2087,7 +2086,7 @@ public class JDUtil {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
JDOrder byRemark = jdOrderRepository.findByRemark(jdOrder.getRemark());
|
JDOrder byRemark = jdOrderRepository.findByRemark(jdOrder.getRemark());
|
||||||
String info = "";
|
String info;
|
||||||
if (byRemark != null) {
|
if (byRemark != null) {
|
||||||
logger.info("订单已存在:{}", byRemark);
|
logger.info("订单已存在:{}", byRemark);
|
||||||
info = "更新成功";
|
info = "更新成功";
|
||||||
@@ -2137,7 +2136,7 @@ public class JDUtil {
|
|||||||
Map<String, String> fields = new HashMap<>();
|
Map<String, String> fields = new HashMap<>();
|
||||||
|
|
||||||
// 定义正则表达式提取各个字段
|
// 定义正则表达式提取各个字段
|
||||||
extractField(input, fields, "单:", "分销标记:");
|
extractField(input, fields, "单:", "备注:");
|
||||||
extractField(input, fields, "分销标记:", "型号:");
|
extractField(input, fields, "分销标记:", "型号:");
|
||||||
extractField(input, fields, "型号:", "链接:");
|
extractField(input, fields, "型号:", "链接:");
|
||||||
extractField(input, fields, "链接:", "下单付款:");
|
extractField(input, fields, "链接:", "下单付款:");
|
||||||
|
|||||||
Reference in New Issue
Block a user