Commit Graph

1366 Commits

Author SHA1 Message Date
6997d71696 com:提供订单完成接口 2024-04-02 19:02:15 +08:00
d58cd05086 Merge branch 'S03-轨迹中台' into dev 2024-04-02 09:42:00 +08:00
e73d083096 com:对接轨迹推送,新增字段:是否全量推送 2024-04-02 09:41:36 +08:00
29bf3ae1b7 Merge branch 'S03-轨迹中台' into dev 2024-04-02 09:24:12 +08:00
65ac8b2a50 com:对接轨迹模板-新增字段:对外显示原轨迹 2024-04-02 09:23:54 +08:00
f6f8612635 Merge branch 'S03-轨迹中台' into dev 2024-04-02 09:13:13 +08:00
4db7cdbdf8 com:对接轨迹拉取 2024-04-02 09:12:52 +08:00
81ebf36595 Merge branch 'S03-轨迹中台' into dev 2024-04-01 18:52:53 +08:00
11e64a07d3 fix:推送bug 2024-04-01 18:52:42 +08:00
9eae8d64c7 Merge branch 'S03-轨迹中台' into dev 2024-04-01 18:45:44 +08:00
e21a4b03c1 change:全量推送即使是手工推也要校验 2024-04-01 18:45:26 +08:00
7d4a1183ae Merge branch 'S03-轨迹中台' into dev 2024-04-01 18:17:01 +08:00
7331076e44 change:本地调试不做幂等 2024-04-01 18:16:50 +08:00
232d7d8254 fix:推送逻辑变更 2024-04-01 18:14:02 +08:00
055b754b6c Merge remote-tracking branch 'origin/dev' into dev 2024-04-01 17:51:49 +08:00
ed69761667 Merge branch 'S03-轨迹中台' into dev 2024-04-01 17:51:26 +08:00
b0f61447ca fix:推送服务生命周期问题 2024-04-01 17:51:12 +08:00
dingenwen
ba095bd498 修改配置 2024-04-01 16:48:26 +08:00
5c4b79fd0c Merge branch 'S03-轨迹中台' into dev
# Conflicts:
#	src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs
#	src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs
2024-04-01 16:09:11 +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
dingenwen
ca71e1ff27 Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into test 2024-03-30 15:24:57 +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
moyongzhen
3a179e7436 对外接口包 unifyResultDto 2024-03-29 14:14:19 +08:00
moyongzhen
f24168b62d Revert "debug"
This reverts commit a02e4ca8b2.
2024-03-29 11:40:00 +08:00
moyongzhen
a02e4ca8b2 debug 2024-03-29 11:17:35 +08:00
moyongzhen
94b3921d1a Merge branch 'dev' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into dev 2024-03-29 11:13:32 +08:00
moyongzhen
354c0a5b86 Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into dev 2024-03-29 11:02:00 +08:00
443b55f1dd Merge branch 'S02-轨迹中台第二部分' into S03-轨迹中台 2024-03-28 11:47:51 +08:00
dingenwen
e39814146a Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into test 2024-03-28 11:47:06 +08:00
f20ee5f0a2 change cap filter 2024-03-28 11:46:25 +08:00
dingenwen
bbf9755c24 Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into test 2024-03-28 11:28:02 +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
dingenwen
44ef1d1199 Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into test 2024-03-28 11:10:52 +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
642bbb2f18 Merge branch 'S02-轨迹中台第二部分' into test 2024-03-28 10:44:17 +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
dingenwen
2588e0e2e0 Merge remote-tracking branch 'origin/S02-轨迹中台第二部分' into test 2024-03-27 19:04:07 +08:00