Commit Graph

1247 Commits

Author SHA1 Message Date
hardstylewyl
9bfda1f8d4 Merge branch 'S06' into test 2025-01-06 09:46:51 +08:00
hardstylewyl
3b37d73df8 fix:修复当没有需要展示的三方单号需要显示”--”,三方单号为null时被过滤 2025-01-06 09:45:44 +08:00
hardstylewyl
e918839b85 Merge branch 'S06' into test 2025-01-03 17:50:05 +08:00
hardstylewyl
bb96f96695 feat:查询轨迹响应结果相同时间按模板排序(按时间+时区转换为统一时间后排序) 2025-01-03 17:42:18 +08:00
hardstylewyl
5a43e54139 refactor:使用缓存优化轨迹订单查询 2025-01-03 16:38:56 +08:00
xumengen_eli
848cb2c61e 更新 src/SJZY.Track.Api/appsettings.json 2025-01-03 14:25:48 +08:00
hardstylewyl
802a2da8ad Merge branch 'S06' into test 2025-01-02 10:19:45 +08:00
hardstylewyl
db200c2212 refactor:重构轨迹推送事件处理,由于逻辑稳定去除goto 2025-01-02 10:10:47 +08:00
hardstylewyl
923d7a2e91 refactor:优化轨迹更新后更新订单主表事件处理器逻辑 2025-01-02 09:19:27 +08:00
hardstylewyl
d7925b09ea Merge branch 'S06' into test 2024-12-31 14:04:51 +08:00
hardstylewyl
cc91079011 update-package:更新规约包版本7.0.10 -> 7.0.11 2024-12-31 14:04:19 +08:00
hardstylewyl
a7e303a77a add-interface:增加轨迹查询提供接口(返回原始轨迹)QueryV2Async
update:更新轨迹删除广播方式,减少不必要的查库

update:添加轨迹查询的创建时间的二级排序(原只按轨迹发生时间)
2024-12-31 11:58:47 +08:00
hardstylewyl
7283a6f309 Merge branch 'S06' into test 2024-12-30 16:21:08 +08:00
hardstylewyl
c92351a601 fix: 修复轨迹code+轨迹发生时间允许重复的bug 2024-12-30 15:45:44 +08:00
hardstylewyl
1868981996 Merge branch 'S06' into test 2024-12-30 10:44:01 +08:00
hardstylewyl
6e0ff29614 update:广播服务抽象出接口 2024-12-30 09:41:56 +08:00
hardstylewyl
7b99532f1f Merge branch 'S06' into test 2024-12-27 18:06:32 +08:00
hardstylewyl
c4ceca39c4 update: 外部手动推送,先查轨迹后进行推送 2024-12-27 18:05:41 +08:00
hardstylewyl
fb13a566c4 Merge branch 'S06' into test 2024-12-27 16:12:34 +08:00
hardstylewyl
398f3b330f update: 获取轨迹模板增加排序键反参 2024-12-27 16:12:07 +08:00
hardstylewyl
31d5cf9006 Merge branch 'S06' into test 2024-12-27 16:01:13 +08:00
hardstylewyl
c27e55b69f update: 获取轨迹模板内容,增加按排序键排序逻辑 2024-12-27 15:52:36 +08:00
hardstylewyl
e3ef469250 Merge branch 'S06' into test 2024-12-27 15:06:42 +08:00
hardstylewyl
750e96d7cf fix: 修复查询轨迹时,轨迹内容不完整 2024-12-27 15:04:59 +08:00
987d533341 review 2024-12-27 11:43:40 +08:00
b750579887 Merge remote-tracking branch 'origin/S06' into S06
# Conflicts:
#	src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
2024-12-27 11:42:48 +08:00
7148bfdc6b review 2024-12-27 11:41:59 +08:00
hardstylewyl
8d469d0a17 Merge branch 'S06' into test 2024-12-27 11:19:22 +08:00
hardstylewyl
5edaa2f80c update: 新增/修改轨迹增加IsToMq参数,标记为true则轨迹操作后一定会推送
update: MQ广播异步改同步
update: 更新契约包版本7.0.10
2024-12-27 11:18:20 +08:00
a9eaa5e41f review 2024-12-27 10:36:57 +08:00
hardstylewyl
f3fcc271f9 Merge branch 'S06' into test 2024-12-27 10:00:47 +08:00
hardstylewyl
891e01ceca update: 新增/修改轨迹(单个)修改获取信息方式,优先选择用户token解析,备选传入的OptionUserId解析
update: 轨迹推送完成广播增加,轨迹明细扩展参数Extra
2024-12-27 09:59:42 +08:00
hardstylewyl
801b58bdee update: 使用UnifyResultDto包装,更新契约包至7.0.9 2024-12-26 11:27:13 +08:00
hardstylewyl
c763e2a1d5 Merge branch 'S06' into test
# Conflicts:
#	src/SJZY.Track.Api/appsettings.json
2024-12-26 10:52:05 +08:00
hardstylewyl
988ab384f9 update: 标记[CustomerResult]使得三方可以正常调用 2024-12-26 10:50:32 +08:00
hardstylewyl
22a2019cc1 update: 删除不必要的修饰信息,去掉多余todo 2024-12-26 10:43:48 +08:00
hardstylewyl
4c5db5cc36 config-change:更新apollo配置 2024-12-24 15:31:54 +08:00
hardstylewyl
64b19d88d6 del:删除TrackPushEto 2024-12-24 15:09:50 +08:00
hardstylewyl
b6a2cc8615 update: 优化轨迹相关广播,抽离广播为BroadcastingService,涉及轨迹变更,轨迹推送完成。
update-eto:
 - rename: TrackPushEto -> TrackPushCompletedEvent
2024-12-24 15:09:12 +08:00
74c66fff3f review 2024-12-24 11:52:58 +08:00
hardstylewyl
42ba5c6a75 Merge branch 'S06' into test 2024-12-23 14:34:11 +08:00
hardstylewyl
7d8e8c584a update: 更新契约模型,调整版本7.0.7 => 7.0.8 2024-12-23 14:33:27 +08:00
hardstylewyl
017cd7ffd4 update: 轨迹推送扩展参数修改为全量的轨迹明细扩展内容。 2024-12-23 14:29:54 +08:00
hardstylewyl
1abe484a14 Merge branch 'S06' into test 2024-12-20 17:06:27 +08:00
hardstylewyl
97bee1e3d9 update: 推送行为下拉列表只显示推送映射配置中的轨迹
update: 新增/更新轨迹,增加强制推送标识,此标识会影响推送行为使其变为,
1.明确调用推送轨迹接口 2.不受推送映射的顺序限制
2024-12-20 17:05:57 +08:00
hardstylewyl
ebb81a4cc0 Merge branch 'S06' into test 2024-12-20 15:22:09 +08:00
hardstylewyl
cc32f5b2fd update: 推送行为限制推送配置的订单类型和要推送的轨迹所属订单的订单类型必须一致
update: 进行删除/推送操作时,订单无轨迹时轨迹代码下拉应该显示为空,
 - 删除过滤外部服务商轨迹
 - 推送过滤订单类型不一致轨迹

 opt: 配置MQ,舰艇和轨迹推送完成回传
2024-12-20 15:21:36 +08:00
hardstylewyl
503d4f470e Merge branch 'S06' into test 2024-12-19 18:06:51 +08:00
hardstylewyl
cfa241a36f update: 优化轨迹推送逻辑,有效减少不必要的请求 2024-12-19 18:06:06 +08:00
hardstylewyl
a955f93e7f Merge branch 'S06' into test 2024-12-19 15:22:28 +08:00