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

refactor(glt-ticket): 调整套票发放逻辑，移除自动核销功能

Browse Source 
- 修改套票发放任务注释，明确发放阶段不再自动核销/自动下单
- 移除起始送水自动核销相关代码和常量定义
- 删除自动核销相关的服务依赖注入
- 更新套票发放逻辑，按整改需求仅记录startSendQty配置但不执行自动核销
- 移除构建起始送水订单的相关方法
- 添加送水时间格式化常量用于立刻送水场景
- 实现立刻送水时自动设置当前时间为配送时间的功能
This commit is contained in:
赵忠林
2026-03-10 13:04:22 +08:00
parent 039508412b
commit 233af57bad
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/gxwebsoft/credit/controller/BatchImportSupport.java
View File

@@ -355,6 +355,7 @@ public class BatchImportSupport {
// 3.1) 查询当前租户下的 companyId 映射 // 3.1) 查询当前租户下的 companyId 映射
LinkedHashMap<String, Integer> companyIdByName = new LinkedHashMap<>(); LinkedHashMap<String, Integer> companyIdByName = new LinkedHashMap<>();
LinkedHashMap<String, Integer> ambiguousByName = new LinkedHashMap<>(); LinkedHashMap<String, Integer> ambiguousByName = new LinkedHashMap<>();
// For display: prefer matchName (normalized) then name.
HashMap<Integer, String> companyNameById = new HashMap<>(); HashMap<Integer, String> companyNameById = new HashMap<>();
LinkedHashSet<String> nameSet = new LinkedHashSet<>(); LinkedHashSet<String> nameSet = new LinkedHashSet<>();
for (T row : tenantRows) { for (T row : tenantRows) {
@@ -385,8 +386,12 @@ public class BatchImportSupport {
if (c == null || c.getId() == null) { if (c == null || c.getId() == null) {
continue; continue;
} }
if (c.getName() != null && !c.getName().trim().isEmpty()) { String displayName = c.getMatchName();
companyNameById.putIfAbsent(c.getId(), c.getName().trim()); if (displayName == null || displayName.trim().isEmpty()) {
displayName = c.getName();
}
if (displayName != null && !displayName.trim().isEmpty()) {
companyNameById.putIfAbsent(c.getId(), displayName.trim());
} }
addCompanyNameMapping(companyIdByName, ambiguousByName, normalizeCompanyName(c.getName()), c.getId()); addCompanyNameMapping(companyIdByName, ambiguousByName, normalizeCompanyName(c.getName()), c.getId());
addCompanyNameMapping(companyIdByName, ambiguousByName, normalizeCompanyName(c.getMatchName()), c.getId()); addCompanyNameMapping(companyIdByName, ambiguousByName, normalizeCompanyName(c.getMatchName()), c.getId());