Commit Graph

5304 Commits

Author SHA1 Message Date
YAS\29473
84a750b3f7 Merge remote-tracking branch 'origin/master' 2025-09-29 16:02:19 +08:00
Guoqs
e7936952af Merge branch 'master' into dev
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
2025-09-29 14:51:44 +08:00
Guoqs
786dbcf431 金额取订单分账记录表中的值 2025-09-29 14:45:14 +08:00
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
Guoqs
36c635a465 金额取订单分账记录表中的值 2025-09-29 13:54:05 +08:00
YAS\29473
a1652067c0 Merge remote-tracking branch 'origin/master' 2025-09-29 13:13:29 +08:00
YAS\29473
a5d8764434 update 充电状态转换 2025-09-29 10:50:06 +08:00
Guoqs
21b9f3bf35 bugfix orderSplitRecords中电费分账金额与服务费分账金额为null, 设置0 2025-09-29 10:48:17 +08:00
YAS\29473
ae44f9f6e0 update 2025-09-29 10:03:32 +08:00
YAS\29473
31fd742a73 update 2025-09-28 17:27:40 +08:00
YAS\29473
2abe7ee27e update 2025-09-28 17:16:37 +08:00
YAS\29473
9d9586d71a update 2025-09-28 17:09:17 +08:00
YAS\29473
e25a230058 update 新电途实现类接口 2025-09-28 16:18:24 +08:00
YAS\29473
58a7bbfd8e 新增新电途推送接口 2025-09-28 15:10:46 +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
Guoqs
79e057703f 循环进行转账操作方法 2025-09-27 13:37:53 +08:00
bl\GQS02
ca43f42727 提取余额 2025-09-27 10:27:19 +08:00
bl\GQS02
b18fc9f27b 变更汇付会员id 2025-09-27 10:16:50 +08:00
bl\GQS02
f59cd3d3b1 创建结算账户,添加身份信息 2025-09-27 10:02:58 +08:00
bl\GQS02
42de16100f 修改银行卡信息 2025-09-27 09:26:11 +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
Lemon
896f69f496 update 电池充电报告Service 2025-09-23 10:44:29 +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
Lemon
4088313277 update 方法注释 2025-09-18 14:32:14 +08:00
Guoqs
80a4c4f2fc 新增运营商,添加alipayAppId 2025-09-18 14:30:38 +08:00
Guoqs
f1aa28f658 修改日志级别 2025-09-18 13:47:11 +08:00
Lemon
ffbb95ae12 bugfix 退款逻辑 2025-09-16 16:27:41 +08:00
Lemon
ea92374c9c bugfix 退款逻辑 2025-09-16 16:10:22 +08:00