CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: CC:dafd63a9ecead42973c7414b543b4a4eaa85dc9c
Branches Tags
CC:master
...
compare: CC:0297c6e1315de6a67757fe2242b681b278e15766
Branches Tags
CC:master

2 Commits
dafd63a9ec ... 0297c6e131

Author SHA1 Message Date
Leo
0297c6e131 1 2026-01-17 23:47:19 +08:00
Leo
6394658a70 1 2026-01-17 23:40:10 +08:00
2 changed files with 17 additions and 3 deletions
Expand all files Collapse all files

7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/TencentDocController.java
View File

@@ -1539,9 +1539,12 @@ public class TencentDocController extends BaseController {
log.info("✓ 准备写入是否安排 - 单号: {}, 是否安排: 2, 行: {}, 列: {}", expectedOrderNo, row, arrangedColumn);
}
// 5. 更新"标记"列（如果存在）
if (markColumn != null) {
// 5. 更新"标记"列（如果存在，且不是物流链接更新时才写入，物流链接更新时保留原日期）
if (markColumn != null && !Boolean.TRUE.equals(isLinkUpdated)) {
requests.add(buildUpdateCellRequest(sheetId, row - 1, markColumn, today, false));
log.info("✓ 准备写入标记日期 - 单号: {}, 日期: {}, 行: {}, 列: {}", expectedOrderNo, today, row, markColumn);
} else if (markColumn != null && Boolean.TRUE.equals(isLinkUpdated)) {
log.info("✓ 物流链接更新，保留原标记日期 - 单号: {}, 行: {}", expectedOrderNo, row);
}
// 构建完整的 batchUpdate 请求体

13
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java
View File

@@ -287,7 +287,11 @@ public class InstructionServiceImpl implements IInstructionService {
list.forEach(order -> order.setDistributionMark(truncateDistributionMark(order.getDistributionMark())));
// 过滤条件：时间范围 + 参与统计标记（isCountEnabled为null或1表示参与统计）
List<JDOrder> filtered = list.stream().filter(o -> o.getOrderTime() != null && !o.getOrderTime().before(start) && !o.getOrderTime().after(end) && (o.getIsCountEnabled() == null || o.getIsCountEnabled() == 1)).collect(Collectors.toList());
if (filtered.isEmpty()) return Collections.singletonList("今天没有订单。");
if (filtered.isEmpty()) {
LocalDate queryDate = range.get(0);
String dateStr = queryDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd"));
return Collections.singletonList("日期：" + dateStr + "\n" + dateStr + "没有订单。");
}
Map<String, List<JDOrder>> byDM = filtered.stream().filter(o -> o.getStatus() == null || !"拍错退款".equals(o.getStatus())).collect(Collectors.groupingBy(JDOrder::getDistributionMark));
List<String> outputs = new ArrayList<>();
@@ -623,6 +627,13 @@ public class InstructionServiceImpl implements IInstructionService {
}
// ==================== 按下单人统计结束 ====================
// 在返回数据前，在头部添加日期信息
if (!outputs.isEmpty()) {
LocalDate queryDate = range.get(0);
String dateStr = queryDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd"));
outputs.add(0, "日期：" + dateStr + "\n");
}
return outputs.isEmpty() ? Collections.singletonList("无数据") : outputs;
}
if (input.startsWith("单")) {