hardstylewyl
|
ddabbbd63c
|
Merge branch 'S07' into test
|
2025-04-02 09:23:08 +08:00 |
|
hardstylewyl
|
69aa048ae9
|
option:SJZY.UserCenter.HttpApi 3.1.8.17-alpha=>3.1.8.21
fix:修复通知配置消息来源为1
|
2025-04-02 09:22:51 +08:00 |
|
hardstylewyl
|
fc325c892c
|
Merge branch 'S07' into test
|
2025-04-01 17:19:35 +08:00 |
|
hardstylewyl
|
6831af22fe
|
option: 调用用户中心通知IsNeedToHandle false => true
|
2025-04-01 17:18:32 +08:00 |
|
hardstylewyl
|
d2ea3e94ff
|
Merge branch 'S07' into test
|
2025-04-01 16:24:45 +08:00 |
|
hardstylewyl
|
e93326914b
|
fix:修复运输预警状态计算的边界问题
|
2025-04-01 16:24:16 +08:00 |
|
hardstylewyl
|
b712d95b9a
|
Merge branch 'S07' into test
|
2025-04-01 14:54:54 +08:00 |
|
hardstylewyl
|
ce13941419
|
fix:修复完整预警在删除轨迹时维护预警明细
|
2025-04-01 14:54:45 +08:00 |
|
hardstylewyl
|
42dc20ec33
|
Merge branch 'S07' into test
|
2025-04-01 11:04:52 +08:00 |
|
hardstylewyl
|
1771fe399a
|
fix:修复运输时效预警状态逻辑
|
2025-04-01 11:04:43 +08:00 |
|
hardstylewyl
|
848ad3c1c6
|
Merge branch 'S07' into test
|
2025-04-01 10:42:20 +08:00 |
|
hardstylewyl
|
b5ee6396fd
|
fix:修复运输时效预警状态维护
|
2025-04-01 10:42:08 +08:00 |
|
hardstylewyl
|
5301fe1aec
|
Merge branch 'S07' into test
|
2025-04-01 10:27:03 +08:00 |
|
hardstylewyl
|
e004389413
|
fix:修复运输时效预警状态计算逻辑
|
2025-04-01 10:26:52 +08:00 |
|
hardstylewyl
|
e6eb3e6431
|
Merge branch 'S07' into test
|
2025-04-01 09:46:28 +08:00 |
|
hardstylewyl
|
e5956abbf7
|
fix:修复轨迹完整预警时新增轨迹可以导致明细的缺失轨迹状态发生变化
|
2025-04-01 09:29:07 +08:00 |
|
hardstylewyl
|
7b31da7cd0
|
clean:清理不必要的代码，修整todo
|
2025-03-31 16:03:33 +08:00 |
|
hardstylewyl
|
78933456c3
|
Merge branch 'S07' into test
|
2025-03-31 15:35:55 +08:00 |
|
hardstylewyl
|
a6b88ffbc9
|
fix:修复分页获取预警信息排序使用先按状态圣教序，在按创建时间倒序排序
|
2025-03-31 15:35:40 +08:00 |
|
hardstylewyl
|
04ff191560
|
Merge branch 'S07' into test
|
2025-03-31 14:52:29 +08:00 |
|
hardstylewyl
|
9cfa88f037
|
fix:修复运输时效预警明细的状态排序
|
2025-03-31 14:52:18 +08:00 |
|
hardstylewyl
|
934aef7340
|
Merge branch 'S07' into test
|
2025-03-31 10:32:19 +08:00 |
|
hardstylewyl
|
027b06b9d9
|
fix:修复预警明细的分页查询，不返回总数的bug
|
2025-03-31 10:32:06 +08:00 |
|
hardstylewyl
|
36514e11a0
|
Merge branch 'S07' into test
|
2025-03-31 10:10:47 +08:00 |
|
hardstylewyl
|
e034bbab38
|
fix:修复运输预警累计运输时间计算空值错误
|
2025-03-31 10:10:27 +08:00 |
|
hardstylewyl
|
a2ce295253
|
Merge branch 'S07' into test
|
2025-03-31 10:02:10 +08:00 |
|
hardstylewyl
|
8bd0108c10
|
fix:修复预警明细最新轨迹应查创建时间最新/最晚的轨迹，而不是轨迹发生时间最新/最晚
fix:修复运输时效预警明细起始轨迹和截止轨迹应取实际的状态中的最早轨迹，累计运输时间和状态都要动态参与计算
|
2025-03-31 10:01:58 +08:00 |
|
hardstylewyl
|
9440670511
|
Merge branch 'S07' into test
|
2025-03-28 17:53:38 +08:00 |
|
hardstylewyl
|
9d0b61ffe8
|
fix: 回传预警重试维护重试次数，避免并发冲突
fix: 完整预警缺失轨迹状态跟随订单实际的轨迹状态而变
|
2025-03-28 17:53:22 +08:00 |
|
hardstylewyl
|
88f9ea94f3
|
Merge branch 'S07' into test
|
2025-03-28 16:35:50 +08:00 |
|
hardstylewyl
|
7375295f7a
|
fix:运输时效预警累计运输时间补充时区信息
fix:运输时效预警已超时状态收到截止轨迹一定条件下可以变为已完成的状态，而不是超时完成
fix:接口通调用失败，直接变为完结，命中kpi考核的直接变为人工介入并进行通知，没命中的直接关闭
|
2025-03-28 16:25:57 +08:00 |
|
hardstylewyl
|
a8e7491432
|
Merge branch 'S07' into test
|
2025-03-28 09:32:58 +08:00 |
|
hardstylewyl
|
c63ead1bff
|
add-validation:增加运输时效规则场景的新增/修改校验
- 同一规则主体下，不允许出现因素完全相同的场景
fix:修复运输时效预警摘要中因素排序不正确
fix:修复新增修改轨迹没有更新订单主表的轨迹状态
|
2025-03-28 09:32:47 +08:00 |
|
hardstylewyl
|
7f567468f2
|
Merge branch 'S07' into test
|
2025-03-27 18:04:59 +08:00 |
|
hardstylewyl
|
9e48bbf9ac
|
change-validation:完整预警规则项目编辑（全量）验证
- 同一个主体下同一个检查点，订单类型不允许出现交集
|
2025-03-27 18:04:47 +08:00 |
|
hardstylewyl
|
a108fdbb94
|
Merge branch 'S07' into test
|
2025-03-27 16:41:25 +08:00 |
|
hardstylewyl
|
cb73040247
|
fix:修复预警通知消息模板内容异常
|
2025-03-27 16:40:54 +08:00 |
|
hardstylewyl
|
29ba189181
|
Merge branch 'S07' into test
|
2025-03-27 16:20:18 +08:00 |
|
hardstylewyl
|
8524fba5df
|
fix:修复运输时效预警规则配置删除异常
|
2025-03-27 16:20:02 +08:00 |
|
hardstylewyl
|
8c91dfbd5c
|
Merge branch 'S07' into test
|
2025-03-27 15:55:45 +08:00 |
|
hardstylewyl
|
ca35a86407
|
add-validation:补充运输预警规则项目编辑(全量)校验
- 不同项目间不能存在起始和截止都重复的
- 同一项目的起始和截止不允许重复
|
2025-03-27 15:55:35 +08:00 |
|
hardstylewyl
|
ef8212a89f
|
Merge branch 'S07' into test
|
2025-03-27 15:36:30 +08:00 |
|
hardstylewyl
|
c662d8e29a
|
fix:修复预警编辑（全量）新增通知对象保持修改不生效
|
2025-03-27 15:36:15 +08:00 |
|
hardstylewyl
|
a94503c56c
|
Merge branch 'S07' into test
|
2025-03-27 15:26:54 +08:00 |
|
hardstylewyl
|
8fff0bf03d
|
add-validation:完整预警规则编辑增加验证
- 多个预警规则项目中检查点轨迹状态不允许重复
|
2025-03-27 15:26:41 +08:00 |
|
hardstylewyl
|
25c76944fc
|
Merge branch 'S07' into test
|
2025-03-27 15:21:21 +08:00 |
|
hardstylewyl
|
78cfd9c083
|
fix:修复预警规则项目在调整配置项目新增时无法修改成功
option:预警通知IsNeedToHandle改为false
|
2025-03-27 15:21:09 +08:00 |
|
hardstylewyl
|
e9067685f2
|
Merge branch 'S07' into test
|
2025-03-27 11:58:04 +08:00 |
|
hardstylewyl
|
21e6d444a7
|
fix:修复预警通知查询改为全量查询，以保证正确的预警数量
|
2025-03-27 11:57:46 +08:00 |
|
hardstylewyl
|
3d1d0c969b
|
Merge branch 'S07' into test
|
2025-03-27 11:39:53 +08:00 |
|