柳文翔
|
2e0a1f3e4d
|
轨迹映射修改
|
2024-03-08 09:50:02 +08:00 |
|
moyongzhen
|
62c43ab146
|
轨迹明细是否删除和对外的调整
|
2024-03-06 19:48:43 +08:00 |
|
moyongzhen
|
7836a78be6
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-06 17:44:37 +08:00 |
|
moyongzhen
|
cd60b420ac
|
轨迹明细调整
|
2024-03-06 17:44:26 +08:00 |
|
|
|
769fb8b66a
|
change 轨迹删除逻辑
|
2024-03-06 15:18:08 +08:00 |
|
|
|
e2a34ede15
|
attach
|
2024-03-06 14:21:30 +08:00 |
|
|
|
a127285d18
|
add cap消费失败预警
|
2024-03-06 11:47:48 +08:00 |
|
|
|
3b5a915df8
|
add 订单循环依赖预警
|
2024-03-06 11:33:52 +08:00 |
|
|
|
0cf97ffd93
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-06 11:03:41 +08:00 |
|
|
|
7365a23f63
|
fix 轨迹查询时区不传默认为+8
|
2024-03-06 11:03:25 +08:00 |
|
moyongzhen
|
279bfcd1a4
|
提供接口去掉 轨迹订单和明细
|
2024-03-06 11:03:13 +08:00 |
|
moyongzhen
|
6d03e3b786
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-06 11:02:17 +08:00 |
|
moyongzhen
|
b337ea937b
|
轨迹明细查询一个变量写错了
|
2024-03-06 11:02:10 +08:00 |
|
|
|
447ea8ae8f
|
fix【S1-更新轨迹成功后,时区没有按照传参来存储】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029832
|
2024-03-06 10:56:00 +08:00 |
|
|
|
de42e9e5cf
|
fix 轨迹查询单号去空
|
2024-03-06 10:48:15 +08:00 |
|
|
|
c37cf3350f
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-06 10:38:20 +08:00 |
|
|
|
0b224b8379
|
fix 轨迹处理循环依赖问题、模板明细对外显示问题
|
2024-03-06 10:26:07 +08:00 |
|
moyongzhen
|
25e3172275
|
1
|
2024-03-05 20:12:39 +08:00 |
|
moyongzhen
|
140ba7465a
|
轨迹明细调整
|
2024-03-05 20:11:49 +08:00 |
|
moyongzhen
|
e510d1ce9a
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-05 20:06:18 +08:00 |
|
moyongzhen
|
d76e7c29a1
|
轨迹明细调整
|
2024-03-05 20:06:09 +08:00 |
|
柳文翔
|
3be84b4a40
|
修改
|
2024-03-05 19:13:23 +08:00 |
|
柳文翔
|
5f60f1ee06
|
修改
|
2024-03-05 19:01:59 +08:00 |
|
|
|
327db0fab1
|
fix【S1-订单关联接口,关联单号不填写,没有给出必填校验提示】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029771
|
2024-03-05 16:58:00 +08:00 |
|
|
|
5c0216a013
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-05 16:56:42 +08:00 |
|
|
|
272e740dac
|
change 创建订单,子系统id从header取
|
2024-03-05 16:56:18 +08:00 |
|
moyongzhen
|
4f42663ad5
|
合并解决冲突
|
2024-03-05 16:55:28 +08:00 |
|
moyongzhen
|
4622906c29
|
调整轨迹订单明细
|
2024-03-05 16:53:51 +08:00 |
|
|
|
9f2667ac6e
|
fix【S1-根据订单号获取轨迹接口-时区不填写,没有默认 +8,按模板顺序查询没有结果】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029746
|
2024-03-05 16:21:35 +08:00 |
|
moyongzhen
|
8eca00c66b
|
轨迹明细es查询
|
2024-03-05 16:08:52 +08:00 |
|
|
|
362ea52f2e
|
change 修改索引策略
|
2024-03-05 15:07:08 +08:00 |
|
|
|
3c14a38578
|
change 更新轨迹时区
|
2024-03-05 14:46:26 +08:00 |
|
|
|
f62cb2cf56
|
attach
|
2024-03-05 11:36:56 +08:00 |
|
|
|
6d1ee3a313
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-05 11:34:47 +08:00 |
|
|
|
415360ef8d
|
change 航班、模板 可传null
|
2024-03-05 11:34:29 +08:00 |
|
柳文翔
|
d21c832439
|
修改
|
2024-03-05 11:18:49 +08:00 |
|
柳文翔
|
9d8cdadc9c
|
修改问题和提示语
|
2024-03-05 10:50:07 +08:00 |
|
|
|
e7b80fb1fd
|
change 添加提供接口路由前缀
|
2024-03-04 18:51:56 +08:00 |
|
|
|
e055bedaf1
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-04 18:48:59 +08:00 |
|
|
|
22dd02507f
|
test 轨迹查询、新增、修改、软删除
|
2024-03-04 18:48:43 +08:00 |
|
dingenwen
|
999c7d77ba
|
配置多语言
|
2024-03-04 18:23:47 +08:00 |
|
moyongzhen
|
9ba8266480
|
轨迹模版分页查询添加参数子系统id
|
2024-03-04 18:05:41 +08:00 |
|
moyongzhen
|
c2e3a4d26e
|
Merge branch 'test' into S01-轨迹中台
|
2024-03-04 16:43:36 +08:00 |
|
moyongzhen
|
cc325aa496
|
轨迹内容调整
|
2024-03-04 16:42:52 +08:00 |
|
|
|
b6e0abc03f
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-04 15:32:01 +08:00 |
|
|
|
4f72a4405c
|
add 删除轨迹
|
2024-03-04 15:30:57 +08:00 |
|
柳文翔
|
02af7bc45e
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-04 15:25:22 +08:00 |
|
柳文翔
|
c9772299a5
|
修改提示语
|
2024-03-04 15:25:20 +08:00 |
|
moyongzhen
|
dc723def0b
|
Merge branch 'dev' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into dev
|
2024-03-04 15:10:03 +08:00 |
|
moyongzhen
|
d3dea7dd9e
|
提示语优化
|
2024-03-04 15:09:53 +08:00 |
|
柳文翔
|
5d5c7843b7
|
修复错误
|
2024-03-04 15:05:03 +08:00 |
|
柳文翔
|
8e5ffc0652
|
还原代码
|
2024-03-04 14:51:22 +08:00 |
|
|
|
3c6008a2b5
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-04 12:00:25 +08:00 |
|
|
|
4b46eb92bd
|
推拉做不了,临时提交
|
2024-03-04 12:00:09 +08:00 |
|
柳文翔
|
3298d3cb88
|
修改缓存
|
2024-03-04 11:43:29 +08:00 |
|
moyongzhen
|
1b79aba439
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-04 10:31:58 +08:00 |
|
moyongzhen
|
8e91589186
|
轨迹标记添加是否完结字段
|
2024-03-04 10:31:49 +08:00 |
|
柳文翔
|
28462ffc83
|
修改
|
2024-03-04 10:20:02 +08:00 |
|
moyongzhen
|
2905b47d1a
|
轨迹标记删除提示语
|
2024-03-04 09:26:59 +08:00 |
|
柳文翔
|
131bf85708
|
分页
|
2024-03-02 16:58:58 +08:00 |
|
柳文翔
|
4cd66079d0
|
完成 轨迹模板内容下拉框 接口
|
2024-03-02 16:21:04 +08:00 |
|
柳文翔
|
f0bf725e79
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-02 15:54:16 +08:00 |
|
柳文翔
|
570ffbbdf1
|
1
|
2024-03-02 15:54:15 +08:00 |
|
moyongzhen
|
8fc907d025
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-02 15:52:22 +08:00 |
|
moyongzhen
|
6da3e0748c
|
轨迹内容删除校验
|
2024-03-02 15:52:12 +08:00 |
|
|
|
8b4219a8ad
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
# Conflicts:
# src/SJZY.Track.Domain/GlobalConst.cs
|
2024-03-02 15:35:54 +08:00 |
|
|
|
5fa20966ab
|
轨迹发生
|
2024-03-02 15:34:26 +08:00 |
|
柳文翔
|
04733815d5
|
修改
|
2024-03-02 15:29:08 +08:00 |
|
moyongzhen
|
f48cd3d146
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-02 14:47:36 +08:00 |
|
moyongzhen
|
af49cb7bda
|
删除轨迹内容提示语
|
2024-03-02 14:47:28 +08:00 |
|
柳文翔
|
a2e5580070
|
修改提示语
|
2024-03-02 14:46:16 +08:00 |
|
柳文翔
|
904b44e262
|
入参校验
|
2024-03-02 14:41:15 +08:00 |
|
柳文翔
|
bed691aa71
|
修改
|
2024-03-02 13:52:51 +08:00 |
|
柳文翔
|
91a99ad66e
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-02 12:42:49 +08:00 |
|
柳文翔
|
b21b6402e9
|
修改
|
2024-03-02 12:42:48 +08:00 |
|
moyongzhen
|
cbdba985c2
|
验证 轨迹订单 页面 列表数据 显示是否正确-列表数据按创建时间倒序显示
|
2024-03-02 12:07:11 +08:00 |
|
moyongzhen
|
c977cd1c35
|
轨迹内容分页接口添加轨迹状态查询
|
2024-03-02 11:34:26 +08:00 |
|
柳文翔
|
cd0d2a64bf
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-02 11:11:22 +08:00 |
|
柳文翔
|
92ca158be8
|
修改isany
|
2024-03-02 11:11:20 +08:00 |
|
moyongzhen
|
0352b77dcf
|
订单列表添加字段
|
2024-03-02 11:03:33 +08:00 |
|
柳文翔
|
6c10a6e21c
|
完成 轨迹模板内容排序 接口
|
2024-03-02 10:07:59 +08:00 |
|
柳文翔
|
df4772b5c5
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-02 10:00:11 +08:00 |
|
柳文翔
|
92f61e1a1b
|
完成 轨迹推送配置内容排序 接口
|
2024-03-02 10:00:08 +08:00 |
|
moyongzhen
|
e1958fe96e
|
调整提示语
|
2024-03-02 09:59:04 +08:00 |
|
moyongzhen
|
e9128e1985
|
轨迹状态提示语
|
2024-03-02 09:54:40 +08:00 |
|
moyongzhen
|
2dc9c7f31b
|
轨迹状态校验
|
2024-03-02 09:50:31 +08:00 |
|
moyongzhen
|
6ab8472a4c
|
轨迹模版提示语
|
2024-03-02 09:41:05 +08:00 |
|
moyongzhen
|
e4da002a82
|
Merge branch 'dev' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into dev
|
2024-03-02 09:10:04 +08:00 |
|
moyongzhen
|
e2802de99e
|
轨迹模版新增校验
|
2024-03-02 09:10:00 +08:00 |
|
柳文翔
|
a327f0bcbf
|
修改接口
|
2024-03-01 23:08:25 +08:00 |
|
柳文翔
|
777cf29baa
|
修改轨迹推送
|
2024-03-01 22:11:45 +08:00 |
|
柳文翔
|
e40ea3bdba
|
修改轨迹内容时同步修改轨迹内容映射
|
2024-03-01 21:42:32 +08:00 |
|
柳文翔
|
ad56431c39
|
完成 轨迹内容映射编辑 接口
|
2024-03-01 21:11:43 +08:00 |
|
柳文翔
|
2292b7433d
|
创建 轨迹内容映射编辑 接口
|
2024-03-01 20:58:48 +08:00 |
|
柳文翔
|
867b987f9a
|
完成 轨迹内容映射详情 接口
|
2024-03-01 20:42:06 +08:00 |
|
柳文翔
|
3d91f9c632
|
完成 轨迹内容映射列表 接口
|
2024-03-01 20:30:17 +08:00 |
|
moyongzhen
|
61cc6aafc5
|
添加注释
|
2024-03-01 19:02:21 +08:00 |
|
moyongzhen
|
56875e923a
|
轨迹明细仓库去掉轨迹明细接口
|
2024-03-01 18:36:43 +08:00 |
|
moyongzhen
|
6e487a60c3
|
左连接查询加isdeleted==false
|
2024-03-01 18:34:05 +08:00 |
|
柳文翔
|
8ac687a9be
|
修改字段类型
|
2024-03-01 18:09:00 +08:00 |
|