Commit Graph

1265 Commits

Author SHA1 Message Date
wangyunlong
4bc45bc05c Merge pull request 'uat2025-2-12合并到主分支' (#79) from uat into master
Reviewed-on: https://git.shijizhongyun.com/Dotnet/SJZY.Track.Api/pulls/79
2025-02-12 15:05:08 +08:00
wangyunlong
2cd747cde5 Merge pull request 'S06' (#78) from S06 into uat
Reviewed-on: https://git.shijizhongyun.com/Dotnet/SJZY.Track.Api/pulls/78
2025-02-12 11:59:30 +08:00
hardstylewyl
d585f799bd fix: 修复查询轨迹内容时缺失是否对外字段,导致的新增/修改轨迹,中的轨迹明细缺省值错误
fix: 修复中台内部查询轨迹明细接口,中的是否对外标识错误
2025-02-10 15:36:57 +08:00
hardstylewyl
6e059604d6 fix: 修复查询轨迹轨迹内容,缺失子系统id和轨迹内容id 2025-02-08 14:44:49 +08:00
hardstylewyl
60ac19c692 fix: 修复轨迹新增/更新引发的广播中,轨迹发生时间错误的问题 2025-02-08 14:22:09 +08:00
hardstylewyl
45bc0cf6df i18n:补充推送映射国际化内容
refactor: 轨迹明细弃用IsVisibility字段,新增IsExternal字段替代
轨迹内容上的是否对外作用:创建轨迹时如果是否对外字段留null,则以轨迹内容上的【是否对外】值做为默认值填充。IsExternal作用:在查询轨迹时判断如果是外部子系统,则过滤掉是否对外为false的轨迹
2025-02-07 15:58:52 +08:00
hardstylewyl
204c8fc7b5 fix:订单仓储,修复缓存过期时间设置错误,导致过期时间非常长,从而带来较长时间的数据不一致
refactor:TrackUpsert,补充log解释说明轨迹更新失败原因
2025-02-05 10:58:53 +08:00
hardstylewyl
8deabef406 fix:修复因隐藏外部轨迹照成的空异常 2025-01-23 08:56:14 +08:00
hardstylewyl
5fef9ee24b feat:Query和QueryV2支持附件返回oss对象下载地址 2025-01-22 16:45:21 +08:00
hardstylewyl
6ea5a977df fix:补充被轨迹内容标识为外部的轨迹在外部系统被访问时应被过滤,byP02 2025-01-22 16:11:12 +08:00
wangyunlong
75dfc93101 Merge pull request 'S06' (#77) from S06 into uat
Reviewed-on: https://git.shijizhongyun.com/Dotnet/SJZY.Track.Api/pulls/77
2025-01-20 15:54:07 +08:00
wangyunlong
ff899f7aeb Merge branch 'uat' into S06 2025-01-20 15:49:42 +08:00
hardstylewyl
8ca174c93a fix: 补充删除的订单号提交 2025-01-17 15:34:07 +08:00
hardstylewyl
0b27240d90 fix:修复轨迹变更广播缺失操作订单号 2025-01-17 15:05:32 +08:00
hardstylewyl
928c3b15e8 fix:修复轨迹删除广播删除不全 2025-01-17 14:54:29 +08:00
hardstylewyl
355c7d02cd fix:新增/修改轨迹 修复校验中的bool逻辑错误 2025-01-16 17:00:56 +08:00
hardstylewyl
9f4872b432 fix: 填补新增/修改轨迹校验逻辑缺陷,
- 不允许重复添加的轨迹拦截

refactor: 重构新增/更新轨迹,提取公共的检查逻辑

update: Text.Json增加json字符串转JsonElement
rename: DeserializeDictionary  => DeserializeToDictionary
2025-01-16 16:25:31 +08:00
hardstylewyl
78571e57b9 fix:修复轨迹删除根据比较字段选取的比较异常 2025-01-16 11:58:46 +08:00
hardstylewyl
40c663634e perf:优化轨迹删除增加广播延时发送,并且修正为不阻塞主流程 2025-01-16 11:55:46 +08:00
hardstylewyl
e0be935489 update:新增/修改轨迹延时发送变更广播,目的为了等待es实际写盘 2025-01-16 11:51:26 +08:00
hardstylewyl
3ca803fe5b update:保留只推最新 2025-01-15 17:41:58 +08:00
hardstylewyl
82bbca3002 update:调整轨迹推送逻辑 2025-01-15 17:41:06 +08:00
08f0ebeeae optimize&fix:force push event case 2025-01-15 15:02:28 +08:00
hardstylewyl
0b6e20da3f 还原鹏军推送逻辑 2025-01-15 11:11:55 +08:00
4473936577 review 2025-01-15 10:35:30 +08:00
hardstylewyl
19548b3fc2 fix:修复JsonElement转换异常 2025-01-14 18:05:36 +08:00
hardstylewyl
e1e387e0d3 update: 轨迹推送处理,根据code+比较字段作为标识,确保传递的轨迹唯一 2025-01-14 17:35:03 +08:00
hardstylewyl
7d7bc45c67 pref:轨迹推送(手动)支持按比较字段过滤
pref:轨迹删除:
 - 广播增加轨迹轨迹明细填充
 - 增加比较字段来精确删除
2025-01-14 10:51:01 +08:00
hardstylewyl
100d901e0d add-model:补充入参模型更新 2025-01-13 16:33:41 +08:00
hardstylewyl
183ea314e3 update: 补充入参模型 2025-01-13 16:31:44 +08:00
hardstylewyl
60324b0e26 update:单个轨迹删除去除goto,附加比较字段逻辑 2025-01-13 16:20:49 +08:00
hardstylewyl
a517eae81f fix:轨迹推送事件处理:修复轨迹全量推送(最新轨迹)字段比较问题 2025-01-13 16:11:08 +08:00
hardstylewyl
8ca0adfbd3 update: 新增修改轨迹后记录订单操作日志改为批量操作,并且保证只有轨迹实际操作成功后才会写入 2025-01-10 16:39:23 +08:00
hardstylewyl
ccc08166b9 update-package:更新规约包版本为7.0.14
- 请求id设置为可空,调整描述
2025-01-10 15:54:09 +08:00
hardstylewyl
8287e6a437 feat:轨迹推送处理中,广播推送失败原因(配置存在与否/是否自动推送/订单类型是否一致/顺序/异常单/调用接口通失败) 2025-01-10 15:43:31 +08:00
hardstylewyl
94702e4c56 update-package:更新规约包至7.0.13
- (单个/批量)新增/更新轨迹接口增加比较字段CompareFields
2025-01-10 11:19:18 +08:00
hardstylewyl
5913929dcc update:轨迹新增/更新支持按扩展内容某个字段比较 2025-01-10 11:17:52 +08:00
2d6b239b8f review push event handler 2025-01-10 10:15:00 +08:00
cc84be2d84 review 2025-01-10 09:33:35 +08:00
hardstylewyl
b2c7a6aef1 fix:修复轨迹更新的比较逻辑错误 2025-01-10 09:18:23 +08:00
f5f9227aeb try 2025-01-09 18:08:10 +08:00
hardstylewyl
4fb127ed47 转鹏军 2025-01-09 17:41:39 +08:00
cb147ccbe1 Merge remote-tracking branch 'origin/S06' into S06 2025-01-09 16:42:35 +08:00
76aec6c78f important:重构 2025-01-09 16:42:25 +08:00
hardstylewyl
503e333c4f fix:调整轨迹推送配置时间格式枚举为可选项 2025-01-09 16:20:45 +08:00
24c5f0a2ed Merge remote-tracking branch 'origin/S06' into S06 2025-01-09 11:36:31 +08:00
313751fcb8 S06:feat【6. 增加推送映射配置项【只推送最新修改记录】】
https://www.tapd.cn/60863849/prong/stories/view/1160863849001041817
2025-01-09 11:36:23 +08:00
hardstylewyl
586690ed55 update-package: 更新契约包版本为7.0.12
- 查询轨迹增加esid反参
- 删除轨迹支持esid删除
- 修改单个订单的单个轨迹支持es修改
2025-01-09 10:27:34 +08:00
hardstylewyl
84792dc502 perf: 删除轨迹提供接口(单个订单),支持使用EsId来删除轨迹(当和标识符都不为空则优先以esId优先),并解除标识符号的必填限制
perf: 轨迹查询提供接口,增加es反参

perf: 支持轨迹更新的esId更新(要求确保是单个订单的单个轨迹)
2025-01-09 10:25:19 +08:00
hardstylewyl
47ebc8b09b update:补充轨迹推送调用接口通出错异常信息(增加服务商code) 2025-01-07 16:09:35 +08:00