Commit Graph

1123 Commits

Author SHA1 Message Date
dingenwen
f97e2cce69 Merge branch 'S02-轨迹中台第二部分' into test 2024-03-25 17:40:32 +08:00
eb003ba5cb Merge remote-tracking branch 'origin/test' into test 2024-03-25 17:39:56 +08:00
544be087dc Merge branch 'S02-轨迹中台第二部分' into test 2024-03-25 17:39:41 +08:00
c053a83a27 预警只处理未完成的单 2024-03-25 17:39:23 +08:00
dingenwen
3df39be7b2 Merge branch 'S02-轨迹中台第二部分' into test 2024-03-25 14:35:39 +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
786679a4b7 Merge remote-tracking branch 'origin/dev' into dev 2024-03-20 18:36:52 +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
liuwenxiang
3070193228 Merge pull request 'S02-轨迹中台第二部分' (#63) from S02-轨迹中台第二部分 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/63
2024-03-20 17:45:11 +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
095d5d6501 Merge branch 'S02-轨迹中台第二部分' into test 2024-03-19 15:27:14 +08:00
a13ee83d00 删除引发的更新delay3s 2024-03-19 15:26:51 +08:00
0d3581a6e1 Merge branch 'S02-轨迹中台第二部分' into test 2024-03-19 14:59:40 +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
7629fd8585 Merge remote-tracking branch 'origin/test' into test 2024-03-19 14:40:34 +08:00
915eb88f03 Merge branch 'S02-轨迹中台第二部分' into test 2024-03-19 14:40:11 +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
0345c4a294 Merge branch 'S02-轨迹中台第二部分' into test 2024-03-18 18:16:35 +08:00
moyongzhen
772af102c7 Merge branch 'S02-轨迹中台第二部分' into dev 2024-03-18 18:15:03 +08:00