Commit Graph

118 Commits

Author SHA1 Message Date
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
a663894bcc fix:【【轨迹订单】批量新增轨迹明细,创建人异常为空】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001031517 2024-03-27 09:19:45 +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
0f49547776 opt: 推送记录冗余orderNo,orderType 2024-03-26 15:19:13 +08:00
2fd73776af fix:【【新增轨迹订单明细】创建人异常为system】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001031387 2024-03-26 09:42:13 +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
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
fdaa3df04c Merge branch 'S02-轨迹中台第二部分' into dev 2024-03-21 10:01:14 +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
柳文翔
07572a5838 修改推送缓存返回值 2024-03-20 17:26:59 +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
b17f01b157 调整轨迹变更导致订单更新逻辑 2024-03-19 14:35:34 +08:00
6cc32ffbad 调整推送索引字段 2024-03-18 17:30:21 +08:00
moyongzhen
757f60e5e8 提交代码 2024-03-18 17:08:28 +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
51b529ae90 对接接口通7.1.6 2024-03-16 14:23:01 +08:00
d819dfe6d8 临时提交 2024-03-16 10:29:04 +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
柳文翔
1d80a8de4e 添加推送配置缓存 2024-03-15 16:09:27 +08:00
91ad7eebb8 临时提交 2024-03-15 14:49:09 +08:00
f50dccebe8 临时提交 2024-03-15 09:53:24 +08:00
8f0f40cc56 定时任务 2024-03-14 11:49:24 +08:00
92bf6f549f 调试轨迹刷新 2024-03-14 10:10:04 +08:00
moyongzhen
9bd030465b 轨迹明细添加订单类型id和订单号 2024-03-13 17:41:57 +08:00
6a911177f7 add 校验订单至少有一个模板 2024-03-13 15:41:59 +08:00
moyongzhen
953bca93f5 轨迹订单参数提交 2024-03-13 10:16:27 +08:00
moyongzhen
6bea8224f0 订单参数调整 2024-03-13 09:34:42 +08:00
moyongzhen
d23edffffc 轨迹订单添加问题类型字段和问题描述返参 2024-03-12 21:13:20 +08:00
2e86b7f7ba change【更新轨迹需要更新订单的最新轨迹信息】https://www.tapd.cn/60863849/prong/tasks/view/1160863849001016391 2024-03-12 17:28:15 +08:00
8fb4bd7fbf Merge remote-tracking branch 'origin/dev' into dev 2024-03-12 16:01:30 +08:00
767cbcc319 Merge remote-tracking branch 'origin/S02-轨迹中台' into S02-轨迹中台 2024-03-12 16:00:01 +08:00
f4b7645ddf 支持批量新增、更新轨迹 2024-03-12 15:59:34 +08:00
liuwenxiang
95a4d0494d Merge pull request '解决swagger字段注释问题' (#57) from S02-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/57
2024-03-12 09:51:53 +08:00
柳文翔
dd92ea9102 解决swagger字段注释问题 2024-03-12 09:51:22 +08:00
moyongzhen
7506981544 Merge branch 'S01-轨迹中台' into dev 2024-03-12 09:45:18 +08:00
moyongzhen
7949fd1dfa 订单查询条件增加 订单类型,客户 的过滤条件 2024-03-12 09:43:19 +08:00
ba78ba46ae change 整合轨迹服务、订单服务 2024-03-11 10:19:06 +08:00