Commit Graph

2760 Commits

Author SHA1 Message Date
Guoqs
4043933276 金额取订单分账记录表中的值 2025-09-29 14:39:25 +08:00
Guoqs
61590a6d18 金额取订单分账记录表中的值 2025-09-29 14:33:58 +08:00
YAS\29473
c62a5e42f6 Merge remote-tracking branch 'origin/master' 2025-09-29 14:24:09 +08:00
Guoqs
6a3c262e7c 金额取订单分账记录表中的值 2025-09-29 14:21:48 +08:00
Guoqs
4efb428e5f 金额取订单分账记录表中的值 2025-09-29 14:15:41 +08:00
Guoqs
7c51106b17 金额取订单分账记录表中的值
(cherry picked from commit 36c635a465)
2025-09-29 14:06:06 +08:00
YAS\29473
a1652067c0 Merge remote-tracking branch 'origin/master' 2025-09-29 13:13:29 +08:00
Guoqs
21b9f3bf35 bugfix orderSplitRecords中电费分账金额与服务费分账金额为null, 设置0 2025-09-29 10:48:17 +08:00
YAS\29473
e25a230058 update 新电途实现类接口 2025-09-28 16:18:24 +08:00
Guoqs
94655706dc update 2025-09-27 15:51:08 +08:00
Guoqs
15677b0dfe 重写toString 2025-09-27 15:03:13 +08:00
Guoqs
0b2558d2ed 打印日志 2025-09-27 14:48:33 +08:00
YAS\29473
79bd34d9f6 update 2025-09-27 13:46:26 +08:00
bl\GQS02
7edd93395a 数值为null, 默认0 2025-09-27 09:05:10 +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
5c86e525d2 update 小程序关闭待支付订单接口 2025-09-25 11:02:59 +08:00
Lemon
d4e7a665a9 update 新增小程序关闭待支付订单接口 2025-09-25 10:06:36 +08:00
Lemon
c54f649996 update 订单支付逻辑 2025-09-25 09:22:52 +08:00
Lemon
05a1232e82 update 订单支付逻辑 2025-09-25 09:08:15 +08:00
Lemon
31895c7fa0 bugfix vin/刷卡启动没有保险金额字段导致报错 2025-09-24 22:08:44 +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
YAS\29473
297405471e update 2025-09-22 15:11:21 +08:00
YAS\29473
6517c75df2 update 2025-09-22 09:31:13 +08:00
Lemon
bd62f259ac update 修改车牌号校验是否绑定 2025-09-19 14:00:25 +08:00
YAS\29473
b2ced0f23e update 2025-09-19 11:59:09 +08:00
YAS\29473
e6ea1cc82c update 2025-09-19 10:35:38 +08:00
Guoqs
a1a6df26d3 wccService新增根据第三方平台类型查询对接第三方平台的运营商列表接口;新增根据站点idList批量查询枪口数据接口 2025-09-19 10:19:09 +08:00
Lemon
9d8cf73f92 bugfix 保险分账逻辑 2025-09-19 10:08:00 +08:00
Guoqs
80a4c4f2fc 新增运营商,添加alipayAppId 2025-09-18 14:30:38 +08:00
Lemon
ffbb95ae12 bugfix 退款逻辑 2025-09-16 16:27:41 +08:00
Lemon
ea92374c9c bugfix 退款逻辑 2025-09-16 16:10:22 +08:00
Lemon
625a17d351 update pre环境也退款、分账 2025-09-16 16:01:35 +08:00
Lemon
c54a07ad40 update 退款金额计算保险金额 2025-09-16 15:47:15 +08:00
Lemon
9b5831ebc1 bugfix 修复订单中 保险金额字段为0的bug 2025-09-16 15:36:48 +08:00
YAS\29473
c9264800d4 update 2025-09-13 14:23:00 +08:00
YAS\29473
02fba0db77 update 2025-09-13 11:07:45 +08:00
YAS\29473
f7b7a5599e update 2025-09-13 10:19:17 +08:00
Lemon
f4be531761 电池充电报告新增字段 2025-09-12 14:29:11 +08:00
YAS\29473
8ff40b19e2 UPDATE 2025-09-12 14:12:44 +08:00
YAS\29473
e1f732c12c 第三方联联平台新增运营商上海派荷科技有限公司 2025-09-11 08:49:16 +08:00
YAS\29473
3eb26775fc 在各个帧类中添加mq消息发送(部分添加用于测试) 2025-09-10 16:57:41 +08:00
Guoqs
cc2d09b157 update 分帐逻辑加注释 2025-09-10 14:18:10 +08:00
Lemon
012e375300 update 判断保险金额 2025-09-09 09:59:59 +08:00
Lemon
74b2f93db3 update 保险金额分账 2025-09-08 15:57:16 +08:00
Lemon
22d13cf995 add 新增根据订单号查询保险信息方法 2025-09-05 15:05:54 +08:00
Lemon
c2487295c5 order_basic_info 表添加 insurance_amount字段 2025-09-05 13:46:18 +08:00
Lemon
53a7b70ee3 新增 订单保险信息相关实体类、Service、Mapper 2025-09-05 10:21:56 +08:00
Guoqs
b8d34d59fe Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev 2025-08-29 16:58:47 +08:00
Guoqs
718a2d2501 如果之前存在订单分账记录, 则逻辑删除 2025-08-29 16:58:36 +08:00