Commit Graph

Select branches

Hide Pull Requests

main

zhangli-test

#1

#10

#2

#3

#4

#5

#6

#7

#8

#9

Mono Color

• d47caef111 no message main eric 2025-10-25 20:36:47 +08:00
• 09412ff8fe no message eric 2025-10-24 01:04:25 +08:00
• d9be23b4cf no message eric 2025-10-24 00:57:56 +08:00
• c730010937 meituan eric 2025-10-24 00:49:09 +08:00
• 540ecb522c no message eric 2025-10-23 23:10:23 +08:00
• 1b7682729c no message eric 2025-10-23 23:01:00 +08:00
• c8e1268e87 no message eric 2025-10-23 22:34:10 +08:00
• 44508651b6 no message eric 2025-10-23 22:32:01 +08:00
• fc29003411 no message eric 2025-10-23 22:09:59 +08:00
• 362866113a no message eric 2025-10-23 21:53:31 +08:00
• 18b9318b0d no message eric 2025-10-23 21:40:39 +08:00
• 97444a1520 no message eric 2025-10-23 21:28:54 +08:00
• b5c4e4226a douyin meituan eric 2025-10-23 20:41:42 +08:00
• 3a0d707a5a 添加电子围栏redis eric 2025-10-14 16:32:55 +08:00
• b3ba5ef5b1 异步提交充电订单同步 eric 2025-10-03 12:32:43 +08:00
• 53f98d9174 url eric 2025-09-30 16:17:23 +08:00
• a97513c33f 增加套餐验证接口调用 eric 2025-09-30 15:56:12 +08:00
• dab12a4b98 逾期天数有变化则更新 zhangli 2025-09-30 14:50:15 +08:00
• d2ce1120b0 更新逾期小时数 zhangli 2025-09-30 14:30:30 +08:00
• 63bb831152 计算逾期天数和小时数 zhangli 2025-09-30 14:10:01 +08:00
• f64bb390dc 逾期小时数取整 zhangli 2025-09-30 13:37:52 +08:00
• 151898fdac 计算时租预计还车时间 zhangli 2025-09-30 11:33:02 +08:00
• d627e9ed42 改回统一下单支付 zhangli 2025-09-30 01:45:55 +08:00
• 6aa0cb4834 退款查看 zhangli 2025-09-30 01:26:21 +08:00
• 79b0012d4e 子订单单号 zhangli 2025-09-30 00:49:42 +08:00
• 46fa58a78a 订单号变更 zhangli 2025-09-30 00:19:31 +08:00
• 1e95a147e6 免押支付更换子订单支付号 zhangli 2025-09-30 00:10:48 +08:00
• d9fe7405eb 免押支付加openId zhangli 2025-09-29 23:59:47 +08:00
• 19a5bde9b0 增加免押支付扣款逻辑 zhangli 2025-09-29 23:43:19 +08:00
• e2958b47ca 新增租电逻辑 eric 2025-09-29 17:14:17 +08:00
• 9b85e3a39f 订单统计 zhangli 2025-09-29 14:53:02 +08:00
• dd5603c450 订单编号格式 eric 2025-09-29 14:33:01 +08:00
• 7751595742 租电子订单returntime eric 2025-09-29 14:12:39 +08:00
• 60defa3bb4 门店分润入账 zhangli 2025-09-29 00:21:13 +08:00
• 1f06e34d99 驳回解冻免押 zhangli 2025-09-28 17:42:01 +08:00
• 70a6b578ef 增加同步租电订单的接口 zhangli 2025-09-28 17:15:24 +08:00
• 5f56194f0c 解除免押，取消订单问题 zhangli 2025-09-28 10:36:18 +08:00
• b811e01da6 Merge branch 'main' of http://115.190.8.52:3000/sczx_group/sczx_order zhangli 2025-09-27 23:47:32 +08:00
• 164434b3da 计算重试次数 zhangli 2025-09-27 23:47:28 +08:00
• 875ac87316 swagger eric 2025-09-27 23:24:25 +08:00
• 9162888023 更新次数 zhangli 2025-09-27 22:56:42 +08:00
• 872d1d1b7b 增加处理定时任务的表及接口 zhangli 2025-09-27 22:37:14 +08:00
• eaaf9d4902 免押支付修复 zhangli 2025-09-27 20:59:36 +08:00
• 39b793adbb 运营商和门店下单时做下架判断 zhangli 2025-09-27 20:26:38 +08:00
• 3937c32c6b 免押逻辑修改 zhangli 2025-09-27 19:58:11 +08:00
• e998dc6651 增加租赁时长 zhangli 2025-09-27 01:24:39 +08:00
• 652573f9ef 增加接触免押状态 zhangli 2025-09-26 22:49:40 +08:00
• 90559cff06 免押下单和免押支付 zhangli 2025-09-26 18:20:44 +08:00
• b07726c866 Merge branch 'main' into zhangli/2025-9-26_my zhangli 2025-09-26 16:51:14 +08:00
• 6f0bf4d57c 换下日志 zhangli 2025-09-26 16:36:11 +08:00
• 0338f3c675 修改下日志 zhangli 2025-09-26 15:38:53 +08:00
• af974e7368 去掉日志 zhangli 2025-09-26 15:25:35 +08:00
• c55b433bcc 冻结 zhangli 2025-09-26 15:23:53 +08:00
• 9c4113cb43 Merge branch 'main' into zhangli/2025-9-26_my zhangli 2025-09-26 15:17:21 +08:00
• a2f8d90eea 续租更新时间 zhangli 2025-09-26 15:15:47 +08:00
• 1330b8cb68 免押接口实现 zhangli 2025-09-26 14:26:11 +08:00
• 879678cb56 新增免押相关接口 zhangli 2025-09-26 01:45:44 +08:00
• cefafddf5a 续租要计算租电订单 zhangli 2025-09-25 15:09:43 +08:00
• 1814c5c199 续租去掉租电订单 zhangli 2025-09-25 02:06:31 +08:00
• edd2d6e728 租电订单做空处理 zhangli 2025-09-25 01:48:07 +08:00
• c3e64ce40f 去掉空值校验 zhangli 2025-09-25 00:37:55 +08:00
• 17dddc27a2 计算续租时间和金额 zhangli 2025-09-25 00:33:26 +08:00
• 5136b0f940 修复bug zhangli 2025-09-23 23:43:28 +08:00
• b4a37065c5 还车时间处理 zhangli 2025-09-22 02:50:26 +08:00
• acf125b02a 批量处理待支付定 zhangli 2025-09-22 02:14:18 +08:00
• 1d678f2f98 处理待支付的订单 zhangli 2025-09-22 01:33:10 +08:00
• 729ae0e19c 修复续租和逾期处理问题 zhangli 2025-09-21 23:59:55 +08:00
• b51e0e1cd9 解决金额计算问题 zhangli 2025-09-21 13:21:34 +08:00
• c08f92cf4f 续租增加租电订单金额 zhangli 2025-09-21 00:34:09 +08:00
• 2b250068cf 设置租电订单号 zhangli 2025-09-19 00:32:04 +08:00
• c1658a5972 订单详情增加门店电话 zhangli-test zhangli 2025-09-19 00:14:38 +08:00
• cdb3985120 Merge branch 'main' into zhangli-test zhangli 2025-09-18 22:37:56 +08:00
• 3d91ab0aad 解决按车型查询的结果 zhangli 2025-09-18 22:37:32 +08:00
• 1afa9895b0 解决驳回添加子订单缺时间 zhangli 2025-09-16 16:22:58 +08:00
• b2ea7e7a02 驳回修改 zhangli 2025-09-16 16:11:59 +08:00
• 711f7c5954 Merge pull request '测试合并' (#10) from zhangli-test into main zhangli 2025-09-14 11:44:59 +08:00
• 152f82933f 测试合并 zhangli 2025-09-14 11:44:22 +08:00
• 859fcdc118 Merge pull request '未提车和未还车没处理的订单处理' (#9) from zhangli-test into main zhangli 2025-09-14 11:42:44 +08:00
• 798f68aa2b 未提车和未还车没处理的订单处理 zhangli 2025-09-14 11:39:30 +08:00
• 6ce070ffc7 Merge pull request '111' (#8) from zhangli-test into main zhangli 2025-09-13 22:26:04 +08:00
• 47dc672789 支付单号增加字段 zhangli 2025-09-13 22:25:48 +08:00
• 6b0a8ce008 Merge pull request 'zhangli-test' (#7) from zhangli-test into main zhangli 2025-09-13 20:36:27 +08:00
• fceeebb152 Merge branch 'main' into zhangli-test zhangli 2025-09-13 20:34:09 +08:00
• 6f59edea8d 增加当天未提车则驳回、退款操作，以及其他优化，修复 zhangli 2025-09-13 20:33:29 +08:00
• b8c5a76a06 Merge pull request 'zhangli-test' (#6) from zhangli-test into main zhangli 2025-09-11 00:16:24 +08:00
• 392d369eec Merge branch 'main' into zhangli-test zhangli 2025-09-11 00:15:35 +08:00
• 99e78afe16 配置文件由nacos拉取 zhangli 2025-09-11 00:15:11 +08:00
• 65aba74864 Merge pull request '变更车辆增加车辆状态调整' (#5) from zhangli-test into main zhangli 2025-09-08 02:03:05 +08:00
• 797b725c1a 变更车辆增加车辆状态调整 zhangli 2025-09-08 02:02:34 +08:00
• cc15fde527 Merge pull request '绑定车辆做门店校验' (#4) from zhangli-test into main zhangli 2025-09-08 01:42:16 +08:00
• e46d6f17cc 绑定车辆做门店校验 zhangli 2025-09-08 01:41:29 +08:00
• d6688e99fe Merge pull request '更新逾期天数' (#3) from zhangli-test into main zhangli 2025-09-07 23:15:13 +08:00
• 73a4b3bde6 更新逾期天数 zhangli 2025-09-07 23:14:29 +08:00
• 2f9c9cfc28 Merge pull request 'zhangli-test' (#2) from zhangli-test into main zhangli 2025-09-07 22:45:23 +08:00
• d7ed3f13ee Merge branch 'main' into zhangli-test zhangli 2025-09-07 22:44:43 +08:00
• 6e0d083836 本地调试同步地址 zhangli 2025-09-07 22:44:27 +08:00
• 5b4b51a924 Merge pull request 'zhangli-test' (#1) from zhangli-test into main zhangli 2025-09-07 21:57:15 +08:00
• ba2f0e922d Merge branch 'main' into zhangli-test zhangli 2025-09-07 21:54:52 +08:00
• 26ad539120 退款子订单修复 zhangli 2025-09-07 21:54:35 +08:00
• 4bdfa7be71 no message eric 2025-09-07 21:27:39 +08:00