Commit Graph

2760 Commits

Author SHA1 Message Date
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
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
f81639a218 update 添加时间工具类 2025-10-11 11:57:55 +08:00
Guoqs
5b800cbc01 处理OrderSplitRecord中值为0的数据 2025-10-10 16:26:01 +08:00
Guoqs
2a3afa3e10 打印日志 2025-10-10 16:09:34 +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
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
9cacb7d45b Merge branch 'master' into dev
# Conflicts:
#	jsowell-admin/src/test/resources/payment_ids
2025-10-10 13:34:33 +08:00
Guoqs
ad405a6710 update 重试运营商分账方法 2025-10-10 13:32:53 +08:00
Lemon
6a0547c596 Merge branch 'dev' into dev-zza 2025-10-10 11:54:51 +08:00
Lemon
28a712637f update 新增重新分账接口 2025-10-10 11:54:35 +08:00
Guoqs
2c0f571641 方法判空 2025-10-10 11:47:54 +08:00
Guoqs
67d95d0571 adapayService添加批量查询分账信息方法 2025-10-10 11:40:56 +08:00
Lemon
f5a58a70ea update 生成分账记录时,采用订单结算日期当作tradeDate 2025-10-10 08:48:49 +08:00
YAS\29473
04912f9b1c update 2025-10-09 17:09:27 +08:00
Guoqs
fe4b8bf3af 按照 memberId 对 SplitData 列表中的 amount 进行汇总,保留原始的 feeFlag 数据 2025-10-09 11:22:08 +08:00
Guoqs
5539ce6c40 过滤该运营商分账记录 2025-10-09 10:02:26 +08:00
bl\GQS02
faeb26faaf 启动失败的订单,同时退保险费用 2025-09-30 22:35:18 +08:00
YAS\29473
84a750b3f7 Merge remote-tracking branch 'origin/master' 2025-09-29 16:02:19 +08:00
Guoqs
786dbcf431 金额取订单分账记录表中的值 2025-09-29 14:45:14 +08:00