Commit Graph

480 Commits

Author SHA1 Message Date
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
82c380b7a9 Merge branch 'S02-轨迹中台第二部分' into dev 2024-03-26 15:20:40 +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
e10abea99e Merge branch 'S02-轨迹中台第二部分' into dev 2024-03-23 15:27:32 +08:00
9ab866df9e fix 修复nest 轨迹推送索引命名问题 2024-03-23 15:27:09 +08:00
335c09d5cb Merge branch 'S02-轨迹中台第二部分' into dev 2024-03-23 15:14:49 +08:00
89bd93ad9e attach 2024-03-23 15:14:34 +08:00
fc86dae7c9 Merge branch 'S02-轨迹中台第二部分' into dev 2024-03-23 15:08:01 +08:00
33f26e19f1 推送时记录订单id 2024-03-23 15:07:49 +08:00
728ea70850 Merge branch 'S02-轨迹中台第二部分' into dev 2024-03-23 14:12:16 +08:00
3bc9b233d5 1 2024-03-23 14:12:02 +08:00
2bf987d5d8 Merge branch 'S02-轨迹中台第二部分' into dev 2024-03-22 09:27:59 +08:00
c76f8a9908 调整轨迹upsert逻辑 2024-03-22 09:27:42 +08:00
92d7cce744 Merge branch 'S02-轨迹中台第二部分' into dev 2024-03-21 17:52:29 +08:00
7f0f11d0a3 推拉定时任务 2024-03-21 14:50:04 +08:00
7c788d4ba8 Merge branch 'S02-轨迹中台第二部分' into dev 2024-03-21 11:34:22 +08:00
4b189b378d 批量upsert轨迹也区分isAdd 2024-03-21 11:34:06 +08:00
c795ab4f62 Merge branch 'S02-轨迹中台第二部分' into dev 2024-03-21 10:53:44 +08:00
4166a36bf0 轨迹 不存在新增/存在更新 分类讨论 2024-03-21 10:52:53 +08:00
0a9bf47df3 轨迹索引多存一个zero track time 2024-03-21 10:32:00 +08:00
fdaa3df04c Merge branch 'S02-轨迹中台第二部分' into dev 2024-03-21 10:01:14 +08:00
8dcc059680 cap消费幂等 2024-03-21 10:00:56 +08:00
367211f755 添加原轨迹信息 2024-03-21 09:25:11 +08:00
2fbbb251ab Merge branch 'S02-轨迹中台第二部分' into dev 2024-03-20 18:36:28 +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
f40f23fc43 Merge remote-tracking branch 'origin/dev' into dev 2024-03-20 15:57:13 +08:00
b7c4256e52 解决冲突 2024-03-20 15:56:56 +08:00
2bfbf3c3a5 Merge branch 'S02-轨迹中台第二部分' into dev
# Conflicts:
#	src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
#	src/SJZY.Track.Repository/Repositories/OrderRepository.cs
2024-03-20 15:49:30 +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
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
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
275571f003 Merge branch 'S02-轨迹中台' into dev 2024-03-13 17:45:49 +08:00
moyongzhen
c74b331511 调整 2024-03-13 17:44:54 +08:00
moyongzhen
82ffaaccdb Merge branch 'S02-轨迹中台' into dev 2024-03-13 17:42:40 +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
4e4dbbeb5f 解决冲突 2024-03-13 10:20:26 +08:00