timi/TimiServerAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 57 Wiki Activity

v1.0.57 #69

Merged
timi merged 3 commits from dev into master 2026-10-05 08:10:57 +00:00
Conversation 0 Commits 3 Files Changed 19
+10 -3
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8fe00fbb7c - Show all commits
src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoOrderReminderServiceImplement.java
+10 -3
View File
@@ -46,6 +46,8 @@ public class GaoOrderReminderServiceImplement implements GaoOrderReminderService
private static final String SMS_TEMPLATE_ID = "2725097"; private static final String SMS_TEMPLATE_ID = "2725097";
private static final String ZONE_ID = "Asia/Shanghai"; private static final String ZONE_ID = "Asia/Shanghai";
private static final String INTERNAL_TEMPLATE_NAME = "GaoOrderReminder.ftl"; private static final String INTERNAL_TEMPLATE_NAME = "GaoOrderReminder.ftl";
private static final int MAX_SMS_CUSTOMER_NAME_COUNT = 6;
private static final int MAX_SMS_CUSTOMER_COUNT = 99;
private final GaoOrderReminderMapper mapper; private final GaoOrderReminderMapper mapper;
private final GaoUserMapper gaoUserMapper; private final GaoUserMapper gaoUserMapper;
@@ -262,10 +264,15 @@ public class GaoOrderReminderServiceImplement implements GaoOrderReminderService
nameMap.putIfAbsent(order.getCustomerId(), displayCustomerName(order.getCustomerName())); nameMap.putIfAbsent(order.getCustomerId(), displayCustomerName(order.getCustomerName()));
} }
List<String> nameList = new ArrayList<>(nameMap.values()); List<String> nameList = new ArrayList<>(nameMap.values());
if (nameList.size() <= 2) { int customerCount = nameList.size();
return String.join("、", nameList); int displayCount = Math.min(customerCount, MAX_SMS_CUSTOMER_NAME_COUNT);
String customerNames = String.join("、", nameList.subList(0, displayCount));
if (MAX_SMS_CUSTOMER_NAME_COUNT < customerCount) {
String customerCountText = MAX_SMS_CUSTOMER_COUNT < customerCount
? "%d+".formatted(MAX_SMS_CUSTOMER_COUNT) : String.valueOf(customerCount);
return "%s等 %s 位客户".formatted(customerNames, customerCountText);
} }
return "%s、%s等 %d 位".formatted(nameList.getFirst(), nameList.get(1), nameList.size()); return customerNames;
} }
/// 获取待核销收款金额 /// 获取待核销收款金额