lulz1
|
824bcc98cf
|
同步代码
|
2024-02-29 10:08:28 +08:00 |
|
lulz1
|
3748fe0e6e
|
同步代码
|
2024-02-29 09:33:39 +08:00 |
|
lulz1
|
7674527cbb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-29 09:32:01 +08:00 |
|
lulz1
|
a0ef0eef99
|
同步代码
|
2024-02-29 09:28:18 +08:00 |
wanglf3
|
cb98f347b5
|
1.订单明细认证接口错误提示优化。
|
2024-02-29 08:44:50 +08:00 |
|
lulz1
|
fc6a2821d5
|
同步代码
|
2024-02-29 08:42:06 +08:00 |
|
lulz1
|
e563cffe37
|
同步代码
|
2024-02-29 08:27:06 +08:00 |
|
wanglf3
|
aa86243ec0
|
1.修复代码修改错误
|
2024-02-28 20:00:40 +08:00 |
|
wanglf3
|
f264f9c7a5
|
1.添加订单明细认证接口和订单明细认证接口
|
2024-02-28 19:57:57 +08:00 |
|
wanglf3
|
6b33590553
|
1.添加订单明细认证接口和订单明细认证接口
|
2024-02-28 19:56:16 +08:00 |
dengwc
|
3dca884467
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-28 14:44:52 +08:00 |
|
dengwc
|
af6feb405a
|
火车差标估价金额调整
|
2024-02-28 14:44:37 +08:00 |
|
lulz1
|
838f340ebf
|
同步代码
|
2024-02-28 14:03:30 +08:00 |
|
lulz1
|
1b9fff32d8
|
同步代码
|
2024-02-28 12:39:57 +08:00 |
|
lulz1
|
92fe207374
|
同步代码
|
2024-02-28 11:49:10 +08:00 |
|
lulz1
|
d1acab14e5
|
同步代码
|
2024-02-28 09:42:59 +08:00 |
huangxh3
|
0654ee094a
|
用车数据转换
|
2024-02-28 09:35:24 +08:00 |
|
lulz1
|
626968a7f0
|
同步代码
|
2024-02-28 09:06:48 +08:00 |
|
lulz1
|
126953bd85
|
同步代码
|
2024-02-28 08:38:01 +08:00 |
|
lulz1
|
a2e9018143
|
同步代码
|
2024-02-28 08:27:15 +08:00 |
|
lulz1
|
962c1c448f
|
同步代码
|
2024-02-27 18:48:30 +08:00 |
|
lulz1
|
c5725e64b3
|
同步代码
|
2024-02-27 18:33:46 +08:00 |
|
lulz1
|
2fefbbeab8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-27 18:01:15 +08:00 |
|
lulz1
|
b50161853c
|
同步代码
|
2024-02-27 17:58:58 +08:00 |
|
dengwc
|
a5892a97fa
|
酒店回推调整数据调整
|
2024-02-27 17:14:17 +08:00 |
|
lulz1
|
1e1fc1a394
|
同步代码
|
2024-02-27 16:52:42 +08:00 |
|
lulz1
|
94062b19ff
|
同步代码
|
2024-02-27 16:25:40 +08:00 |
|
lulz1
|
355c61e32a
|
同步代码
|
2024-02-27 16:14:33 +08:00 |
|
lulz1
|
803efc7790
|
同步代码
|
2024-02-27 16:11:44 +08:00 |
|
lulz1
|
1aa9fb2c63
|
同步代码
|
2024-02-27 15:26:49 +08:00 |
|
lulz1
|
099238dc8b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-27 15:23:13 +08:00 |
|
lulz1
|
0858c77f87
|
同步代码
|
2024-02-27 15:20:05 +08:00 |
|
huangxh3
|
7d9fe0b0e8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-27 14:33:16 +08:00 |
|
huangxh3
|
dd1a84fdba
|
修改配置文件,酒店数据转换
|
2024-02-27 14:33:03 +08:00 |
|
lulz1
|
8083483fa9
|
同步代码
|
2024-02-27 13:44:34 +08:00 |
|
lulz1
|
65593e353f
|
同步代码
|
2024-02-27 08:51:31 +08:00 |
 Superdandan
|
c6e1cff665
|
完成部分订单明细字段
|
2024-02-26 22:28:16 +08:00 |
|
lulz1
|
5b8a9a3ac2
|
同步代码
|
2024-02-26 19:20:08 +08:00 |
|
lulz1
|
25c65d0986
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-26 17:45:15 +08:00 |
|
lulz1
|
b99c0e945e
|
同步代码
|
2024-02-26 17:42:20 +08:00 |
|
lulz1
|
bb302bfb7a
|
同步代码
|
2024-02-26 17:41:36 +08:00 |
|
dengwc
|
e4ffad832c
|
BPM超标回推接口发起测试
|
2024-02-26 15:00:44 +08:00 |
|
dengwc
|
984b584dc6
|
BPM超标、改签流程发起测试
|
2024-02-26 10:21:15 +08:00 |
|
dengwc
|
37ab01578c
|
BPM超标、改签流程发起测试
|
2024-02-26 10:19:51 +08:00 |
|
lulz1
|
c4885c2aa8
|
同步代码
|
2024-02-26 09:12:26 +08:00 |
|
lulz1
|
93a001ce6a
|
修复误删代码
|
2024-02-25 22:17:17 +08:00 |
|
Superdandan
|
07685dbd35
|
完成超标状态回推bpm代码
|
2024-02-25 22:04:02 +08:00 |
|
Superdandan
|
dfa050cbff
|
完成超标状态回推bpm代码
|
2024-02-25 21:34:15 +08:00 |
|
Superdandan
|
9ab000791e
|
完成超标状态回推bpm代码
|
2024-02-25 18:40:11 +08:00 |
|
lulz1
|
d815148587
|
Merge branch 'dev' of http://47.97.21.20:3000/echo/route into dev
|
2024-02-24 21:00:38 +08:00 |
|
lulz1
|
d3ec32a867
|
更新事件
|
2024-02-24 21:00:33 +08:00 |
|
Superdandan
|
55f2ae28dd
|
提交回推数据
|
2024-02-24 20:35:15 +08:00 |
|
dengwc
|
f09dd77636
|
BPM超标、改签接口案例测试
|
2024-02-24 17:04:44 +08:00 |
|
huangxh3
|
c49ab49fe9
|
数据回推状
|
2024-02-24 13:13:15 +08:00 |
|
huangxh3
|
b5d87bba90
|
数据回推状
|
2024-02-24 10:59:06 +08:00 |
|
dengwc
|
4ca03517c9
|
酒店估算金额接口，差旅标准添加接口
|
2024-02-23 14:17:02 +08:00 |
|
lulz1
|
9608462308
|
上下文添加差标
|
2024-02-23 13:37:49 +08:00 |
|
lulz1
|
258d27e9f9
|
兼容兼岗无职级问题
|
2024-02-23 10:27:01 +08:00 |
|
lulz1
|
ec9a797ad2
|
订单分页查询增加新参数
|
2024-02-23 09:04:18 +08:00 |
|
lulz1
|
44c7cb1845
|
修改职级代码
|
2024-02-23 08:17:48 +08:00 |
|
dengwc
|
42946a89c6
|
查询酒店估算金额
|
2024-02-22 17:15:33 +08:00 |
|
lulz1
|
f946d61329
|
修改配置文件
|
2024-02-22 16:52:02 +08:00 |
|
lulz1
|
7547fff50b
|
修改配置文件
|
2024-02-22 15:26:58 +08:00 |
|
lulz1
|
24e4334bce
|
修改差标类
|
2024-02-22 15:14:46 +08:00 |
|
huangxh3
|
1adf7ae2be
|
数据回推状态映射
|
2024-02-22 13:21:33 +08:00 |
|
dengwc
|
bf2204bcc2
|
回推状态映射调整
|
2024-02-22 13:06:53 +08:00 |
|
lulz1
|
5b0bbd9fdf
|
修改差标类
|
2024-02-22 10:33:35 +08:00 |
|
lulz1
|
4c2d64ca0a
|
开发数据回推接口
|
2024-02-22 10:26:05 +08:00 |
|
lulz1
|
79b25da344
|
开发数据回推接口
|
2024-02-22 10:11:08 +08:00 |
|
lulz1
|
74bbd26713
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-22 10:08:53 +08:00 |
|
huangxh3
|
2ec6881656
|
数据回推
|
2024-02-22 08:56:47 +08:00 |
|
dengwc
|
b94b42c1f3
|
取消同程订单接口
|
2024-02-21 10:45:15 +08:00 |
|
lulz1
|
1849457dc6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-21 08:35:36 +08:00 |
|
lulz1
|
527263678a
|
开发数据回推接口
|
2024-02-21 08:31:47 +08:00 |
|
huangxh3
|
23ceb54308
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/test/java/com/chint/RouteApplicationTests.java
|
2024-02-21 08:27:42 +08:00 |
|
huangxh3
|
195d5ecd50
|
数据回推
|
2024-02-21 08:26:52 +08:00 |
|
lulz1
|
e5f030ddc5
|
开发数据回推接口
|
2024-02-21 08:17:27 +08:00 |
|
lulz1
|
a7ba57499b
|
开发数据回推接口
|
2024-02-20 20:27:00 +08:00 |
|
lulz1
|
54dc2db42b
|
修复bug
|
2024-02-20 14:46:47 +08:00 |
|
lulz1
|
19775c580e
|
修复bug
|
2024-02-20 09:33:42 +08:00 |
|
lulz1
|
d771a5b068
|
修复bug
|
2024-02-20 09:28:07 +08:00 |
|
lulz1
|
7b67196eff
|
添加行程规划功能接口
|
2024-02-20 08:19:39 +08:00 |
|
Superdandan
|
c79f61e23e
|
完善订单详情字段
|
2024-02-19 22:53:33 +08:00 |
|
lulz1
|
89ca5cb54f
|
添加行程规划功能接口
|
2024-02-19 20:17:22 +08:00 |
|
lulz1
|
32ba08c300
|
修改编译版本
|
2024-02-19 11:01:13 +08:00 |
|
Superdandan
|
85cfbd5ec6
|
完成协程数据回推部分内容
|
2024-02-18 22:48:50 +08:00 |
|
lulz1
|
365daab0fe
|
修改编译版本
|
2024-02-18 21:03:41 +08:00 |
|
lulz1
|
2ccc93fdd9
|
修改编译版本
|
2024-02-18 16:43:59 +08:00 |
|
lulz1
|
0d8b55f6d7
|
修改编译版本
|
2024-02-18 15:20:08 +08:00 |
|
lulz1
|
b6207c278b
|
修改编译版本
|
2024-02-18 15:01:36 +08:00 |
|
lulz1
|
5c4fa0b63a
|
修改编译版本
|
2024-02-18 14:54:06 +08:00 |
|
lulz1
|
09a5a39bfe
|
修改编译版本
|
2024-02-18 14:43:10 +08:00 |
|
lulz1
|
5ec5842d4a
|
添加dockerfile
|
2024-02-18 14:28:17 +08:00 |
|
lulz1
|
2d48aeb8df
|
添加dockerfile
|
2024-02-18 13:48:05 +08:00 |
|
lulz1
|
ec68c44112
|
Merge remote-tracking branch 'gitea/dev' into dev
# Conflicts:
# src/main/java/com/chint/application/out/SupplierLoginController.java
# src/main/java/com/chint/application/services/OrderApplicationService.java
# src/main/java/com/chint/infrastructure/constant/Constant.java
# src/main/java/com/chint/interfaces/rest/ctrip/dto/search/ItineraryEntity.java
# src/main/java/com/chint/interfaces/rest/ctrip/dto/search/car/BasicInfo.java
# src/main/java/com/chint/interfaces/rest/ctrip/dto/search/car/OrderProduct.java
# src/main/java/com/chint/interfaces/rest/ctrip/dto/search/car/PaymentInfo.java
# src/main/java/com/chint/interfaces/rest/ctrip/dto/search/flight/BasicInfo.java
# src/main/java/com/chint/interfaces/rest/ctrip/dto/search/flight/FlightInfo.java
# src/main/java/com/chint/interfaces/rest/ctrip/dto/search/flight/FlightOrderFeeDetail.java
# src/main/java/com/chint/interfaces/rest/ctrip/dto/search/flight/PassengerInfo.java
# src/test/java/com/chint/CTripTest.java
# src/test/java/com/chint/RouteApplicationTests.java
|
2024-02-17 22:22:46 +08:00 |
|
lulz1
|
94c04eccda
|
同步接口修改抛出异常
|
2024-02-17 12:10:26 +08:00 |
|
Superdandan
|
3594267e0b
|
初始化代码
|
2024-02-17 12:05:12 +08:00 |
|
Superdandan
|
fb5c0d1e60
|
初始化代码
|
2024-02-16 23:03:21 +08:00 |
|
dengwc
|
aea8ca7f0c
|
同步同程订单接口的测试调整
|
2024-02-06 17:07:49 +08:00 |
|
lulz1
|
d1408e39d9
|
同步接口修改抛出异常
|
2024-02-06 16:47:00 +08:00 |
|
lulz1
|
4fe1eb411b
|
增加 部分接口缺少事务注解
|
2024-02-06 16:16:49 +08:00 |
|
lulz1
|
f82a5d6800
|
增加 部分接口缺少事务注解
|
2024-02-06 16:01:50 +08:00 |
|
lulz1
|
72e57f3bff
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-06 15:59:05 +08:00 |
|
lulz1
|
3656d28727
|
修复同步订单代码逻辑
|
2024-02-06 15:56:12 +08:00 |
|
dengwc
|
722b82f2b8
|
添加同步同程订单接口
|
2024-02-06 15:24:25 +08:00 |
|
dengwc
|
6d829e2b5c
|
添加同步同程订单接口
|
2024-02-06 15:21:12 +08:00 |
|
dengwc
|
2e0e666e99
|
添加同步同程订单接口
|
2024-02-06 15:18:25 +08:00 |
|
lulz1
|
b4d8f012ca
|
修复部分参数字段
|
2024-02-06 15:06:54 +08:00 |
|
lulz1
|
84f4d9d342
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-06 08:58:42 +08:00 |
|
wanglf3
|
e7a7b66d0a
|
1.添加携程PC单点接口，和H5单点接口Test
|
2024-02-06 08:24:39 +08:00 |
|
lulz1
|
4b6aa38719
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-06 07:59:30 +08:00 |
|
dengwc
|
a6987ca0fa
|
SupplierLoginController登录接口的更改,同程金额修改。
|
2024-02-05 16:48:23 +08:00 |
|
dengwc
|
9a278f0979
|
SupplierLoginController登录接口的更改,同程金额修改。
|
2024-02-05 15:26:12 +08:00 |
|
lulz1
|
2abb88491f
|
修复部分参数字段
|
2024-02-05 13:10:26 +08:00 |
|
dengwc
|
d1b96acf09
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-05 10:16:11 +08:00 |
|
huangxh3
|
360a15b1a7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-05 10:15:28 +08:00 |
|
huangxh3
|
93b0f4e5f8
|
估算金额接口test
|
2024-02-05 10:15:07 +08:00 |
|
dengwc
|
ab2f6d1a92
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-05 10:14:03 +08:00 |
|
lulz1
|
e2778e528b
|
增加携程后获取token的类型
|
2024-02-05 09:44:17 +08:00 |
|
dengwc
|
2d191dd53c
|
SupplierLoginController登录接口的更改
|
2024-02-04 17:08:38 +08:00 |
|
lulz1
|
b77287a3ae
|
价格估算接口代码初始化
|
2024-02-04 16:15:55 +08:00 |
|
lulz1
|
0ad7ffe1b0
|
补充地理位置分页查询接口
|
2024-02-04 15:05:27 +08:00 |
|
lulz1
|
77c39a8c29
|
完成部分业务逻辑
|
2024-02-04 12:49:14 +08:00 |
|
lulz1
|
ca1c093698
|
完成部分业务逻辑
|
2024-02-04 10:31:43 +08:00 |
|
huangxh3
|
c2a7816da7
|
数据回推控制层添加接口
|
2024-02-04 09:48:56 +08:00 |
|
huangxh3
|
e994606496
|
创建数据回推控制层
|
2024-02-04 08:28:03 +08:00 |
|
lulz1
|
e5c4b11ec5
|
完成部分业务逻辑
|
2024-02-04 08:03:27 +08:00 |
|
huangxh3
|
2b3e818f74
|
单元测试及部分修改
|
2024-02-02 16:53:25 +08:00 |
|
huangxh3
|
14cc1129b0
|
用车订单数据回推dto
|
2024-02-02 14:13:29 +08:00 |
|
huangxh3
|
75eb2bfe98
|
机票票状态推送dto
|
2024-02-02 13:52:31 +08:00 |
|
huangxh3
|
b19a44f2cf
|
火车票订单数据回推dto
|
2024-02-02 13:22:55 +08:00 |
|
huangxh3
|
d32d3c0776
|
酒店订单数据回推dto
|
2024-02-02 13:07:54 +08:00 |
|
huangxh3
|
c778c2d9a8
|
机票订单数据回推dto
|
2024-02-02 10:14:12 +08:00 |
|
huangxh3
|
75fcdd5077
|
外部差旅单同步dto
|
2024-02-02 08:36:29 +08:00 |
|
huangxh3
|
6626d16310
|
外部差旅单同步dto
|
2024-02-02 08:26:50 +08:00 |
|
lulz1
|
615e81968c
|
测试第三方接口
|
2024-02-01 17:20:31 +08:00 |
|
lulz1
|
119e614765
|
测试第三方接口
|
2024-02-01 17:11:09 +08:00 |
|
huangxh3
|
a1159c1bb6
|
外部差旅单同步dto
|
2024-02-01 17:08:14 +08:00 |
|
lulz1
|
510ea39b50
|
初始化同程接口
|
2024-02-01 14:46:23 +08:00 |
|
lulz1
|
9f4f77fcc7
|
初始化代码
|
2024-02-01 13:53:03 +08:00 |