Commit Graph

337 Commits

Author SHA1 Message Date
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
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
772af102c7 Merge branch 'S02-轨迹中台第二部分' into dev 2024-03-18 18:15:03 +08:00
moyongzhen
e71535f844 获取轨迹计数器、获取轨迹推送记录添加请求的方法名 2024-03-18 18:14:51 +08:00
moyongzhen
d336c90e62 解决冲突 2024-03-18 18:04:48 +08:00
6cc32ffbad 调整推送索引字段 2024-03-18 17:30:21 +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
82ffaaccdb Merge branch 'S02-轨迹中台' into dev 2024-03-13 17:42:40 +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
f19ba6c01a add 删除引发轨迹更新 2024-03-13 10:08:41 +08:00
moyongzhen
490f2cde03 Merge branch 'S02-轨迹中台' into dev 2024-03-12 21:24:00 +08:00
moyongzhen
10a68b817a 重新解决报错 2024-03-12 21:23:47 +08:00
moyongzhen
bfd9f3afd3 解决冲突 2024-03-12 21:16:57 +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
8fb4bd7fbf Merge remote-tracking branch 'origin/dev' into dev 2024-03-12 16:01:30 +08:00
d1b7e89173 Merge branch 'S02-轨迹中台' into dev 2024-03-12 16:00:18 +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
liuwenxiang
215a035d90 Merge pull request '添加轨迹拉取内容入参校验' (#60) from S02-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/60
2024-03-12 10:19:18 +08:00
柳文翔
b1441abf26 添加轨迹拉取内容入参校验 2024-03-12 10:19:02 +08:00
liuwenxiang
9fbd2d645c Merge pull request '修改错误' (#59) from S02-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/59
2024-03-12 10:11:31 +08:00
柳文翔
2ce73fd57b 修改错误 2024-03-12 10:11:17 +08:00
moyongzhen
7506981544 Merge branch 'S01-轨迹中台' into dev 2024-03-12 09:45:18 +08:00
moyongzhen
7949fd1dfa 订单查询条件增加 订单类型,客户 的过滤条件 2024-03-12 09:43:19 +08:00
d88313ae53 Merge remote-tracking branch 'origin/dev' into dev 2024-03-11 15:48:16 +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
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
76fcd29ca7 add 关联补轨迹,add 批量删除轨迹 2024-03-08 18:45:34 +08:00
liuwenxiang
1c720a8ead Merge pull request 'S02-轨迹中台' (#56) from S02-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/56
2024-03-08 09:52:47 +08:00
柳文翔
2e0a1f3e4d 轨迹映射修改 2024-03-08 09:50:02 +08:00
moyongzhen
350ba56a45 调整 2024-03-06 20:11:54 +08:00
moyongzhen
ff14cb5d32 参数调整 2024-03-06 20:05:05 +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
769fb8b66a change 轨迹删除逻辑 2024-03-06 15:18:08 +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
0cf97ffd93 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-06 11:03:41 +08:00