Commit Graph

5166 Commits

Author SHA1 Message Date
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
25be44af31 打印日志 2025-10-13 16:41:05 +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
bl\GQS02
1ec364e456 使用retryMerchantSplitV2 2025-10-11 21:04:18 +08:00
bl\GQS02
f3a200600a update 检查订单分账记录 2025-10-11 20:50:07 +08:00
bl\GQS02
093f344613 bugfix 查询sql报错 2025-10-11 20:33:16 +08:00
Guoqs
7a191ccdd4 比较订单分账记录 2025-10-11 16:27:33 +08:00
Guoqs
882fc0bd13 比较订单分账记录 2025-10-11 16:20:04 +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
9abaee98f4 update 打印日志 2025-10-11 15:41:41 +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
Lemon
7121ccea7e Merge branch 'dev-zza' into dev
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/service/SplitBillService.java
2025-10-11 11:29:10 +08:00
Lemon
d8c1cdebcd update 重试运营商分账接口 2025-10-11 11:26:55 +08:00
Guoqs
ee55e3c3cf Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev 2025-10-11 10:42:22 +08:00
Guoqs
befffda063 update 重试运营商分账 2025-10-11 10:42:15 +08:00
Lemon
7ddf8ad44f Merge branch 'master' into dev 2025-10-11 10:11:17 +08:00
Lemon
2099fe688e Merge branch 'master' into dev-zza 2025-10-11 10:11:08 +08:00
Guoqs
e6865a4f92 update PaymentTestController 2025-10-11 09:53:53 +08:00
Guoqs
2e7d7cebbc Merge branch 'dev' 2025-10-10 16:26:42 +08:00
Guoqs
5b800cbc01 处理OrderSplitRecord中值为0的数据 2025-10-10 16:26:01 +08:00
Guoqs
94371bc089 Merge branch 'dev' 2025-10-10 16:09:52 +08:00
Guoqs
2a3afa3e10 打印日志 2025-10-10 16:09:34 +08:00
Guoqs
bd4b615729 Merge branch 'dev' 2025-10-10 16:04:46 +08:00
Guoqs
2ba0fb9370 Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev 2025-10-10 16:03:55 +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
Lemon
85c02470ae bugfix 修复分账空指针异常 2025-10-10 14:53:38 +08:00
Guoqs
483e4fd40d 添加字段 2025-10-10 14:18:36 +08:00
Guoqs
c3ddcccc80 添加站点id 2025-10-10 14:06:23 +08:00
Guoqs
cf5a02d56a update 重试运营商分账方法 2025-10-10 13:39:42 +08:00
Guoqs
9cacb7d45b Merge branch 'master' into dev
# Conflicts:
#	jsowell-admin/src/test/resources/payment_ids
2025-10-10 13:34:33 +08:00
Guoqs
cd789f0590 update 重试运营商分账方法 2025-10-10 13:33:51 +08:00
Guoqs
ad405a6710 update 重试运营商分账方法 2025-10-10 13:32:53 +08:00
Lemon
1489505e86 update 重试运营商分账接口 2025-10-10 13:10:56 +08:00