Commit Graph

1227 Commits

Author SHA1 Message Date
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
moyongzhen
e71535f844 获取轨迹计数器、获取轨迹推送记录添加请求的方法名 2024-03-18 18:14:51 +08:00
moyongzhen
d336c90e62 解决冲突 2024-03-18 18:04:48 +08:00
ff641362c9 Merge branch 'S02-轨迹中台第二部分' into test 2024-03-18 17:39:33 +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
dingenwen
8056603a1d Merge pull request 'S02-轨迹中台' (#62) from S02-轨迹中台 into uat
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/62
2024-03-16 15:12:08 +08:00
980774fd9f Merge branch 'S02-轨迹中台' into test 2024-03-16 14:27:56 +08:00
df509216b3 attach 2024-03-16 14:27:43 +08:00
4677f69e2a Merge branch 'S02-轨迹中台' into test 2024-03-16 14:23:17 +08:00
51b529ae90 对接接口通7.1.6 2024-03-16 14:23:01 +08:00
26b3483c36 Merge branch 'S02-轨迹中台' into test 2024-03-16 11:33:14 +08:00
8d186fa985 opt提示 2024-03-16 11:32:02 +08:00
d1f5c7e682 Merge branch 'S02-轨迹中台' into test 2024-03-16 10:40:33 +08:00
7e0911fd51 fix【【轨迹订单】轨迹明细删除后,列表下发的数据仍显示轨迹明细信息】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001030812 2024-03-16 10:40:22 +08:00
95a63ca8ca Merge branch 'S02-轨迹中台' into test 2024-03-16 10:30:21 +08:00
d819dfe6d8 临时提交 2024-03-16 10:29:04 +08:00
888f601e4e Merge branch 'S02-轨迹中台' into test 2024-03-15 17:51:09 +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
e738cc711c Merge branch 'S02-轨迹中台' into test 2024-03-15 17:47:55 +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
7fedecd37c Merge branch 'S02-轨迹中台' into test
# Conflicts:
#	src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
2024-03-15 16:04:00 +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
a9b13a3c31 Merge remote-tracking branch 'origin/test' into test 2024-03-14 10:10:50 +08:00