Commit Graph

773 Commits

Author SHA1 Message Date
lulz1 684e8c7fac Merge remote-tracking branch 'origin/dev' into dev 2024-04-02 09:46:28 +08:00
Superdandan 814064918e 完成携程按月拉去结算流水接口 2024-04-01 22:13:31 +08:00
lulz1 bc11e0a9c9 备份携程按月获取结算代码 2024-04-01 17:16:32 +08:00
dengwc fed270e71a Merge remote-tracking branch 'origin/dev' into dev 2024-04-01 17:14:40 +08:00
dengwc ba25eed951 结算明细字段映射调整 2024-04-01 17:14:24 +08:00
lulz1 fa0cc239d1 测试环境增加client验证 2024-04-01 16:58:22 +08:00
lulz1 12011f3769 携程结算数据查询功能 2024-04-01 16:19:41 +08:00
lulz1 7adbd25382 Merge branch 'dev' of http://47.97.21.20:3000/echo/route into dev 2024-04-01 11:13:07 +08:00
Superdandan 89dfea7c3e 测试携程结算代码 2024-04-01 11:11:39 +08:00
lulz1 b53e66ea6a Merge branch 'dev' of http://47.97.21.20:3000/echo/route into dev 2024-04-01 10:42:41 +08:00
Superdandan 16f4a64fd5 测试携程结算代码 2024-04-01 10:42:08 +08:00
lulz1 7bc7b8852c Merge branch 'dev' of http://47.97.21.20:3000/echo/route into dev 2024-04-01 09:52:29 +08:00
Superdandan ed3c0484f9 测试携程结算代码 2024-04-01 09:26:22 +08:00
lulz1 65793fcf49 修复自动结束事件的bug 2024-03-31 12:58:29 +08:00
lulz1 fdad2e2bec 提交代码 2024-03-29 21:08:18 +08:00
dengwc 73f747fca9 结算明细字段映射调整 2024-03-29 16:49:18 +08:00
dengwc 7b94273155 流程不重复发起调整 2024-03-29 14:42:35 +08:00
dengwc 42eafa33d2 流程不重复发起调整 2024-03-29 12:59:27 +08:00
lulz1 c8d88f707c 添加部分结算代码 2024-03-29 10:51:22 +08:00
lulz1 3db25286ba Merge remote-tracking branch 'origin/dev' into dev 2024-03-29 10:50:25 +08:00
dengwc 63552f2727 Merge remote-tracking branch 'origin/dev' into dev 2024-03-29 10:23:15 +08:00
dengwc 4bee4a258d 流程不重复发起调整,同程火车改签bug处理 2024-03-29 10:22:45 +08:00
lulz1 c8e296a0c4 Merge branch 'dev' of http://47.97.21.20:3000/echo/route into dev 2024-03-29 09:25:50 +08:00
lulz1 3c14743c13 修改FSSC审批单跳转类型2的跳转方式 2024-03-29 09:22:35 +08:00
Superdandan cb515cfc48 完善结算模块类的创建代码 2024-03-28 23:49:19 +08:00
lulz1 404847cb07 修改测试文件 2024-03-28 20:30:19 +08:00
lulz1 3098af9a24 Merge remote-tracking branch 'origin/dev' into dev 2024-03-28 20:22:52 +08:00
lulz1 2adcf92af0 行程规划同步添加提示 2024-03-28 20:19:58 +08:00
dengwc c8101a9d50 Merge remote-tracking branch 'origin/dev' into dev 2024-03-28 17:36:23 +08:00
dengwc df15005b16 同程结算明细接口编写 2024-03-28 17:36:04 +08:00
lulz1 8eb0c2dfc2 提交携程结算数据保存代码 2024-03-28 17:02:37 +08:00
lulz1 6e46dd20fd Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/com/chint/application/in/AutoWorkController.java
2024-03-28 17:02:06 +08:00
dengwc 10a25f25c5 同程结算明细接口编写 2024-03-28 16:36:08 +08:00
dengwc 7d042f808e 同程结算接口编写 2024-03-28 09:49:54 +08:00
Superdandan 90a1b6994e 提交携程结算明细保存代码 2024-03-27 22:39:43 +08:00
lulz1 28aa7bdac5 提交结算代码 2024-03-27 21:30:18 +08:00
lulz1 5ba9a05f34 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/com/chint/application/in/AutoWorkController.java
#	src/main/java/com/chint/domain/factoriy/order_record/LyStatementOrder.java
2024-03-27 16:17:33 +08:00
lulz1 1586d398e5 提交结算明细部分代码 2024-03-27 16:13:24 +08:00
dengwc 11fda4a880 同程结算接口数据拉取 2024-03-27 16:07:08 +08:00
dengwc 216a41b1fd 同程结算接口数据拉取 2024-03-27 14:32:14 +08:00
dengwc a34688a971 Merge remote-tracking branch 'origin/dev' into dev 2024-03-27 14:28:37 +08:00
dengwc 003da4e533 同程结算接口数据拉取 2024-03-27 14:28:19 +08:00
lulz1 c0a761d137 暂时关闭订单结算和明细的token校验 2024-03-27 13:51:39 +08:00
lulz1 fd6d575d5a 修改财务共享查询秘钥代码 2024-03-27 13:31:26 +08:00
lulz1 8e2c3d1000 修改登录财务共享获取跳转地址的方式 2024-03-27 09:51:31 +08:00
lulz1 dc7fe144ac 修复同程火车超标回推 2024-03-26 15:37:06 +08:00
dengwc 8f0aa3bc82 同程结算接口字段添加 2024-03-26 15:14:51 +08:00
lulz1 59ed3cce53 同程新超标推送接口测试bug修复 2024-03-26 12:55:08 +08:00
lulz1 76c26c50f1 同程订单同步状态取值错误修复 2024-03-25 21:20:13 +08:00
dengwc bffecc8ada 超标审批接口调整 2024-03-25 17:13:29 +08:00