Commit Graph

194 Commits

Author SHA1 Message Date
jsowell
80d1d027a1 Merge branch 'dev' of codeup.aliyun.com:67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java
#	jsowell-pile/src/main/java/com/jsowell/pile/vo/web/BigDataOverviewVO.java
2026-08-04 16:33:03 +08:00
jsowell
9315e701e6 update 大数据屏接口 2026-08-04 16:29:17 +08:00
Guoqs
1b37a7d5e8 修复余额不足仍可启动充电问题
统一启动金额优先级并在启动前校验会员余额。

同步完成订单创建和余额支付后再返回鉴权成功,并增加支付凭证补偿、异常停机和结算保护。
2026-07-25 09:54:37 +08:00
Lemon
05699d5686 update 首页数据大屏 2026-05-26 16:19:19 +08:00
Lemon
ecded2ef39 update 首页数据看板 2026-05-09 14:34:14 +08:00
Lemon
b563659f84 新增后管数据看板 2026-05-08 11:42:11 +08:00
Guoqs
d9c2e19ad1 update 更新查询sql 2026-04-21 16:14:12 +08:00
Guoqs
2b80442811 update 查询订单sql 2026-04-20 13:50:36 +08:00
Lemon
da17b5151d bugfix 修复保险金额统计错误 2026-04-01 09:07:31 +08:00
Lemon
79738d2e57 bugfix 修复保险金额统计错误 2026-04-01 08:15:46 +08:00
Guoqs
5f4dccc23b update 批量更新订单审核 2026-02-04 14:47:22 +08:00
Guoqs
1a1b72a469 update 2026-02-03 16:10:48 +08:00
Guoqs
4aacf8b873 update 2026-02-03 15:25:56 +08:00
Lemon
7c576ca255 bugfix 查询订单详情字段为空 2026-01-29 15:15:13 +08:00
Lemon
c1db659cc3 update 2026-01-29 14:47:27 +08:00
YAS\29473
36f21ee13d update 2026-01-23 13:38:48 +08:00
Lemon
f7a6a25434 add 新增运营端小程序查询订单详情接口 2026-01-21 15:32:57 +08:00
Lemon
074b624644 update 2026-01-09 15:14:13 +08:00
Lemon
20f881f394 bugfix 修复电池充电报告发送信息缺少参数 2026-01-09 14:35:11 +08:00
Lemon
36aedf35ba Merge branch 'feature-business-minigram' into dev
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
2026-01-07 10:49:06 +08:00
Lemon
22865eae82 update 查询枪口列表接口、add 查询各状态枪口汇总数据接口 2026-01-07 10:14:59 +08:00
Lemon
96725e53e5 update 运营端小程序查询枪口列表页 2026-01-05 16:38:22 +08:00
YAS\29473
06ff787cea update 2026-01-05 11:38:13 +08:00
YAS\29473
2768c6597c update 2026-01-04 11:40:37 +08:00
YAS\29473
ccd2f96466 update 2026-01-04 08:40:56 +08:00
YAS\29473
2347445e74 update 2025-12-31 16:02:46 +08:00
YAS\29473
a5fac3091f add 新增运营端小程序查询订单列表接口 2025-12-31 15:43:48 +08:00
Lemon
f704cffe35 update 后管订单列表接口新增 payMode筛选字段 2025-11-27 08:47:40 +08:00
Lemon
23ce26a441 add 新增 首页查询每天的保险收入金额接口 2025-11-26 14:52:07 +08:00
Lemon
661b4180bc 小程序订单列表页新增车牌号字段 2025-11-20 11:12:56 +08:00
Guoqs
333521bbcb update 更新adapayUnsplitRecord数据 2025-11-14 15:44:24 +08:00
Guoqs
c3db9b9201 update 添加临时方法,更新adapayUnsplitRecord数据 2025-11-14 15:07:50 +08:00
Lemon
564f6f16b4 Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
#	jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
2025-11-14 14:01:56 +08:00
Lemon
e30ffa19af add 新增首页查询抽成金额接口 2025-11-14 13:57:46 +08:00
Guoqs
67d44f0b57 Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev 2025-11-13 16:15:54 +08:00
Guoqs
a96c374b94 如果查询订单状态只有异常的情况下,排除个人桩的异常订单 2025-11-13 16:15:48 +08:00
YAS\29473
38fde97b7b update 2025-11-13 14:25:11 +08:00
YAS\29473
4bb4665460 update 2025-10-16 16:26:14 +08:00
Guoqs
9e08d916f7 订单详情表加字段 2025-10-13 16:50:24 +08:00
Guoqs
c3ddcccc80 添加站点id 2025-10-10 14:06:23 +08:00
Guoqs
ad405a6710 update 重试运营商分账方法 2025-10-10 13:32:53 +08:00
Lemon
28a712637f update 新增重新分账接口 2025-10-10 11:54:35 +08:00
YAS\29473
79bd34d9f6 update 2025-09-27 13:46:26 +08:00
Lemon
c2487295c5 order_basic_info 表添加 insurance_amount字段 2025-09-05 13:46:18 +08:00
Lemon
0de268c679 update 首页订单金额数据 2025-08-08 13:18:14 +08:00
Lemon
1ea2b23f30 update 2025-08-06 10:52:43 +08:00
Lemon
0025eb9f90 update 订单列表页汇总数据结算金额换为实收金额 2025-08-05 10:39:48 +08:00
YAS\29473
35ce808ee7 update空指针接口 2025-07-09 18:36:46 +08:00
Lemon
9b966b43ae 新增 批量推送第三方平台订单接口 2025-07-04 13:55:17 +08:00
Lemon
fd527e0467 Merge branch 'dev-zza' into dev 2025-06-25 15:38:57 +08:00