YAS\29473
|
82ed8539e5
|
add添加临时接口批量处理白名单异常订单接口
|
2025-11-14 14:15:17 +08:00 |
|
Lemon
|
564f6f16b4
|
Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev
# Conflicts:
# jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
# jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
# jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
# jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
|
2025-11-14 14:01:56 +08:00 |
|
Lemon
|
e30ffa19af
|
add 新增首页查询抽成金额接口
|
2025-11-14 13:57:46 +08:00 |
|
Guoqs
|
e5ced1e3c7
|
查询用户余额信息接口,根据开始时间和结束时间查询
|
2025-11-14 11:08:10 +08:00 |
|
YAS\29473
|
80862d5c1d
|
update
|
2025-11-13 14:25:25 +08:00 |
|
YAS\29473
|
88b14f5b69
|
add新增订单数量与保险金额时间区统计
|
2025-11-13 13:40:13 +08:00 |
|
Lemon
|
18e4c82299
|
bugfix 人工结算订单空指针异常
|
2025-11-11 08:55:46 +08:00 |
|
YAS\29473
|
dc1ca2cbfb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-11-10 17:08:21 +08:00 |
|
YAS\29473
|
76fcad70fc
|
update统计信息不在测试环境推送
|
2025-11-10 17:07:29 +08:00 |
|
Guoqs
|
76b816351f
|
add TODO 以前端传的值为准,如果没有传值则查最后一次实时数据
|
2025-11-10 17:02:22 +08:00 |
|
bl\GQS02
|
3ed1a96ba0
|
使用交易流水号查询0x3b报文
|
2025-11-06 20:38:15 +08:00 |
|
bl\GQS02
|
e6fde3df69
|
使用交易流水号查询0x3b报文
|
2025-11-06 20:14:06 +08:00 |
|
bl\GQS02
|
3d6aa9eb98
|
使用交易流水号查询0x3b报文
|
2025-11-06 20:08:41 +08:00 |
|
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 |
|
Guoqs
|
3e39c8aa82
|
关闭内存泄露监测;提高业务线程池容量
|
2025-11-03 16:29:32 +08:00 |
|
Lemon
|
ca6b1b43da
|
update pre数据库切换为正式环境数据
|
2025-10-31 13:24:05 +08:00 |
|
Lemon
|
f6f7185f4f
|
update
|
2025-10-31 11:56:27 +08:00 |
|
Lemon
|
920ed93d44
|
update
|
2025-10-31 11:47:51 +08:00 |
|
Lemon
|
f6be15704b
|
update pre数据库环境改为阿里云测试服务器
|
2025-10-31 11:40:09 +08:00 |
|
Lemon
|
8dccc7d036
|
update pre数据库环境改为阿里云测试服务器
|
2025-10-31 11:26:32 +08:00 |
|
Lemon
|
5df6dd9d20
|
新增 移动充电桩到另一个站点接口
|
2025-10-30 15:48:39 +08:00 |
|
YAS\29473
|
b1e64a8be9
|
update 校验用户(管理员,普通用户),不可重复绑定同一台桩
|
2025-10-30 10:48:44 +08:00 |
|
Lemon
|
21eba16a1e
|
bugfix 查询订单支付记录没有筛选已删除的记录
|
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 |
|
YAS\29473
|
2c7b56b1d7
|
update
|
2025-10-16 16:36:46 +08:00 |
|
YAS\29473
|
ca7992470b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-10-16 16:27:07 +08:00 |
|
YAS\29473
|
4bb4665460
|
update
|
2025-10-16 16:26:14 +08:00 |
|
Guoqs
|
8fa310acf8
|
update添加在途金额字段
|
2025-10-15 15:59:40 +08:00 |
|
Guoqs
|
b7c3e35144
|
添加在途金额字段
|
2025-10-15 15:47:36 +08:00 |
|
Guoqs
|
50ffa032f3
|
撤销的分账算未分帐
|
2025-10-15 14:30:52 +08:00 |
|
Guoqs
|
65a26e1faf
|
查询订单分账配置
|
2025-10-14 11:50:21 +08:00 |
|
Guoqs
|
25be44af31
|
打印日志
|
2025-10-13 16:41:05 +08:00 |
|
Guoqs
|
b738439cf7
|
update 打印日志
|
2025-10-13 16:22:25 +08:00 |
|
Guoqs
|
ae31da0cb0
|
优化批量查询汇付分账信息
|
2025-10-13 15:27:31 +08:00 |
|
bl\GQS02
|
1ec364e456
|
使用retryMerchantSplitV2
|
2025-10-11 21:04:18 +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 |
|
Guoqs
|
40c3da5875
|
Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev
# Conflicts:
# jsowell-admin/src/test/resources/payment_ids
|
2025-10-11 11:58:12 +08:00 |
|
Guoqs
|
f81639a218
|
update 添加时间工具类
|
2025-10-11 11:57:55 +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 |
|