Commit Graph

2272 Commits

Author SHA1 Message Date
Guoqs
511a4201ee Merge branch 'dev-new' into dev 2025-01-03 14:28:38 +08:00
Guoqs
30b9090cd5 update 添加注释 2025-01-03 14:17:28 +08:00
Guoqs
97f33a3c84 Merge branch 'dev-new' into dev-new-rabbitmq
# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java
2025-01-02 16:59:01 +08:00
Guoqs
98cb3b2e23 update 分润配置 2025-01-02 16:51:34 +08:00
Guoqs
f4157ba3e3 Merge branch 'dev-new' into dev-new-rabbitmq 2025-01-02 14:56:12 +08:00
Guoqs
236afdda33 update 分润配置页面 2025-01-02 14:54:57 +08:00
Guoqs
913d2f5409 update 2025-01-02 10:11:56 +08:00
Guoqs
ab7e573bee update 新分账方法 2024-12-31 16:38:08 +08:00
Guoqs
b0bbba3085 update 新分账方法 2024-12-31 16:27:25 +08:00
Guoqs
1784e0f314 update 新分账方法 2024-12-31 16:17:37 +08:00
Guoqs
3b8224abb0 Merge branch 'dev-new' into dev-new-rabbitmq 2024-12-31 11:39:26 +08:00
Guoqs
a5a14c9e99 远程停止充电 校验交易流水号 2024-12-31 10:30:07 +08:00
Guoqs
ba6a82fd2a 临时接口, 关闭未支付订单 2024-12-31 09:47:45 +08:00
Guoqs
a9cea45710 添加方法 根据时间范围查询 未支付订单 2024-12-31 08:59:34 +08:00
Guoqs
ee62fe754e 添加方法 根据时间范围查询 未支付订单 2024-12-30 17:03:03 +08:00
Guoqs
8e58808c68 添加方法 根据时间范围查询 未支付订单 2024-12-30 17:00:59 +08:00
Guoqs
d4af121ee0 update 打印日志 2024-12-30 16:48:21 +08:00
Guoqs
b0e6cd6219 不在新分账逻辑站点列表中的, 可以走退款逻辑 2024-12-30 14:46:49 +08:00
Guoqs
1f9554b814 订单实时监测记录, 电流为0的不保存到数据库中 2024-12-30 14:37:03 +08:00
Guoqs
3e3ebe3dad update 2024-12-30 14:33:27 +08:00
Guoqs
729c47cc0c Merge branch 'dev-new' into dev-new-rabbitmq
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
2024-12-30 13:58:40 +08:00
Lemon
eff073a4ce update 广西平台Service 2024-12-30 11:47:32 +08:00
Guoqs
e8e85af444 希晓余额支付bug修复 2024-12-30 11:41:03 +08:00
Guoqs
665efe290b Merge branch 'dev-new' into dev-new-rabbitmq
# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
2024-12-28 15:15:15 +08:00
Guoqs
05a3e20cd2 update 添加判空逻辑 2024-12-28 09:46:02 +08:00
Guoqs
d0be55940b update 加注释 and 特定站点id走新的分账逻辑 2024-12-26 16:29:00 +08:00
Guoqs
9b1c2df87a update 添加新的分账方法返回值 2024-12-26 16:18:55 +08:00
Guoqs
b89c839c51 update 添加新的分账方法返回值 2024-12-26 16:14:06 +08:00
Guoqs
7ed2c66592 update 2024-12-26 15:43:58 +08:00
Guoqs
0cc0e17b8a Merge branch 'dev-new' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev-new 2024-12-26 10:04:45 +08:00
Guoqs
df90509fc6 update 2024-12-26 10:04:39 +08:00
Lemon
302d359783 新增 广西平台Service相关方法 2024-12-25 14:40:57 +08:00
Lemon
87eb7a3977 新增 区划代码信息实体类、Service 2024-12-20 15:50:57 +08:00
Lemon
bd59654994 update 订单记录停止原因码 2024-12-20 13:25:22 +08:00
Lemon
5869e8d5f3 update 贵州省平台Service 2024-12-20 09:11:48 +08:00
Guoqs
d96060da9a 校验分账金额测试方法 2024-12-19 16:47:40 +08:00
Guoqs
9b08105c5f 显示SOC 2024-12-19 16:40:09 +08:00
Guoqs
08b44e6da3 修改查询sql 过滤逻辑删除的数据 2024-12-19 16:19:37 +08:00
Guoqs
c2f5f15557 Merge branch 'dev-new' into dev-new-rabbitmq 2024-12-19 15:22:45 +08:00
Lemon
1eea5b1bdc update 贵州省平台 2024-12-19 13:52:41 +08:00
Guoqs
fdad5e218c Merge branch 'dev-new' into dev-new-rabbitmq
# Conflicts:
#	jsowell-admin/src/test/java/PaymentTestController.java
2024-12-19 13:30:11 +08:00
Guoqs
f0f0482ffd 分账方法 2024-12-18 15:13:32 +08:00
Lemon
ac62831a53 新增 宁波平台批量补推订单接口 2024-12-17 10:21:47 +08:00
Lemon
6c85fe49f8 新增 个人桩充电记录添加充电停止原因码字段 2024-12-17 10:08:15 +08:00
Guoqs
0df516b440 电流等于0,不保存到redis 2024-12-14 19:55:18 +08:00
Guoqs
269d80796f update 2024-12-13 17:12:44 +08:00
Guoqs
9e86ca0003 update 2024-12-13 16:45:20 +08:00
Lemon
0374405420 Merge branch 'dev-new' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev-new 2024-12-12 15:25:28 +08:00
Lemon
b24c5df37c update 贵州省平台Service 2024-12-12 15:24:28 +08:00
Guoqs
4a608eb3ca 蓝牙桩分享 2024-12-12 14:31:35 +08:00