Commit Graph

1002 Commits

Author SHA1 Message Date
06ee271dac change:拉取配置,接口通返回参数化 2024-09-10 17:16:46 +08:00
b14a52776b add:轨迹标记、状态添加是否广播字段 2024-09-10 16:59:58 +08:00
ba868dc168 change:轨迹内容有多个轨迹标记 2024-09-10 16:43:58 +08:00
8942fddc55 fix:命名问题 2024-09-10 14:37:36 +08:00
aade6ad8d1 对接:订单列表添加子系统 2024-09-10 11:57:12 +08:00
42e2d6bc96 add:定时清理 2024-09-10 09:57:26 +08:00
e78427521c 轨迹刷新算法更新 2024-09-10 09:43:33 +08:00
a52ddf7b8a 定时任务轨迹运输时效预警推送 2024-09-09 15:28:07 +08:00
b39d84655d temp 2024-09-07 18:14:17 +08:00
8bf76305fe add:为所有对外接口加上子系统参数 2024-09-07 10:41:53 +08:00
42bae65d38 【通知方式通知人单选变多选】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001028431
2024-09-06 17:32:53 +08:00
bb7a3c2312 【 3. 拉取映射新增编辑页面拉取轨迹状态支持添加多个】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027894
2024-09-06 17:12:18 +08:00
ae2aa614ce 【 1. 拉取映射新增编辑页面去除拉取轨迹代码和拉取轨迹内容】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027892
2024-09-06 15:32:42 +08:00
0b65128051 【优化订单的完结判断逻辑】
https://www.tapd.cn/60863849/prong/stories/view/1160863849001026850
2024-09-06 15:28:08 +08:00
bbc9b3c754 【 5. 轨迹订单拉取配置】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027889
2024-09-06 14:39:12 +08:00
f2a873a387 【 4. 提供一个对外的接口:根据子系统id查询轨迹状态。根据{子系统id},查询子系统id,返回{轨迹状态的集合}】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027888
2024-09-06 09:10:52 +08:00
8b60235d9f 【 3. 轨迹订单操作列增加一个按钮:日志,点击弹窗日志列表】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027887
2024-09-05 18:00:33 +08:00
b919300524 【 2. 新增订单接口增加一个数组结构:pullInfo,元素有:api服务商code,开始code,结束code,以及静默时间,停止刷新时间。】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027886
2024-09-05 17:34:09 +08:00
7206bc64cd change:订单增删改返回id 2024-09-05 14:28:20 +08:00
85b05dfa5d 【 2. 轨迹状态页面:新增编辑弹窗,列表增加是否完结的字段,非必填】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027890
2024-09-04 17:34:58 +08:00
1f8a0d2f93 【 1. 轨迹拉取内容页面:新增和编辑弹窗页面去除是否完结的字段】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027884
2024-09-04 17:27:43 +08:00
bd0287dfb0 【 7. 轨迹增删改,去除对轨迹模板的依赖】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027883
2024-09-04 11:22:53 +08:00
4d30d935ba 【8.订单轨迹明细页面的改动:拿掉是否可删的显示】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001028190
2024-09-03 17:48:54 +08:00
fae534a256 【4.对外轨迹查询轨迹的接口】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027880
2024-09-03 17:41:33 +08:00
9754923c63 【 2. 轨迹内容页面的改动:新增编辑弹窗,列表增加是否对外的字段,默认否,非必填】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027878
2024-09-03 17:19:44 +08:00
8b6553700e 【 1. 轨迹模板页面的改动:新增/编辑模板内容弹窗和模板内容列表,去掉是否对外(移到轨迹内容),是否可删(移到轨迹状态)字段。新增编辑模板去掉对外显示源轨迹。】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027876
2024-09-03 17:17:08 +08:00
926adfcd5d remove:去除通知模版 2024-09-03 14:43:33 +08:00
3471c1eade fmt&clear 2024-08-20 18:18:57 +08:00
4ddad722e1 fmt 2024-08-20 09:07:19 +08:00
1a21180ac7 change:全局格式化 2024-08-19 16:19:17 +08:00
ac56f3ecab add:添加.editorconfig 2024-08-19 15:02:55 +08:00
af04e28130 attach:v7.0.3 对外返回具名DTO 2024-08-13 10:19:42 +08:00
d3060adbd8 opt:remote service assign dto 2024-08-13 10:17:03 +08:00
8f032a28ed change:控制es safely limit-10000 2024-08-13 10:12:14 +08:00
b4ae584e4d attach 2024-08-13 09:40:18 +08:00
a57e58459f trait:支持单条轨迹删除 2024-08-13 09:39:38 +08:00
d3627b7a66 fix:mq config named 2024-08-12 15:20:23 +08:00
2a76994eda important:对接接口通获取轨迹 2024-08-12 15:16:47 +08:00
9965372fda handle todo 2024-08-09 11:35:08 +08:00
77b5352b05 review 2024-08-09 10:33:57 +08:00
钟喜旺
10f6096770 feat: 处理死循环 2024-08-07 11:57:42 +08:00
钟喜旺
c23542248e feat: select 限定查询字段 2024-08-07 10:47:05 +08:00
钟喜旺
f4313461a0 feat: 12小时推送预警轨迹锁添加非阻塞锁 2024-08-07 10:14:19 +08:00
a4f78e7bb6 Revert "temp"
This reverts commit b59418e6ff.
2024-08-07 09:51:14 +08:00
b59418e6ff temp 2024-08-07 09:42:42 +08:00
钟喜旺
f50d427325 feat: 修复更新推送预警单bug 2024-08-06 22:14:57 +08:00
8bcef37b74 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警
# Conflicts:
#	src/SJZY.Track.Application/CAP/EventHandlers/TrackRefreshEventHandler.cs
2024-08-06 16:56:22 +08:00
3127a3a38e change:轨迹code相同,时间、发生地不同的,允许存在多条 2024-08-06 16:53:47 +08:00
钟喜旺
1805cc5b76 feat: IsTriggerPull 多次刷轨迹被置为null 2024-08-06 11:35:52 +08:00
钟喜旺
a3e395a272 feat: 抽象出轨迹发生地和轨迹时区的逻辑 2024-08-06 11:09:33 +08:00
0b47412077 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-08-06 10:50:15 +08:00
e21f3b8460 temp 2024-08-06 10:50:00 +08:00
钟喜旺
87138c0b42 Merge branch 'dev' into S04轨迹预警
# Conflicts:
#	src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs
2024-08-05 16:23:51 +08:00
钟喜旺
b30846a811 feat: 定时任务推送预警(》12小时没有推送的 改为事件提交 2024-08-05 16:19:04 +08:00
62fc0a5168 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-08-05 16:09:01 +08:00
5a90c99f51 fix:轨迹刷新 2024-08-05 16:08:50 +08:00
钟喜旺
7cba774373 feat: 添加跨全局的Shared项目 2024-08-05 15:43:04 +08:00
a3c4199a30 Revert "【cheery pick】temp:remove notify table"
This reverts commit d7c84cfc4a.
2024-08-05 10:01:12 +08:00
钟喜旺
39e0171b98 Merge branch 'dev' into S04轨迹预警 2024-08-05 09:39:31 +08:00
钟喜旺
35bfbc43bd feat : 轨迹节点调整返回值 2024-08-05 09:36:15 +08:00
d7c84cfc4a 【cheery pick】temp:remove notify table 2024-08-05 09:30:40 +08:00
钟喜旺
8a2fb92900 feat: 限制只能输入英文和英文符号 2024-08-02 17:45:27 +08:00
钟喜旺
f9ac2af1ef feat: 后端枚举有none,前端没有兼容一下 2024-08-02 16:29:23 +08:00
钟喜旺
67569825ee feat:兜底轨迹时区添加映射和返回详情中 2024-08-02 16:24:01 +08:00
钟喜旺
d0eda88a2f Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-08-02 15:46:35 +08:00
钟喜旺
e727ab26ca feat: 处理缓存null的报错 2024-08-02 15:46:23 +08:00
ed5b46586f temp 2024-08-02 15:01:32 +08:00
cee0e1e888 fix: Column 'StartTrackStatusId' specified twice 2024-08-02 10:52:08 +08:00
f531551702 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-08-02 09:06:02 +08:00
19b4ef80b5 temp:临时预警方案 2024-08-02 09:05:52 +08:00
钟喜旺
1931ffda88 feat: 兜底轨迹详情接口没有返回调整 2024-08-01 17:18:50 +08:00
钟喜旺
76d441a96a Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-08-01 09:26:13 +08:00
钟喜旺
5cd6c4f6c6 定时任务推送预警(》12小时没有推送的) 2024-08-01 09:26:01 +08:00
ca68cde257 temp 2024-07-31 18:21:23 +08:00
钟喜旺
8f8d7b2a44 feat: 缓存调整 2024-07-31 18:07:10 +08:00
钟喜旺
010408985e feat: 解决接口Track/PushWarnForTask的锁长时间占领的问题 2024-07-31 16:34:29 +08:00
钟喜旺
6b43722fa6 feat: PullChangeBottomLineUpdateOrderEvent 事件迁移 2024-07-31 10:21:27 +08:00
钟喜旺
f1d15c34df feat: 新增拉取界面增加字段:触发拉取节点 二次自测完成 2024-07-30 16:47:47 +08:00
钟喜旺
228312ad6f Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警
# Conflicts:
#	src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs
2024-07-30 15:23:51 +08:00
钟喜旺
6df23b96e6 feat: 迁移order pull trigger 标签赋值位置 2024-07-30 15:22:25 +08:00
84e2764ebe temp 2024-07-30 15:13:55 +08:00
钟喜旺
67811638a9 feat: 处理冲突 2024-07-29 19:03:41 +08:00
钟喜旺
d00df6745b Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-29 18:59:12 +08:00
钟喜旺
2cea1a7912 feat: 轨迹预警规则缓存以及集群通知 2024-07-29 18:58:36 +08:00
94778ef228 add:预警计算 2024-07-29 18:10:48 +08:00
305847e3eb Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-29 15:03:46 +08:00
73422ba703 review 2024-07-29 15:03:37 +08:00
钟喜旺
6eab4f9172 Merge branch 'dev' into S04轨迹预警 2024-07-29 14:09:43 +08:00
钟喜旺
d0c2a92a82 feat: 区域添加了返回国家id 2024-07-29 14:09:15 +08:00
d41c5e444f Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-29 11:55:51 +08:00
6b211d8f7f temp 2024-07-29 11:55:36 +08:00
钟喜旺
769ba9e07b Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警
# Conflicts:
#	src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs

feat: 调整轨迹区域添加了国家名称字段
2024-07-29 10:31:57 +08:00
1513bb4964 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-27 17:44:32 +08:00
7454827e0f connect: 对接预警编辑 2024-07-27 17:44:23 +08:00
钟喜旺
64acaffb5b fix: add a validation 2024-07-27 11:18:44 +08:00
钟喜旺
e312792472 fix: 调整dto映射 2024-07-27 10:11:29 +08:00
钟喜旺
3df894d20b fix: 节点表添加子系统名称 2024-07-27 09:39:02 +08:00
钟喜旺
9494ca2cb7 feat: 轨迹映射-新增拉取界面增加字段:触发拉取节点 2024-07-26 21:04:19 +08:00
707a05f911 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-26 17:58:07 +08:00
dd8a8065cc temp 2024-07-26 17:57:58 +08:00
钟喜旺
2f172f43c0 feat: 轨迹映射-新增拉取界面增加字段:触发拉取节点 2024-07-26 17:56:03 +08:00
钟喜旺
91da2f111f Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警
# Conflicts:
#	src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs
2024-07-26 17:24:51 +08:00
钟喜旺
4a0df97333 feat: 轨迹节点页面 2024-07-26 17:23:00 +08:00
f00805437d connect:预警规则列表动态计算好给到前端 2024-07-26 17:12:46 +08:00
钟喜旺
d5135249f7 fix: 调整order 表 2024-07-26 16:20:07 +08:00
钟喜旺
7cac2c55ee Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-26 16:13:15 +08:00
钟喜旺
5b4c300baf fix: 调整表结构 2024-07-26 16:13:01 +08:00
c7ae4e9d05 connect:对接预警查询 2024-07-26 16:12:43 +08:00
06d51528b0 fix:表名attribute 2024-07-26 16:00:07 +08:00
86a0332886 fix:CalcRuleList 2024-07-26 15:54:54 +08:00
钟喜旺
45ce7a9949 feat: 订单表添加州省和邮编
alter table t_order add Postcode  varchar(64)  null comment '邮编';
alter table t_order add Province  varchar(64)  null comment '省份';
2024-07-26 15:34:39 +08:00
钟喜旺
02edff1580 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-26 15:12:54 +08:00
钟喜旺
bd8879885b fix: 调整area的表名 2024-07-26 15:12:43 +08:00
e4b8fb4fcf Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-26 12:59:11 +08:00
061cffc6c3 add:预警crud 2024-07-26 12:59:01 +08:00
钟喜旺
60ff61e030 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-26 10:27:21 +08:00
钟喜旺
24e95d7fad feat: 轨迹映射界面的拉取配置将“轨迹时区”改成“兜底轨迹时区”,“轨迹发生地”改成“兜底轨迹发生地” 2024-07-26 10:24:20 +08:00
9ba1ee660b Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-25 21:06:18 +08:00
c3f904ccdc importance:预警初步重构 2024-07-25 21:06:06 +08:00
钟喜旺
aae9add71c feat: 轨迹映射界面的推送配置增加推送时间格式 开发测试完成 2024-07-25 15:03:47 +08:00
钟喜旺
740bc61558 feat: 还原 2024-07-25 10:33:14 +08:00
钟喜旺
2f5354960d feat: 补充注释 2024-07-25 10:32:01 +08:00
钟喜旺
d67c7ce820 feat: 轨迹映射界面的推送配置增加推送时间格式 2024-07-25 09:26:07 +08:00
f42287a7f8 temp 2024-07-24 15:15:44 +08:00
fdcc81ba0e fix:【【轨迹订单pet】干线提单新增轨迹后,未推送到箱单和小包运输单上】https://www.tapd.cn/60863849/bugtrace/bugs/view/1160863849001043303 2024-07-24 14:22:53 +08:00
c772c68e47 review 2024-07-24 11:14:58 +08:00
DESKTOP-S2TSHMH\BSI
895e12762d feat: 预警功能相关代码 2024-07-24 08:54:56 +08:00
DESKTOP-S2TSHMH\BSI
83a375cdd3 feat: 修改开发数据库为DEV 2024-07-19 15:28:26 +08:00
8ce26fe28d 优化日志 2024-07-16 15:10:26 +08:00
8a369ff049 Merge branch 'refs/heads/S33-中台token优化' into S03-轨迹中台优化项
# Conflicts:
#	src/SJZY.Track.Domain/SJZY.Track.Domain.csproj
2024-06-25 17:58:51 +08:00
47ea3b8f82 token解析变更 2024-06-25 17:53:56 +08:00
e32e2c15c4 1.升级用户中心包
2.加入otlp
2024-06-25 17:43:17 +08:00
c63bf09c08 还原调试代码 2024-05-28 09:05:39 +08:00
b4bcb377ec fix:hash key不存在问题 2024-05-27 17:29:51 +08:00
5712f567df opt:提取配置重试冷却窗口 2024-05-27 17:00:39 +08:00
33c36bed10 opt:优化cap filter 2024-05-27 16:52:08 +08:00
b5f7f86664 opt:优化推送幂等,优化cap重试机制 2024-05-27 15:40:59 +08:00
505d8e7dc1 add:添加cap本地内存debug 2024-05-14 17:17:37 +08:00
4b0acb1978 opt:优化轨迹刷新定时任务等待超时问题 2024-05-14 17:17:14 +08:00
7482521e75 opt:升级cap到8.1.2 2024-05-11 10:13:00 +08:00
5b12642faf change:cap异步不打消息内容(去cap看) 2024-05-09 17:49:33 +08:00
56f8d95e48 opt:优化upsert逻辑 2024-05-09 15:45:59 +08:00
eff09f1cb0 upg:升级接口通7.2.1 2024-05-09 14:59:36 +08:00
761446c069 attach 2024-05-09 12:01:02 +08:00
5cda1270fb opt:优化更新轨迹 2024-05-09 11:46:15 +08:00
49eda2a3aa opt:优化轨迹新增 2024-05-09 11:46:13 +08:00
78c0aa1191 change:线程分组可配置 2024-05-09 10:53:52 +08:00
de7d1daf81 change:重试不做幂等 2024-05-09 10:51:38 +08:00
148434dda0 fix:删除不存在文档response.IsValid为false引起的异常 2024-04-25 20:23:12 +08:00
62ba69aed9 attach 2024-04-25 19:07:55 +08:00
d075c02d5e opt:优化推送对接接口通日志 2024-04-25 18:58:38 +08:00
399106ec0a retry:滚动上下文只能500,因此回退到普通循环 2024-04-25 18:27:59 +08:00
9d3ef9e4a3 change:轨迹删除降级为滚动删除 2024-04-25 18:21:02 +08:00
d8f594f193 try abort 2024-04-25 17:22:41 +08:00
c6e99193c3 fix:轨迹删除引发的主表维护不完整 2024-04-25 17:00:27 +08:00
4cb5f465da opt:接口通请求失败打印异常 2024-04-25 10:43:39 +08:00
96b3486956 fix:手动推送 子系统,客户 分组推 2024-04-25 10:23:09 +08:00
52b70cb213 fix:推送更新attach ascii 2024-04-25 09:45:02 +08:00
09881a3932 attach 2024-04-24 21:44:08 +08:00
9d5cad393e attach 2024-04-24 21:01:55 +08:00
ee35276ee6 change:语法降级 2024-04-24 18:00:02 +08:00
5ab91c3d8c temp 2024-04-24 17:49:31 +08:00
9bf4150990 try:es批量del禁止冲突检测 2024-04-24 11:13:05 +08:00
ae1b785273 try:update-by-query实现bulk del 2024-04-24 10:40:26 +08:00
141e6f1ee7 fix:批量删除轨迹代码重复问题 2024-04-24 09:37:32 +08:00
d5846f2b27 attach 2024-04-23 12:34:36 +08:00
04ef345481 opt:拆包 2024-04-23 12:00:53 +08:00
2e551b21d7 change:推送重试重入队列+失败日志 2024-04-22 22:14:35 +08:00
71ec9f09cc Merge remote-tracking branch 'origin/S03-轨迹中台优化项' into S03-轨迹中台优化项 2024-04-22 15:05:26 +08:00
2c5aa4f35a opt:定时任务刷新轨迹分页 2024-04-22 15:05:01 +08:00
moyongzhen
d95bcb70c0 fix:轨迹标记分页查询添加code模糊 2024-04-22 14:42:40 +08:00
aecb488045 change:轨迹刷新最短cd 60min 2024-04-22 14:14:45 +08:00
954654ede6 change:cap不打印超时日志 2024-04-22 09:06:45 +08:00
f78d463a68 opt:升级core 7.7.5 2024-04-17 14:51:13 +08:00
f817b71c05 fix:推送单号没传 2024-04-17 14:41:14 +08:00
7199398dd7 fix:更新的即是最新轨迹时,直接覆盖 2024-04-16 19:20:40 +08:00
af09e75811 opt 2024-04-16 18:49:15 +08:00
d73a7ad119 fix:修改轨迹引发的刷新主表逻辑bug 2024-04-16 18:38:18 +08:00
1f115bad3e change:es 获取list size改为1000 2024-04-16 18:34:39 +08:00
ba5bf24931 opt:轨迹upsert剪枝 2024-04-16 15:28:29 +08:00
2b678c2eb4 fix:轨迹聚合size 2024-04-16 14:59:10 +08:00
7769d6cf80 fix:轨迹刷新到服务商轨迹单条入库 2024-04-16 14:33:29 +08:00
64ab6757a9 opt 2024-04-16 11:47:21 +08:00
ad563dda97 opt:删不做幂等 2024-04-15 19:14:41 +08:00
932ca3d1c5 opt 2024-04-15 19:02:01 +08:00
0fb2690efd opt:压缩订单主表更新事件 2024-04-15 14:47:52 +08:00
a28a9ac5db change:轨迹代码为--的不参与计算 2024-04-15 14:09:12 +08:00
d95c5da96b fix:跨子系统映射赋值问题 2024-04-15 11:08:04 +08:00
f728ed4497 Merge remote-tracking branch 'origin/uat' into S03-轨迹中台优化项 2024-04-15 10:16:55 +08:00
be7a3dc674 format 2024-04-15 09:59:21 +08:00
c89e3f940c change:服务商空数据用--替代 2024-04-15 09:59:18 +08:00
639a2232a3 fix:order link query logic 2024-04-15 09:59:14 +08:00
1f8fe7c248 change:双订阅 2024-04-15 09:59:06 +08:00
2bedb127b6 opt:重构 2024-04-12 21:34:15 +08:00
0408ab8e13 version:7.0.2 2024-04-11 15:31:35 +08:00
moyongzhen
c2c1e24dcf 添加对外接口 2024-04-11 15:21:38 +08:00
moyongzhen
3aecf92eb7 轨迹推送配置关系对外接口 2024-04-11 15:14:01 +08:00
93417db522 1 2024-04-10 19:51:46 +08:00
8c81406e6e 测试cap参数 2024-04-10 19:51:07 +08:00
80e1db40b2 attach 2024-04-10 19:21:37 +08:00
6ef5ba86cf opt:开启cap多线程 2024-04-10 19:18:18 +08:00
dingenwen
dc44378f45 修改配置 2024-04-10 17:40:09 +08:00
8e9f5931e4 opt:轨迹推送后更新订单合并到推送处理逻辑 2024-04-10 15:27:52 +08:00
636f189e50 version:7.0.1 2024-04-10 15:22:17 +08:00
moyongzhen
f1a48cc9a6 查询轨迹 返回参数调整成UnifyResultDto 2024-04-10 15:04:30 +08:00
9ddba4f561 fix:手动 全量 推送 校验bug 2024-04-09 14:38:26 +08:00
d7cfd153b2 opt:优化null 缓存5s 2024-04-09 14:33:40 +08:00
4fbbbd0566 fix:【【轨迹订单-推送记录】轨迹发生时区需调整为格林尼治标准时间(GTM)】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001032649 2024-04-08 19:37:35 +08:00
c5212f53f0 升级接口通v7.1.9 2024-04-08 19:11:24 +08:00
5a6b2a0f5d change:只有轨迹增删改做幂等 2024-04-08 18:42:51 +08:00
f229371520 fix:轨迹推送具象实体 2024-04-08 14:20:37 +08:00
66d5a5c4d5 fix:【【轨迹订单】"是否自动推送"为否,新增轨迹明细后,异常自动推送轨迹明细】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001032644 2024-04-07 21:21:21 +08:00
d2de95a803 fix:【【轨迹订单】轨迹明细("服务商源轨迹内容"与"轨迹内容"不匹配)已配置映射】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001032624 2024-04-07 20:07:38 +08:00
0b8e9da918 change:轨迹查询对外逻辑调整 2024-04-03 17:51:00 +08:00
63e4c8b999 fix:【【修改轨迹内容】轨迹标记没有值时,显示了id】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001032585 2024-04-03 17:00:30 +08:00
4a759333ca change:推送异常处理逻辑 2024-04-03 09:13:47 +08:00
fefbe18497 com:删除轨迹内容多余字段 2024-04-03 09:03:59 +08:00
a261c21284 fix:sql bug 2024-04-02 20:11:57 +08:00
01e4ddf17c change:异常单不再推 2024-04-02 19:58:41 +08:00
4ebbe1b67c fix:推送swap 2024-04-02 19:41:29 +08:00
6997d71696 com:提供订单完成接口 2024-04-02 19:02:15 +08:00
e73d083096 com:对接轨迹推送,新增字段:是否全量推送 2024-04-02 09:41:36 +08:00
65ac8b2a50 com:对接轨迹模板-新增字段:对外显示原轨迹 2024-04-02 09:23:54 +08:00
4db7cdbdf8 com:对接轨迹拉取 2024-04-02 09:12:52 +08:00
11e64a07d3 fix:推送bug 2024-04-01 18:52:42 +08:00
e21a4b03c1 change:全量推送即使是手工推也要校验 2024-04-01 18:45:26 +08:00
7331076e44 change:本地调试不做幂等 2024-04-01 18:16:50 +08:00
232d7d8254 fix:推送逻辑变更 2024-04-01 18:14:02 +08:00
b0f61447ca fix:推送服务生命周期问题 2024-04-01 17:51:12 +08:00
e85e3244bf 全量推送 2024-04-01 16:07:35 +08:00
3ebbe620af feature:【轨迹推送支持顺序互换】
https://www.tapd.cn/60863849/prong/stories/view/1160863849001017011
2024-03-30 15:54:51 +08:00
a58b9e264a change:【轨迹的完成根据拉取配置判断】
https://www.tapd.cn/60863849/prong/stories/view/1160863849001017014
2024-03-30 15:50:25 +08:00
f7c091dee6 add:【轨迹模板新增编辑页面增加字段“对外显示源轨迹”】
https://www.tapd.cn/60863849/prong/stories/view/1160863849001017015
2024-03-30 15:50:23 +08:00
44673e2f5a Merge branch 'S02-轨迹中台第二部分' into S03-轨迹中台 2024-03-30 15:24:51 +08:00
322a3a67ed fix:预警OOM 2024-03-30 15:24:11 +08:00
3de76a713d important:重构 2024-03-30 11:52:49 +08:00
83f391dfcc Merge branch 'S02-轨迹中台第二部分' into S03-轨迹中台 2024-03-29 15:29:35 +08:00
8962d032b1 7.0.0 2024-03-29 15:26:39 +08:00
moyongzhen
5818d8ddd8 对外接口返参调整 2024-03-29 14:39:30 +08:00
moyongzhen
9d29759cc0 对外接口包 unifyResultDto 2024-03-29 14:29:17 +08:00
443b55f1dd Merge branch 'S02-轨迹中台第二部分' into S03-轨迹中台 2024-03-28 11:47:51 +08:00
f20ee5f0a2 change cap filter 2024-03-28 11:46:25 +08:00
24c47652d8 Merge branch 'S02-轨迹中台第二部分' into S03-轨迹中台
# Conflicts:
#	src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj
2024-03-28 11:26:42 +08:00
2c6d730c4b fix:拉取缓存不存在应该返回null 2024-03-28 11:25:00 +08:00
e9af631ee4 Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into S02-轨迹中台第二部分 2024-03-28 11:09:15 +08:00
c8b3b99633 fix:轨迹刷新没有拉取配置的case 2024-03-28 11:08:23 +08:00
dingenwen
febb7e3bea Merge branch 'S02-轨迹中台第二部分' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台第二部分 2024-03-28 10:35:52 +08:00
dingenwen
0b49336d7a 调整版本号 2024-03-28 10:35:43 +08:00
f9c61219e9 升级接口通7.1.8 2024-03-28 10:35:15 +08:00
2304a1f918 fix 轨迹刷新 attach base64问题 2024-03-27 18:58:03 +08:00
b98742f431 change remove topic prefix 2024-03-27 17:21:46 +08:00
676cdad78c fix 手动更新bug 2024-03-27 16:50:40 +08:00
140acc23d9 Merge branch 'S02-轨迹中台第二部分' into S03-轨迹中台 2024-03-27 14:53:39 +08:00
41755830f6 fix 轨迹明细操作人默认系统 2024-03-27 14:51:51 +08:00
10d6f28fc8 1 2024-03-27 14:49:19 +08:00
dcc7ec5918 opt:美化代码 2024-03-27 11:09:36 +08:00
b81733b011 change:轨迹刷新不做幂等 2024-03-27 11:03:07 +08:00
e9d304873e 补 2024-03-27 11:00:11 +08:00
5aa6596a7b attach 2024-03-27 10:51:07 +08:00
6021e7c5d9 防gank 2024-03-27 10:40:39 +08:00
cfb761a806 继续埋点 2024-03-27 09:53:15 +08:00
a663894bcc fix:【【轨迹订单】批量新增轨迹明细,创建人异常为空】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001031517 2024-03-27 09:19:45 +08:00
7b20e7a939 回退 2024-03-26 17:49:41 +08:00
b232d96634 opt:优化轨迹upsert流程 2024-03-26 17:31:50 +08:00
f85bc95e19 add:【轨迹推送明细查询接口-对外】https://www.tapd.cn/60863849/prong/tasks/view/1160863849001017119 2024-03-26 15:20:00 +08:00
0f49547776 opt: 推送记录冗余orderNo,orderType 2024-03-26 15:19:13 +08:00
1334637bf2 fix 手动推送bug 2024-03-26 14:52:18 +08:00
9d6937c059 opt: cap重复消费CD设为1h 2024-03-26 11:06:52 +08:00
4d9fb2bbfb opt:刷新最小CD设为60min 2024-03-26 11:06:11 +08:00
2520955613 opt:预警过滤掉创建时间不足12小时的 2024-03-26 10:44:05 +08:00
2fd73776af fix:【【新增轨迹订单明细】创建人异常为system】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001031387 2024-03-26 09:42:13 +08:00
e5e3b2ecce fix 轨迹刷新定时任务bug 2024-03-26 09:37:19 +08:00
c053a83a27 预警只处理未完成的单 2024-03-25 17:39:23 +08:00
9ab866df9e fix 修复nest 轨迹推送索引命名问题 2024-03-23 15:27:09 +08:00
89bd93ad9e attach 2024-03-23 15:14:34 +08:00
33f26e19f1 推送时记录订单id 2024-03-23 15:07:49 +08:00
3bc9b233d5 1 2024-03-23 14:12:02 +08:00
c76f8a9908 调整轨迹upsert逻辑 2024-03-22 09:27:42 +08:00
7f0f11d0a3 推拉定时任务 2024-03-21 14:50:04 +08:00
4b189b378d 批量upsert轨迹也区分isAdd 2024-03-21 11:34:06 +08:00
4166a36bf0 轨迹 不存在新增/存在更新 分类讨论 2024-03-21 10:52:53 +08:00
0a9bf47df3 轨迹索引多存一个zero track time 2024-03-21 10:32:00 +08:00
8dcc059680 cap消费幂等 2024-03-21 10:00:56 +08:00
367211f755 添加原轨迹信息 2024-03-21 09:25:11 +08:00
0cb30b3d4b fix upsert 2024-03-20 18:36:12 +08:00
柳文翔
39dc2f52f2 Merge branch 'S02-轨迹中台第二部分' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台第二部分 2024-03-20 17:27:00 +08:00
柳文翔
07572a5838 修改推送缓存返回值 2024-03-20 17:26:59 +08:00
038c495dfa fix 推送配置可能是空 2024-03-20 17:23:08 +08:00
c4917d66cc fix 循环依赖异常case 2024-03-19 15:51:15 +08:00
a13ee83d00 删除引发的更新delay3s 2024-03-19 15:26:51 +08:00
464ca232f2 Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into S02-轨迹中台第二部分 2024-03-19 14:59:10 +08:00
8f1da65c5a 测试 2024-03-19 14:58:53 +08:00
moyongzhen
02aa293e80 Merge branch 'S02-轨迹中台第二部分' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台第二部分 2024-03-19 14:52:17 +08:00
moyongzhen
55d7115b38 可能警告 2024-03-19 14:52:09 +08:00
9cca8dedc4 分组 2024-03-19 14:39:09 +08:00
d3a4f81c65 Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into S02-轨迹中台第二部分 2024-03-19 14:36:15 +08:00
b17f01b157 调整轨迹变更导致订单更新逻辑 2024-03-19 14:35:34 +08:00
moyongzhen
e71535f844 获取轨迹计数器、获取轨迹推送记录添加请求的方法名 2024-03-18 18:14:51 +08:00
6cc32ffbad 调整推送索引字段 2024-03-18 17:30:21 +08:00
moyongzhen
21c6422f23 补充 2024-03-18 17:20:00 +08:00
moyongzhen
757f60e5e8 提交代码 2024-03-18 17:08:28 +08:00
36706ae62c 临时提交 2024-03-18 16:15:01 +08:00
f189cb1a63 临时提交 2024-03-18 15:40:50 +08:00
80e6cc0c53 初步完成轨迹推送 2024-03-18 14:39:09 +08:00
f39cd3421c init 2024-03-18 09:44:42 +08:00
df509216b3 attach 2024-03-16 14:27:43 +08:00
51b529ae90 对接接口通7.1.6 2024-03-16 14:23:01 +08:00
8d186fa985 opt提示 2024-03-16 11:32:02 +08:00
7e0911fd51 fix【【轨迹订单】轨迹明细删除后,列表下发的数据仍显示轨迹明细信息】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001030812 2024-03-16 10:40:22 +08:00
d819dfe6d8 临时提交 2024-03-16 10:29:04 +08:00
柳文翔
c30542024c Merge branch 'S02-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台 2024-03-15 17:50:31 +08:00
柳文翔
18f065fbf1 修改 2024-03-15 17:50:29 +08:00
94852251a5 Merge remote-tracking branch 'origin/S02-轨迹中台' into S02-轨迹中台 2024-03-15 17:47:27 +08:00
25b7fc724a 测试 2024-03-15 17:47:10 +08:00
柳文翔
b484a53711 删除缓存时间 2024-03-15 17:12:24 +08:00
柳文翔
2845acce76 添加实现 2024-03-15 17:10:11 +08:00
柳文翔
b4295a97ae Merge branch 'S02-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台 2024-03-15 17:06:49 +08:00
柳文翔
b10f1cedfd 修改 2024-03-15 17:06:46 +08:00
ccdc43674c Merge remote-tracking branch 'origin/S02-轨迹中台' into S02-轨迹中台
# Conflicts:
#	src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs
2024-03-15 16:54:43 +08:00
f8d5705551 临时提交 2024-03-15 16:52:36 +08:00
柳文翔
3871b31af0 删除无用引用 2024-03-15 16:13:47 +08:00
柳文翔
06e43db12c 补充 2024-03-15 16:12:55 +08:00
柳文翔
eb1a3480f0 Merge branch 'S02-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台 2024-03-15 16:09:28 +08:00
柳文翔
1d80a8de4e 添加推送配置缓存 2024-03-15 16:09:27 +08:00
moyongzhen
68abebe60a Merge branch 'S02-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台 2024-03-15 15:33:34 +08:00
moyongzhen
35bb8e13e0 轨迹订单明细补充s01遗漏代码 2024-03-15 15:33:27 +08:00
91ad7eebb8 临时提交 2024-03-15 14:49:09 +08:00
12c439c832 Merge remote-tracking branch 'origin/S02-轨迹中台' into S02-轨迹中台 2024-03-15 09:53:44 +08:00
f50dccebe8 临时提交 2024-03-15 09:53:24 +08:00
柳文翔
786f1f0d25 添加拉取配置缓存 2024-03-14 14:07:09 +08:00
8f0f40cc56 定时任务 2024-03-14 11:49:24 +08:00
92bf6f549f 调试轨迹刷新 2024-03-14 10:10:04 +08:00
柳文翔
6a6e46482a 修改拉取缓存设置 2024-03-14 09:21:22 +08:00
dingenwen
1718ede2ee 修复异常 2024-03-13 19:33:04 +08:00
moyongzhen
c74b331511 调整 2024-03-13 17:44:54 +08:00
moyongzhen
9bd030465b 轨迹明细添加订单类型id和订单号 2024-03-13 17:41:57 +08:00
柳文翔
c0b5db3ab5 修改错误语句 2024-03-13 17:16:15 +08:00
6a911177f7 add 校验订单至少有一个模板 2024-03-13 15:41:59 +08:00
be086de68f Merge remote-tracking branch 'origin/S02-轨迹中台' into S02-轨迹中台 2024-03-13 10:40:19 +08:00
moyongzhen
953bca93f5 轨迹订单参数提交 2024-03-13 10:16:27 +08:00
f19ba6c01a add 删除引发轨迹更新 2024-03-13 10:08:41 +08:00
moyongzhen
6bea8224f0 订单参数调整 2024-03-13 09:34:42 +08:00
moyongzhen
10a68b817a 重新解决报错 2024-03-12 21:23:47 +08:00
moyongzhen
d23edffffc 轨迹订单添加问题类型字段和问题描述返参 2024-03-12 21:13:20 +08:00
2e86b7f7ba change【更新轨迹需要更新订单的最新轨迹信息】https://www.tapd.cn/60863849/prong/tasks/view/1160863849001016391 2024-03-12 17:28:15 +08:00
767cbcc319 Merge remote-tracking branch 'origin/S02-轨迹中台' into S02-轨迹中台 2024-03-12 16:00:01 +08:00
f4b7645ddf 支持批量新增、更新轨迹 2024-03-12 15:59:34 +08:00
柳文翔
ff32e003f4 拉取 推送 列表返回子系统id 2024-03-12 10:49:04 +08:00
柳文翔
b1441abf26 添加轨迹拉取内容入参校验 2024-03-12 10:19:02 +08:00
柳文翔
2ce73fd57b 修改错误 2024-03-12 10:11:17 +08:00
柳文翔
2d7e1fb609 补充提交 2024-03-12 09:54:06 +08:00
柳文翔
dd92ea9102 解决swagger字段注释问题 2024-03-12 09:51:22 +08:00
ba78ba46ae change 整合轨迹服务、订单服务 2024-03-11 10:19:06 +08:00
柳文翔
be45223b94 Merge branch 'S02-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台 2024-03-11 09:46:18 +08:00
柳文翔
edf9704ffe 修改参数表字段;添加拉去配置缓存 2024-03-11 09:46:17 +08:00
88aba1edb8 add【轨迹中心对外接口提供--新增轨迹/更新轨迹订单】https://www.tapd.cn/60863849/prong/tasks/view/1160863849001016386 2024-03-11 09:10:03 +08:00
9ae2a8335a 轨迹刷新初步完成 2024-03-09 18:08:42 +08:00
柳文翔
3baf9aea8b 获取服务商拉取配置添加子系统入参 2024-03-09 17:31:21 +08:00
e17eb425a4 临时提交 2024-03-09 16:15:04 +08:00
柳文翔
0e8af92756 修改字段 2024-03-09 15:16:32 +08:00
柳文翔
4d2850077b 修改轨迹拉取配置 2024-03-09 10:28:27 +08:00
柳文翔
dd1a653d26 参数表添加字段 2024-03-09 10:20:49 +08:00
76fcd29ca7 add 关联补轨迹,add 批量删除轨迹 2024-03-08 18:45:34 +08:00
柳文翔
2e0a1f3e4d 轨迹映射修改 2024-03-08 09:50:02 +08:00
moyongzhen
62c43ab146 轨迹明细是否删除和对外的调整 2024-03-06 19:48:43 +08:00
moyongzhen
7836a78be6 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-06 17:44:37 +08:00
moyongzhen
cd60b420ac 轨迹明细调整 2024-03-06 17:44:26 +08:00
7f43cbfe66 attach 2024-03-06 15:31:50 +08:00
769fb8b66a change 轨迹删除逻辑 2024-03-06 15:18:08 +08:00
8922d98ba4 fix 轨迹可删过滤 2024-03-06 14:51:41 +08:00
e2a34ede15 attach 2024-03-06 14:21:30 +08:00
a127285d18 add cap消费失败预警 2024-03-06 11:47:48 +08:00
3b5a915df8 add 订单循环依赖预警 2024-03-06 11:33:52 +08:00
a339608efb Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-06 11:24:38 +08:00
fd54550937 fix【S1-跨子系统的订单有关联关系,但是没有根据配置内容映射来向下新增轨迹】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029806 2024-03-06 11:24:08 +08:00
moyongzhen
54a7f48ce4 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-06 11:15:46 +08:00
moyongzhen
f14bed991f 调整轨迹明细字段赋值 2024-03-06 11:15:41 +08:00
0cf97ffd93 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-06 11:03:41 +08:00
7365a23f63 fix 轨迹查询时区不传默认为+8 2024-03-06 11:03:25 +08:00
moyongzhen
279bfcd1a4 提供接口去掉 轨迹订单和明细 2024-03-06 11:03:13 +08:00
moyongzhen
6d03e3b786 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-06 11:02:17 +08:00
moyongzhen
b337ea937b 轨迹明细查询一个变量写错了 2024-03-06 11:02:10 +08:00
447ea8ae8f fix【S1-更新轨迹成功后,时区没有按照传参来存储】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029832 2024-03-06 10:56:00 +08:00
de42e9e5cf fix 轨迹查询单号去空 2024-03-06 10:48:15 +08:00
c37cf3350f Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-06 10:38:20 +08:00
0b224b8379 fix 轨迹处理循环依赖问题、模板明细对外显示问题 2024-03-06 10:26:07 +08:00
moyongzhen
d9905878ae 轨迹订单分页查询调整 2024-03-06 10:02:05 +08:00
moyongzhen
369eb3708b 轨迹订单明细添加创建人和创建时间 2024-03-06 09:01:32 +08:00
moyongzhen
8f96886eda 轨迹明细订单列表添加子系统id 2024-03-05 21:16:07 +08:00
moyongzhen
78f6edbbeb 轨迹明细调整 2024-03-05 21:04:30 +08:00
moyongzhen
317d59861a 列表的最新轨迹需要调整 2024-03-05 20:46:00 +08:00
moyongzhen
25e3172275 1 2024-03-05 20:12:39 +08:00
moyongzhen
140ba7465a 轨迹明细调整 2024-03-05 20:11:49 +08:00
moyongzhen
e510d1ce9a Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-05 20:06:18 +08:00
moyongzhen
d76e7c29a1 轨迹明细调整 2024-03-05 20:06:09 +08:00
柳文翔
3be84b4a40 修改 2024-03-05 19:13:23 +08:00
柳文翔
5f60f1ee06 修改 2024-03-05 19:01:59 +08:00
2b299fb709 fix 订单关联sql 2024-03-05 17:42:34 +08:00
a4a04bf5a6 fix 订单关联查询sql 2024-03-05 17:25:07 +08:00
327db0fab1 fix【S1-订单关联接口,关联单号不填写,没有给出必填校验提示】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029771 2024-03-05 16:58:00 +08:00