YAS\29473
|
0e76aabd45
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-26 14:56:16 +08:00 |
|
YAS\29473
|
60ced96cb5
|
update
|
2025-09-26 14:55:18 +08:00 |
|
Lemon
|
625a577aeb
|
Merge branch 'dev-zza' into dev
# Conflicts:
# jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
|
2025-09-23 10:46:38 +08:00 |
|
Lemon
|
f099c480ed
|
bugfix 支付回调逻辑
|
2025-09-16 09:25:52 +08:00 |
|
YAS\29473
|
1d790d7761
|
第三方推送还原为原来的版本代码,测试改到dev-zzx1分支
|
2025-09-15 09:28:46 +08:00 |
|
YAS\29473
|
9156fe16dc
|
update
|
2025-09-12 14:48:38 +08:00 |
|
YAS\29473
|
e0ce612bf5
|
update 注释掉CommonService的使用,改为使用mq
|
2025-09-12 09:07:13 +08:00 |
|
YAS\29473
|
3eb26775fc
|
在各个帧类中添加mq消息发送(部分添加用于测试)
|
2025-09-10 16:57:41 +08:00 |
|
Lemon
|
dc36a9b4e2
|
bugfix 初始化充电金额
|
2025-09-10 13:45:40 +08:00 |
|
Lemon
|
5da6c5c2bb
|
update
|
2025-09-05 15:07:20 +08:00 |
|
Lemon
|
66add9fecf
|
update 支付回调中判断订单是否购买保险,如果购买,将启动充电金额减去保险金额
|
2025-09-05 15:06:36 +08:00 |
|
YAS\29473
|
f382e2ba5e
|
update
|
2025-09-01 15:45:23 +08:00 |
|
Lemon
|
66fe563a04
|
bugfix 生成桩号报错
|
2025-08-11 10:08:24 +08:00 |
|
Lemon
|
0dcfb04420
|
update 后管订单详情接口新增 车牌号码字段
|
2025-07-29 09:58:27 +08:00 |
|
Guoqs
|
f09e2a0630
|
更新钱包code为空的数据
|
2025-07-24 15:26:55 +08:00 |
|
Guoqs
|
e418ce562a
|
更新钱包code为空的数据
|
2025-07-24 14:55:56 +08:00 |
|
Guoqs
|
7b71191daa
|
引入第三方平台任务线程池
|
2025-07-22 16:48:54 +08:00 |
|
Guoqs
|
0b19fb888d
|
update 改名
|
2025-07-17 09:30:52 +08:00 |
|
Guoqs
|
724686194e
|
有电充service改名万车充service
|
2025-07-17 09:14:07 +08:00 |
|
Guoqs
|
67f904b1c8
|
Merge branch 'dev' into dev-g
|
2025-07-11 14:20:54 +08:00 |
|
Lemon
|
60cbbc5436
|
update 人工结算订单接口
|
2025-07-10 13:32:17 +08:00 |
|
YAS\29473
|
caf20dc6ec
|
update临时接口条件统计订单数量
|
2025-07-07 08:23:41 +08:00 |
|
Lemon
|
c6028873fa
|
新增 批量推送第三方平台订单接口
|
2025-07-04 14:22:37 +08:00 |
|
Guoqs
|
678469cdc0
|
Merge branch 'dev' into dev-g
|
2025-07-04 14:08:42 +08:00 |
|
Lemon
|
9b966b43ae
|
新增 批量推送第三方平台订单接口
|
2025-07-04 13:55:17 +08:00 |
|
Lemon
|
e5db467b5d
|
新增 重发结算订单信息到mq
|
2025-07-03 08:41:21 +08:00 |
|
Guoqs
|
758b7da56e
|
Merge branch 'dev' into dev-g
|
2025-07-01 14:16:59 +08:00 |
|
Guoqs
|
1be8c2b281
|
update 短信验证码
|
2025-07-01 13:31:45 +08:00 |
|
Guoqs
|
a949040e78
|
update dubbo service
|
2025-06-17 16:51:50 +08:00 |
|
Lemon
|
d080b70373
|
add 新增 查询充电优免订单接口
|
2025-06-11 08:52:30 +08:00 |
|
Guoqs
|
572af79b92
|
update 调试接口
|
2025-06-03 16:19:46 +08:00 |
|
Lemon
|
2dd90e0938
|
update 设置实收金额字段
|
2025-05-16 14:08:48 +08:00 |
|
Guoqs
|
6bf8a3f37b
|
update 调试订单接口
|
2025-05-05 14:06:01 +08:00 |
|
Guoqs
|
9cab1cccaa
|
update 调试订单接口
|
2025-05-05 13:51:17 +08:00 |
|
Guoqs
|
c06b031862
|
调试订单临时接口
|
2025-04-29 11:59:06 +08:00 |
|
Guoqs
|
f3adb8a691
|
调试订单临时接口
|
2025-04-29 11:45:48 +08:00 |
|
Guoqs
|
58c1500c36
|
调试订单临时接口
|
2025-04-29 11:30:35 +08:00 |
|
Guoqs
|
fda771f88e
|
调试订单临时接口
|
2025-04-29 11:14:24 +08:00 |
|
Guoqs
|
25bc761dcf
|
update 发布电单车计费模板
|
2025-04-25 17:31:51 +08:00 |
|
Guoqs
|
5fa70253a0
|
如果没有交易记录原始数据,则使用停止充电时间作为开始时间和结束时间再查一次
|
2025-04-22 09:09:51 +08:00 |
|
Guoqs
|
b7f04d2159
|
定时任务处理未分帐订单
|
2025-04-16 15:50:26 +08:00 |
|
Guoqs
|
c2821c11d9
|
校验分账金额方法
|
2025-04-16 14:10:36 +08:00 |
|
Guoqs
|
e9eb50a0c2
|
新增通用验证码
|
2025-04-14 15:11:20 +08:00 |
|
Guoqs
|
62c9bfc3ba
|
重试分账接口
|
2025-04-11 15:28:38 +08:00 |
|
Guoqs
|
aef1dcade4
|
重试分账接口
|
2025-04-11 14:39:00 +08:00 |
|
Guoqs
|
98dcf11181
|
json解析TransactionRecordsData异常
|
2025-04-02 09:50:39 +08:00 |
|
Guoqs
|
0e7e1d9373
|
充电桩启动失败, 发送停止充电指令
|
2025-04-01 11:58:33 +08:00 |
|
Guoqs
|
b4b9114ae8
|
测试希晓结算订单逻辑
|
2025-03-31 14:33:59 +08:00 |
|
Guoqs
|
baf4b49668
|
测试希晓结算订单逻辑
|
2025-03-31 14:29:29 +08:00 |
|
Guoqs
|
29775d17a6
|
测试希晓结算订单逻辑
|
2025-03-31 14:20:48 +08:00 |
|