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 |
|
|
|
7f43cbfe66
|
attach
|
2024-03-06 15:31:50 +08:00 |
|
|
|
769fb8b66a
|
change 轨迹删除逻辑
|
2024-03-06 15:18:08 +08:00 |
|
|
|
8922d98ba4
|
fix 轨迹可删过滤
|
2024-03-06 14:51:41 +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 |
|
|
|
a339608efb
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-06 11:24:38 +08:00 |
|
|
|
fd54550937
|
fix【S1-跨子系统的订单有关联关系，但是没有根据配置内容映射来向下新增轨迹】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029806
|
2024-03-06 11:24:08 +08:00 |
|
moyongzhen
|
54a7f48ce4
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-06 11:15:46 +08:00 |
|
moyongzhen
|
f14bed991f
|
调整轨迹明细字段赋值
|
2024-03-06 11:15:41 +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
|
d9905878ae
|
轨迹订单分页查询调整
|
2024-03-06 10:02:05 +08:00 |
|
moyongzhen
|
369eb3708b
|
轨迹订单明细添加创建人和创建时间
|
2024-03-06 09:01:32 +08:00 |
|
moyongzhen
|
8f96886eda
|
轨迹明细订单列表添加子系统id
|
2024-03-05 21:16:07 +08:00 |
|
moyongzhen
|
78f6edbbeb
|
轨迹明细调整
|
2024-03-05 21:04:30 +08:00 |
|
moyongzhen
|
317d59861a
|
列表的最新轨迹需要调整
|
2024-03-05 20:46:00 +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 |
|
|
|
2b299fb709
|
fix 订单关联sql
|
2024-03-05 17:42:34 +08:00 |
|
|
|
a4a04bf5a6
|
fix 订单关联查询sql
|
2024-03-05 17:25:07 +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 |
|
|
|
aac436f61c
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-05 16:12:29 +08:00 |
|
moyongzhen
|
8eca00c66b
|
轨迹明细es查询
|
2024-03-05 16:08:52 +08:00 |
|
|
|
0bfc8708be
|
fix 轨迹删除by查询，code未加关键字
|
2024-03-05 16:01:52 +08:00 |
|
|
|
362ea52f2e
|
change 修改索引策略
|
2024-03-05 15:07:08 +08:00 |
|
|
|
3c14a38578
|
change 更新轨迹时区
|
2024-03-05 14:46:26 +08:00 |
|
|
|
c2e06e1201
|
fix【S1-调新增轨迹订单接口，新增成功了一个相同单号且订单类型为空的订单】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029721
|
2024-03-05 11:49:16 +08:00 |
|
|
|
8f2d9cf708
|
fix【S1-创建轨迹订单时，目的国家、目的城市、起运国家、起运城市这4个字段都是必填的，但是不填写时，都可以创建成功】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029724
|
2024-03-05 11:43:15 +08:00 |
|
|
|
86ae365a81
|
fix【S1-新增订单轨迹接口，按照文档，轨迹发生时间和时区都是必填，但是实际不填写也新增成功了】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029729
|
2024-03-05 11:39:44 +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
|
2177f0741f
|
Merge branch 'S01-轨迹中台' into test
|
2024-03-04 15:13:31 +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 |
|
liuwenxiang
|
fe55e08c54
|
Merge pull request 'S01-轨迹中台' (#45) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/45
|
2024-03-04 15:05:24 +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 |
|
liuwenxiang
|
764eb29168
|
Merge pull request '修改缓存' (#44) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/44
|
2024-03-04 11:43:58 +08:00 |
|
柳文翔
|
3298d3cb88
|
修改缓存
|
2024-03-04 11:43:29 +08:00 |
|
dingenwen
|
b7778dc2d0
|
Merge branch 'S01-轨迹中台' into test
|
2024-03-04 10:41:44 +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 |
|
liuwenxiang
|
d3edc93afd
|
Merge pull request 'S01-轨迹中台' (#41) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/41
|
2024-03-04 10:20:21 +08:00 |
|
柳文翔
|
28462ffc83
|
修改
|
2024-03-04 10:20:02 +08:00 |
|
moyongzhen
|
2905b47d1a
|
轨迹标记删除提示语
|
2024-03-04 09:26:59 +08:00 |
|
柳文翔
|
6a5db2f2f9
|
Merge branch 'S01-轨迹中台' into test
|
2024-03-02 18:03:24 +08:00 |
|
柳文翔
|
51fe08f607
|
修改
|
2024-03-02 18:02:06 +08:00 |
|
liuwenxiang
|
d852b804bb
|
Merge pull request '分页' (#38) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/38
|
2024-03-02 16:59:20 +08:00 |
|
柳文翔
|
131bf85708
|
分页
|
2024-03-02 16:58:58 +08:00 |
|
liuwenxiang
|
156460db65
|
Merge pull request '排序' (#35) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/35
|
2024-03-02 16:41:28 +08:00 |
|
柳文翔
|
569f566fe2
|
排序
|
2024-03-02 16:41:07 +08:00 |
|
dingenwen
|
7bfba6e382
|
Merge branch 'S01-轨迹中台' into test
|
2024-03-02 16:34:29 +08:00 |
|
柳文翔
|
07f603acef
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-02 16:21:05 +08:00 |
|
柳文翔
|
4cd66079d0
|
完成 轨迹模板内容下拉框 接口
|
2024-03-02 16:21:04 +08:00 |
|
moyongzhen
|
96c29ae55d
|
Merge branch 'dev' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into dev
|
2024-03-02 16:19:59 +08:00 |
|
moyongzhen
|
ea288979b4
|
枚举值调整
|
2024-03-02 16:19:50 +08:00 |
|
liuwenxiang
|
1967890dba
|
Merge pull request 'S01-轨迹中台' (#33) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/33
|
2024-03-02 15:54:43 +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 |
|
liuwenxiang
|
d6ec50cbc8
|
Merge pull request '修改' (#30) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/30
|
2024-03-02 15:29:39 +08:00 |
|
柳文翔
|
04733815d5
|
修改
|
2024-03-02 15:29:08 +08:00 |
|
liuwenxiang
|
bb2f0f650c
|
Merge pull request 'S01-轨迹中台' (#29) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/29
|
2024-03-02 15:08:24 +08:00 |
|
柳文翔
|
2d7ed5d2a5
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-02 15:07:51 +08:00 |
|
柳文翔
|
3e908cb7ef
|
修改字段
|
2024-03-02 15:07:49 +08:00 |
|
dingenwen
|
d518bdfa64
|
Merge branch 'S01-轨迹中台' into test
|
2024-03-02 14:53:19 +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 |
|
liuwenxiang
|
48bb84a2fd
|
Merge pull request '修改提示语' (#26) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/26
|
2024-03-02 14:46:40 +08:00 |
|
柳文翔
|
a2e5580070
|
修改提示语
|
2024-03-02 14:46:16 +08:00 |
|
liuwenxiang
|
383d12fbbd
|
Merge pull request 'S01-轨迹中台' (#25) from S01-轨迹中台 into test
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/25
|
2024-03-02 14:41:54 +08:00 |
|
柳文翔
|
35ce79fd99
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-02 14:41:17 +08:00 |
|
柳文翔
|
904b44e262
|
入参校验
|
2024-03-02 14:41:15 +08:00 |
|
moyongzhen
|
b8357b33d7
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-02 14:20:31 +08:00 |
|
moyongzhen
|
b95ca01d62
|
轨迹订单查询 字符串数组改成字符串
|
2024-03-02 14:20:23 +08:00 |
|
柳文翔
|
046999c208
|
补充提交
|
2024-03-02 13:54:26 +08:00 |
|
柳文翔
|
bed691aa71
|
修改
|
2024-03-02 13:52:51 +08:00 |
|
柳文翔
|
fefc52638a
|
去重
|
2024-03-02 13:01:35 +08:00 |
|
柳文翔
|
884a802481
|
字段修改
|
2024-03-02 12:47:20 +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 |
|
柳文翔
|
a9d7ab72b2
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-02 11:52:11 +08:00 |
|
柳文翔
|
d0e25fe708
|
修改错误
|
2024-03-02 11:52:09 +08:00 |
|
moyongzhen
|
c977cd1c35
|
轨迹内容分页接口添加轨迹状态查询
|
2024-03-02 11:34:26 +08:00 |
|
柳文翔
|
756268cb06
|
修改字段类型
|
2024-03-02 11:25:40 +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
|
2f837a061b
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-02 11:03:40 +08:00 |
|
moyongzhen
|
0352b77dcf
|
订单列表添加字段
|
2024-03-02 11:03:33 +08:00 |
|
柳文翔
|
925bf307b9
|
添加返回值
|
2024-03-02 11:03:12 +08:00 |
|
柳文翔
|
f569a16f60
|
添加选中项
|
2024-03-02 10:44:24 +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 |
|
dingenwen
|
4e6b9671e1
|
修改配置
|
2024-03-02 09:17:16 +08:00 |
|
柳文翔
|
0780315c9c
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-02 09:13:45 +08:00 |
|
柳文翔
|
6d7c28652b
|
还原
|
2024-03-02 09:13:43 +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 |
|
柳文翔
|
a4718386f1
|
删除
|
2024-03-01 23:21:49 +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
|
81a8e077fc
|
轨迹订单添加订单类型显示名称
|
2024-03-01 19:18:23 +08:00 |
|
moyongzhen
|
375de5268d
|
分页的轨迹订单
|
2024-03-01 19:14:20 +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 |
|
柳文翔
|
d6ea92bd20
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-01 18:00:18 +08:00 |
|
柳文翔
|
a8b0892ab6
|
完成 轨迹推送配置内容编辑 接口
|
2024-03-01 18:00:15 +08:00 |
|
moyongzhen
|
e6ae2ca464
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-01 17:53:27 +08:00 |
|
moyongzhen
|
d8065bb9d1
|
轨迹标记添加选中
|
2024-03-01 17:53:15 +08:00 |
|
|
|
38f69d0dc5
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-01 17:50:25 +08:00 |
|
|
|
545efbeaf3
|
临时提交
|
2024-03-01 17:49:20 +08:00 |
|
柳文翔
|
3505a4dbcc
|
完成 轨迹推送配置编辑 接口
|
2024-03-01 17:07:11 +08:00 |
|
moyongzhen
|
e3a8a94e1e
|
轨迹标记也添加选中
|
2024-03-01 16:38:41 +08:00 |
|
moyongzhen
|
8bf416104a
|
Merge branch 'S01-轨迹中台' into dev
|
2024-03-01 15:46:35 +08:00 |
|
moyongzhen
|
2c28dafdb6
|
bug解决
|
2024-03-01 15:46:07 +08:00 |
|
moyongzhen
|
b0bdc7111b
|
查询 ?可空
|
2024-03-01 15:45:39 +08:00 |
|
moyongzhen
|
ef6320b990
|
Merge branch 'S01-轨迹中台' into dev
|
2024-03-01 15:41:16 +08:00 |
|
moyongzhen
|
205526e370
|
轨迹模版，轨迹状态查询添加选中的id
|
2024-03-01 15:40:33 +08:00 |
|
liuwenxiang
|
5effee08e4
|
Merge pull request 'S01-轨迹中台' (#4) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/4
|
2024-03-01 15:27:47 +08:00 |
|
|
|
3921f00e4b
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-01 15:07:54 +08:00 |
|
|
|
ef8ee7acb6
|
适配vs
|
2024-03-01 15:07:40 +08:00 |
|
moyongzhen
|
766e243ca0
|
轨迹订单明细
|
2024-03-01 14:26:52 +08:00 |
|
|
|
cf76f52ecc
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-01 14:22:07 +08:00 |
|
|
|
60c2b221ea
|
添加轨迹发生事件
|
2024-03-01 14:21:54 +08:00 |
|
liuwenxiang
|
d29d468bc6
|
Merge pull request 'S01-轨迹中台' (#3) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/3
|
2024-03-01 14:11:23 +08:00 |
|
柳文翔
|
a54f071769
|
完成 轨迹推送配置内容详情 接口
|
2024-03-01 14:10:37 +08:00 |
|
moyongzhen
|
64963d2f42
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-01 11:54:29 +08:00 |
|
moyongzhen
|
6580831a4a
|
轨迹明细使用订单id查询
|
2024-03-01 11:54:22 +08:00 |
|
|
|
2a4a550fa8
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-01 11:53:42 +08:00 |
|
|
|
ee05cc8cff
|
临时提交
|
2024-03-01 11:53:29 +08:00 |
|
liuwenxiang
|
fd969dd725
|
Merge pull request 'S01-轨迹中台' (#2) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/2
|
2024-03-01 11:51:11 +08:00 |
|
柳文翔
|
21f2c215d7
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-01 11:50:43 +08:00 |
|
柳文翔
|
8161c8bca2
|
修改关键字字段类型
|
2024-03-01 11:50:41 +08:00 |
|
moyongzhen
|
adae3501fa
|
解决冲突
|
2024-03-01 10:38:39 +08:00 |
|
moyongzhen
|
2ea78adbb7
|
轨迹订单查询
|
2024-03-01 10:36:25 +08:00 |
|
|
|
7f14abe027
|
清理工程文件
|
2024-03-01 10:27:55 +08:00 |
|
|
|
945463dc91
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-01 10:15:03 +08:00 |
|
|
|
a2e458e57f
|
抽象应用契约层
|
2024-03-01 10:14:49 +08:00 |
|
柳文翔
|
adc30d39c7
|
完成 轨迹推送配置详情 接口
|
2024-03-01 10:12:14 +08:00 |
|
|
|
95d91559e8
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-01 09:49:34 +08:00 |
|
|
|
0763cbf263
|
重组项目依赖
|
2024-03-01 09:48:49 +08:00 |
|
柳文翔
|
62711af125
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-01 09:44:43 +08:00 |
|
柳文翔
|
3578e82bed
|
完成 轨迹推送配置内容列表 接口
|
2024-03-01 09:44:41 +08:00 |
|
|
|
4c7a94bfff
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-01 09:39:50 +08:00 |
|
|
|
3260a70fe6
|
调整目录
|
2024-03-01 09:39:35 +08:00 |
|
liuwenxiang
|
7636c6a100
|
Merge pull request '完成 轨迹推送配置列表 接口' (#1) from S01-轨迹中台 into dev
Reviewed-on: http://192.168.80.50:3000/Dotnet/SJZY.Track.Api/pulls/1
|
2024-03-01 09:26:38 +08:00 |
|
柳文翔
|
c3886b1d8b
|
完成 轨迹推送配置列表 接口
|
2024-03-01 09:26:11 +08:00 |
|
moyongzhen
|
7a58d3d963
|
Merge branch 'S01-轨迹中台' into dev
|
2024-03-01 09:11:56 +08:00 |
|
moyongzhen
|
2998d69ed9
|
轨迹标记编辑输入参数，字符串类型加上 ? 可空
|
2024-03-01 09:11:27 +08:00 |
|
moyongzhen
|
159ac8b029
|
获取分页的轨迹订单
|
2024-02-29 21:09:25 +08:00 |
|
|
|
2e125f8662
|
解决冲突
|
2024-02-29 20:12:03 +08:00 |
|
moyongzhen
|
543ad77141
|
Merge branch 'S01-轨迹中台' into dev
|
2024-02-29 19:46:43 +08:00 |
|
moyongzhen
|
2603cd1ac4
|
编辑时，字符串类型的必须加?可空
|
2024-02-29 19:45:13 +08:00 |
|
moyongzhen
|
2825c7f720
|
Merge branch 'S01-轨迹中台' into dev
|
2024-02-29 19:08:00 +08:00 |
|
moyongzhen
|
b139734d57
|
修复新增编辑时，获取不到用户id的问题
|
2024-02-29 19:06:34 +08:00 |
|
moyongzhen
|
dc066efed9
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-02-29 18:33:50 +08:00 |
|
moyongzhen
|
57749fc32e
|
添加授权拦截
|
2024-02-29 18:33:43 +08:00 |
|
柳文翔
|
5ddfaf5ec3
|
完成 轨迹拉取配置内容修改 接口
|
2024-02-29 17:46:14 +08:00 |
|
柳文翔
|
dba6172aab
|
还原语法
|
2024-02-29 17:24:58 +08:00 |
|
柳文翔
|
6ce5b5f7bb
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-02-29 17:22:20 +08:00 |
|
柳文翔
|
812546bfa3
|
完成 轨迹拉取配置编辑 接口
|
2024-02-29 17:22:13 +08:00 |
|
moyongzhen
|
a0cc1d824d
|
Merge branch 'S01-轨迹中台' into dev
|
2024-02-29 17:18:47 +08:00 |
|
moyongzhen
|
95dee9ec69
|
轨迹内容子系统名称联表名称
|
2024-02-29 17:18:10 +08:00 |
|
moyongzhen
|
1a3793bc09
|
Merge branch 'S01-轨迹中台' into dev
|
2024-02-29 16:38:05 +08:00 |
|
moyongzhen
|
500b4be531
|
轨迹订单，keywords参数默认传 "" 空字符
|
2024-02-29 16:35:18 +08:00 |
|
moyongzhen
|
df67c27936
|
添加轨迹订单明细查询和轨迹订单列表查询
|
2024-02-29 15:43:06 +08:00 |
|
moyongzhen
|
2d8e89cce7
|
升级语言预览
|
2024-02-29 14:38:45 +08:00 |
|
moyongzhen
|
c48e51c40b
|
轨迹标记
|
2024-02-29 14:36:38 +08:00 |
|
moyongzhen
|
3d035023e3
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-02-29 11:49:23 +08:00 |
|
moyongzhen
|
a4504f4d67
|
轨迹标记功能补充
|
2024-02-29 11:49:14 +08:00 |
|
|
|
594411bfc3
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-02-29 11:31:42 +08:00 |
|
dingenwen
|
75295f6173
|
Merge branch 'S01-轨迹中台' into dev
|
2024-02-29 11:31:38 +08:00 |
|
|
|
5bbf7d1824
|
add 订单增删改、轨迹模板查询
|
2024-02-29 11:31:19 +08:00 |
|
dingenwen
|
403c9af492
|
处理异常
|
2024-02-29 11:30:25 +08:00 |
|
yunwei
|
93b694b5b7
|
更新 src/SJZY.Track.Api/appsettings.json
|
2024-02-29 11:29:07 +08:00 |
|
yunwei
|
d37722dfb2
|
更新 src/SJZY.Track.Api/appsettings.json
|
2024-02-29 11:26:06 +08:00 |
|
柳文翔
|
90e59e27ea
|
完成 轨迹拉取配置内容详情 接口
|
2024-02-29 09:55:44 +08:00 |
|
柳文翔
|
249a77851b
|
完成 轨迹拉取配置详情 接口
|
2024-02-29 09:44:36 +08:00 |
|
柳文翔
|
eddd529718
|
完成 轨迹拉取配置内容列表 接口
|
2024-02-29 09:20:18 +08:00 |
|
moyongzhen
|
1e9d4fdd6f
|
1
|
2024-02-29 09:18:48 +08:00 |
|
moyongzhen
|
df037021ba
|
轨迹标记服务
|
2024-02-29 09:18:24 +08:00 |
|
moyongzhen
|
82cee1ed13
|
状态校验
|
2024-02-28 21:19:10 +08:00 |
|
moyongzhen
|
8791f12423
|
轨迹状态
|
2024-02-28 21:07:37 +08:00 |
|
moyongzhen
|
6596a26def
|
映射内容
|
2024-02-28 20:04:29 +08:00 |
|
moyongzhen
|
95f92b3865
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-02-28 20:00:02 +08:00 |
|
moyongzhen
|
2a07b472be
|
轨迹内容功能
|
2024-02-28 19:59:55 +08:00 |
|
柳文翔
|
07418e4810
|
完成 轨迹拉取配置列表 接口
|
2024-02-28 19:00:38 +08:00 |
|
moyongzhen
|
6f78f868f1
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-02-28 17:19:16 +08:00 |
|
moyongzhen
|
25bed79bf6
|
调整分页获取轨迹模版接口
|
2024-02-28 17:19:09 +08:00 |
|
|
|
6b3961a6fd
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-02-28 16:58:24 +08:00 |
|
|
|
72a1063523
|
change 订单聚合变更
|
2024-02-28 16:58:10 +08:00 |
|
moyongzhen
|
1b55ad2965
|
轨迹模版编辑调整
|
2024-02-28 16:46:02 +08:00 |
|
moyongzhen
|
87cc34b6b0
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-02-28 16:22:01 +08:00 |
|
moyongzhen
|
3f7a978ec6
|
轨迹模版调整
|
2024-02-28 16:21:53 +08:00 |
|
|
|
14933065e4
|
change 拆分订单关联服务
|
2024-02-28 16:20:16 +08:00 |
|
|
|
ee80cb1353
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-02-28 16:15:47 +08:00 |
|
|
|
4c4cdd6326
|
add 关联订单接口
|
2024-02-28 16:15:32 +08:00 |
|
moyongzhen
|
047e9b4885
|
轨迹内容功能
|
2024-02-28 15:48:48 +08:00 |
|
moyongzhen
|
bee28546b4
|
轨迹内容编辑
|
2024-02-28 14:38:33 +08:00 |
|
moyongzhen
|
ca2792180a
|
添加轨迹内容服务
|
2024-02-28 14:28:19 +08:00 |
|
moyongzhen
|
db4e0c6587
|
dto添加属性
|
2024-02-28 14:10:38 +08:00 |
|
|
|
05637db671
|
解决冲突
|
2024-02-28 11:49:18 +08:00 |
|
|
|
95ff38efd3
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
# Conflicts:
# src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs
# src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/ITrackStatusRepository.cs
# src/SJZY.Track.Domain/SJZY.Track.Domain.csproj
# src/SJZY.Track.Repository/TrackStatusRepository.cs
|
2024-02-28 11:46:36 +08:00 |
|
|
|
37e225e456
|
change 结构调整
|
2024-02-28 11:40:15 +08:00 |
|
moyongzhen
|
f00cc899b1
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-02-28 11:27:41 +08:00 |
|
moyongzhen
|
c8ad695a27
|
轨迹状态功能
|
2024-02-28 11:27:34 +08:00 |
|
|
|
752f65b1e2
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-02-28 10:09:08 +08:00 |
|
|
|
90fd55c325
|
change 订单聚合实体结构
|
2024-02-28 10:08:30 +08:00 |
|
moyongzhen
|
e5419ec2f9
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-02-27 21:17:14 +08:00 |
|
moyongzhen
|
46a669a7db
|
轨迹状态编辑
|
2024-02-27 21:17:07 +08:00 |
|
柳文翔
|
57c888a448
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-02-27 20:52:44 +08:00 |
|
柳文翔
|
397297177e
|
完成 轨迹模板内容编辑 接口
|
2024-02-27 20:52:43 +08:00 |
|
moyongzhen
|
31951cd0b1
|
轨迹状态
|
2024-02-27 20:52:04 +08:00 |
|
moyongzhen
|
cbb9e5ed52
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-02-27 20:27:01 +08:00 |
|
moyongzhen
|
393c6a8e54
|
轨迹模版查询添加模版id查询
|
2024-02-27 20:26:54 +08:00 |
|
柳文翔
|
8962bc4055
|
完成 轨迹模板内容详情 接口
|
2024-02-27 19:42:40 +08:00 |
|
柳文翔
|
0a3a9b1822
|
完成 轨迹模板内容列表 接口
|
2024-02-27 19:22:48 +08:00 |
|
柳文翔
|
bf1a9e0169
|
合并代码
|
2024-02-27 18:42:04 +08:00 |
|
柳文翔
|
ced9b2144b
|
创建领域
|
2024-02-27 18:41:11 +08:00 |
|
|
|
6212d06880
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-02-27 18:19:34 +08:00 |
|
|
|
a006804970
|
创建订单
|
2024-02-27 18:19:22 +08:00 |
|
moyongzhen
|
bac642c96e
|
格式化
|
2024-02-27 17:31:48 +08:00 |
|
|
|
e6d52a3894
|
examples
|
2024-02-27 17:25:30 +08:00 |
|
moyongzhen
|
c5e8d65906
|
解决冲突
|
2024-02-27 16:55:18 +08:00 |
|
moyongzhen
|
333862e8f9
|
轨迹模版查询
|
2024-02-27 16:44:41 +08:00 |
|
|
|
c5b6d5e444
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
# Conflicts:
# src/SJZY.Track.Repository/SJZY.Track.Repository.csproj
# src/SJZY.Track.Repository/TrackTemplate/Services/ITrackTemplateRepository.cs
# src/SJZY.Track.Repository/TrackTemplate/Services/TrackTemplateRepository.cs
|
2024-02-27 16:23:38 +08:00 |
|
|
|
1e9c1d9c7e
|
change 项目结构改造DDD
|
2024-02-27 16:22:42 +08:00 |
|
moyongzhen
|
b4e0621a37
|
轨迹模版查询
|
2024-02-27 15:59:42 +08:00 |
|
moyongzhen
|
60839dee12
|
轨迹模版功能
|
2024-02-27 15:19:06 +08:00 |
|
dingenwen
|
3de032803a
|
解决冲突
|
2024-02-27 14:37:06 +08:00 |
|
dingenwen
|
798226f3ab
|
v表仓储
|
2024-02-27 14:36:18 +08:00 |
|
moyongzhen
|
cbabe27185
|
轨迹模版
|
2024-02-27 14:33:36 +08:00 |
|
moyongzhen
|
3036cfbab4
|
轨迹模版
|
2024-02-27 10:05:30 +08:00 |
|
dingenwen
|
886dfcae38
|
仓储更新
|
2024-02-26 18:02:17 +08:00 |
|
柳文翔
|
77691fcaaa
|
更新包
|
2024-02-24 13:44:42 +08:00 |
|
徐蒙恩
|
d9e2b69d47
|
first
|
2024-02-18 18:25:31 +08:00 |
|
