Commit Graph

2790 Commits

Author SHA1 Message Date
Guoqs
333521bbcb update 更新adapayUnsplitRecord数据 2025-11-14 15:44:24 +08:00
Guoqs
c3db9b9201 update 添加临时方法,更新adapayUnsplitRecord数据 2025-11-14 15:07:50 +08:00
Guoqs
2b33a7a845 update 代码格式 2025-11-14 14:49:40 +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
68c947574d 电单车订单,按实际退款 2025-11-14 10:43:48 +08:00
Guoqs
67d44f0b57 Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev 2025-11-13 16:15:54 +08:00
Guoqs
a96c374b94 如果查询订单状态只有异常的情况下,排除个人桩的异常订单 2025-11-13 16:15:48 +08:00
YAS\29473
d672eff8c8 update 2025-11-13 15:07:55 +08:00
YAS\29473
7f433e06c2 update 2025-11-13 14:25:39 +08:00
YAS\29473
38fde97b7b update 2025-11-13 14:25:11 +08:00
YAS\29473
88b14f5b69 add新增订单数量与保险金额时间区统计 2025-11-13 13:40:13 +08:00
YAS\29473
098e14faaf update 修复占桩订单导出功能 2025-11-13 09:54:39 +08:00
bl\GQS02
2d840c4f85 update sql返回类型 2025-11-06 20:56:39 +08:00
bl\GQS02
653677fc97 打印日志 2025-11-06 20:48:53 +08:00
bl\GQS02
3d6aa9eb98 使用交易流水号查询0x3b报文 2025-11-06 20:08:41 +08:00
bl\GQS02
874a0768a7 如果pileSn长度 不等于8或者不等于14,不保存 2025-11-06 19:50:23 +08:00
bl\GQS02
7eb3b12013 add 查询充电桩报文列表方法 2025-11-06 15:39:04 +08:00
bl\GQS02
66ba4ce4a3 充电桩报文记录表,添加交易流水号字段 2025-11-06 15:32:45 +08:00
bl\GQS02
1068c4c5dd Merge branch 'master' into dev 2025-11-06 11:27:56 +08:00
Lemon
87c5373430 update 启动失败设置结算时间、debugOrder接口新增修改订单状态 2025-11-06 11:17:05 +08:00
bl\GQS02
9f6f13b473 时段耗电量为null, 则设置为0 2025-11-06 11:04:58 +08:00
Lemon
997ca3863b update 2025-11-06 09:15:46 +08:00
Lemon
1c4c76237c bugfix 创建订单添加各时段用电量初始值 2025-11-06 09:07:06 +08:00
YAS\29473
c0ff8ac81f bugfix 空指针判断 2025-11-06 08:54:44 +08:00
Lemon
dd2eb3365c bug fix 修复订单结算空指针 2025-11-06 08:32:57 +08:00
Lemon
7aedd32415 update 移动充电桩到另一个站点 接口 2025-10-31 11:25:42 +08:00
Lemon
c612662d3d update 移动充电桩到另一个站点 接口 2025-10-31 10:46:54 +08:00
Lemon
49e31d2794 update 移动充电桩到另一个站点 接口 2025-10-30 16:10:05 +08:00
Lemon
5df6dd9d20 新增 移动充电桩到另一个站点接口 2025-10-30 15:48:39 +08:00
Lemon
21eba16a1e bugfix 查询订单支付记录没有筛选已删除的记录 2025-10-30 10:48:44 +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
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
7ccdba8a4c update添加在途金额字段 2025-10-15 16:06:31 +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
8bb175c056 orderDetail中各时段用电量更新逻辑 2025-10-14 13:45:25 +08:00
Guoqs
3ea66b38f8 查询订单分账配置 2025-10-14 11:58:41 +08:00
Guoqs
65a26e1faf 查询订单分账配置 2025-10-14 11:50:21 +08:00
Guoqs
9e08d916f7 订单详情表加字段 2025-10-13 16:50:24 +08:00
Guoqs
ad708e8240 打印日志 2025-10-13 16:29:22 +08:00
Guoqs
b738439cf7 update 打印日志 2025-10-13 16:22:25 +08:00
Guoqs
ae31da0cb0 优化批量查询汇付分账信息 2025-10-13 15:27:31 +08:00
Guoqs
a5bd667339 过滤为空的数据 2025-10-13 14:41:17 +08:00
Guoqs
2fb4edc330 打印日志 2025-10-13 14:31:08 +08:00
bl\GQS02
0027d66fa9 update 检查订单分账记录 删除历史的分账记录 2025-10-11 21:32:09 +08:00
bl\GQS02
1902e877ae update 打印日志 2025-10-11 21:19:17 +08:00