Commit Graph

2297 Commits

Author SHA1 Message Date
Guoqs
d64a8d00a4 整合OrderBasicInfo和OrderDetail 2025-01-15 09:52:23 +08:00
Guoqs
c6a23b96ad 整合OrderBasicInfo和OrderDetail 2025-01-15 09:48:10 +08:00
Guoqs
8dc47db0a9 站点日报统计所有耗电量大于0的订单; 分账任务里待分账的订单过滤掉结算订单为0的订单 2025-01-14 16:52:04 +08:00
Guoqs
687a7250c5 update 修改站点计费模板状态并下发最新模板, 区分普通计费模板和会员计费模板 2025-01-14 13:25:34 +08:00
Guoqs
957f08aadc update 修改站点计费模板状态并下发最新模板, 区分普通计费模板和会员计费模板 2025-01-14 13:14:00 +08:00
Guoqs
837758e431 订单分账记录表 加字段 2025-01-13 16:48:02 +08:00
Guoqs
6269524b97 订单分账记录表 加字段 2025-01-13 16:15:35 +08:00
Guoqs
76ebd65c05 新增derReportDetail订单报告详情 2025-01-13 15:34:34 +08:00
Lemon
095166e17c Merge branch 'dev-new' into dev-new-rabbitmq 2025-01-13 11:37:11 +08:00
Lemon
58a0d3947c bugfix 联联平台Service 2025-01-13 11:35:44 +08:00
Guoqs
ba38feb27a 查询运营商订单报表V3 2025-01-10 15:31:00 +08:00
Guoqs
841ae04fba update 删除充电桩固件 2025-01-10 11:53:34 +08:00
Guoqs
bfe86b97df 初始化站点分账配置 2025-01-09 16:35:44 +08:00
Guoqs
cfe9304d21 update 新的分账方法 2025-01-09 16:21:07 +08:00
Lemon
b19bc49093 update 首页订单数据新增时间选择器 2025-01-09 15:28:20 +08:00
Guoqs
71d911705f update 定时分账的订单保存分账信息 2025-01-09 15:18:51 +08:00
Guoqs
e562197c9c 打印日志 2025-01-09 14:17:45 +08:00
Guoqs
6cc37bdc18 update 2025-01-09 13:30:31 +08:00
Guoqs
03f93661c0 update 解决转换异常 2025-01-08 10:24:37 +08:00
Guoqs
2cd751d489 update 2025-01-08 10:19:33 +08:00
Lemon
82e1f4a1c8 首页订单数据新增汇总字段 2025-01-08 09:15:56 +08:00
Lemon
72c26562cf 后管运营商vip会员页面新增导出功能 2025-01-07 09:44:01 +08:00
Guoqs
24074cb840 update 2025-01-06 13:36:19 +08:00
Guoqs
de0b4aa6e4 update 2025-01-06 13:27:06 +08:00
Guoqs
bb02068115 update 2025-01-06 12:14:22 +08:00
Guoqs
87bb2926e8 Merge branch 'dev-new' into dev-new-rabbitmq 2025-01-06 09:05:09 +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