Commit Graph

900 Commits

Author SHA1 Message Date
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
卢麟哲 48486ba7c5 已添加 README.md 2024-02-01 05:52:24 +00:00