Commit Graph

607 Commits

Author SHA1 Message Date
Lemon
5c5f8c565c update 人工结算订单添加查询交易记录逻辑 2025-11-06 11:32:43 +08:00
bl\GQS02
1068c4c5dd Merge branch 'master' into dev 2025-11-06 11:27:56 +08:00
Lemon
7ef90d05c2 update 2025-11-06 11:26:05 +08:00
Lemon
87c5373430 update 启动失败设置结算时间、debugOrder接口新增修改订单状态 2025-11-06 11:17:05 +08:00
bl\GQS02
2ce7468e0d update 2025-11-06 10:53:07 +08:00
YAS\29473
b1e64a8be9 update 校验用户(管理员,普通用户),不可重复绑定同一台桩 2025-10-30 10:48:44 +08:00
YAS\29473
cdf476cfc0 update 2025-10-23 14:28:45 +08:00
YAS\29473
56229e5fa1 update 2025-10-23 14:22:33 +08:00
YAS\29473
b06a119ab3 update 2025-10-23 14:07:58 +08:00
Guoqs
65a26e1faf 查询订单分账配置 2025-10-14 11:50:21 +08:00
Guoqs
25be44af31 打印日志 2025-10-13 16:41:05 +08:00
bl\GQS02
f3a200600a update 检查订单分账记录 2025-10-11 20:50:07 +08:00
Lemon
2b9801228d Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev 2025-10-11 16:07:42 +08:00
Lemon
ca83cffffa add 后管新增退款保险金额按钮 2025-10-11 16:07:37 +08:00
Guoqs
17873f5405 检查订单分账记录 2025-10-11 15:29:29 +08:00
Guoqs
da5664b7bf 根据paymentIdList查询分账信息 2025-10-11 14:12:32 +08:00
Guoqs
f59201129f update 重试运营商分账 2025-10-11 13:06:11 +08:00
Lemon
2cdd16b5c1 Revert "Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev"
This reverts commit ee55e3c3cf, reversing
changes made to befffda063.
2025-10-11 11:37:02 +08:00
Lemon
d8c1cdebcd update 重试运营商分账接口 2025-10-11 11:26:55 +08:00
Guoqs
bd4b615729 Merge branch 'dev' 2025-10-10 16:04:46 +08:00
Guoqs
e7c780822c 处理OrderSplitRecord中值为0的数据 2025-10-10 16:03:46 +08:00
Lemon
6a937c1801 update 格式化开始时间、结束时间 2025-10-10 15:33:10 +08:00
Guoqs
cf5a02d56a update 重试运营商分账方法 2025-10-10 13:39:42 +08:00
Guoqs
ad405a6710 update 重试运营商分账方法 2025-10-10 13:32:53 +08:00
Lemon
1489505e86 update 重试运营商分账接口 2025-10-10 13:10:56 +08:00
Lemon
28a712637f update 新增重新分账接口 2025-10-10 11:54:35 +08:00
YAS\29473
79bd34d9f6 update 2025-09-27 13:46:26 +08:00
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