Commit Graph

1535 Commits

Author SHA1 Message Date
Lemon
74f46fbbde bugfix 后管会员列表页无法查询下一页 2023-08-21 08:54:27 +08:00
Lemon
c0deb56964 修复 后管订单列表页创建时间为空时报错 2023-08-19 14:56:15 +08:00
Lemon
b9da264581 新增 查询占桩订单费用相关接口 2023-08-19 14:07:42 +08:00
c2dddd65a7 bugfix 计算站点日报 2023-08-19 13:21:02 +08:00
150d117493 重试退款按钮 2023-08-19 11:14:13 +08:00
Lemon
008ea84b92 update 2023-08-19 10:20:59 +08:00
Lemon
85a5ee66d8 新增 查询占桩订单详情接口 2023-08-19 10:17:09 +08:00
7b1b6e8405 重试订单退款 2023-08-19 08:37:51 +08:00
e0fdfcc4aa 重试订单退款 2023-08-19 08:37:20 +08:00
739964eb03 update 打印日志 2023-08-18 17:02:10 +08:00
1717dc5e2f 打印日志 2023-08-18 17:01:10 +08:00
acf5c8bd31 打印日志 2023-08-18 16:56:53 +08:00
Lemon
858a3ea6bf update 2023-08-18 16:22:08 +08:00
Lemon
03f84c3a11 新增 占桩订单相关接口 2023-08-18 16:17:28 +08:00
d82ece35ca update 占桩订单逻辑 2023-08-18 16:03:19 +08:00
29a60ec560 update 占桩订单逻辑 2023-08-18 15:52:52 +08:00
f7fc5ea8e2 生成占桩订单 2023-08-18 15:37:45 +08:00
482fa4b20f 生成占桩订单 2023-08-18 15:36:01 +08:00
61359ed9b7 update 加运营商id字段 2023-08-18 15:11:53 +08:00
c42d0c1f81 update 加运营商id字段 2023-08-18 15:11:17 +08:00
c900eab070 配置文件 2023-08-18 14:58:03 +08:00
406fd2d76a 打印日志 2023-08-18 14:55:04 +08:00
8901ecfd50 打印日志 2023-08-18 14:53:28 +08:00
0b6dc51337 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-18 14:50:24 +08:00
47c3415080 打印日志 2023-08-18 14:49:36 +08:00
Lemon
4945f8ac45 update 修复空指针异常bug 2023-08-18 14:45:10 +08:00
69f5e27e2b Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-18 14:23:10 +08:00
432daba37a 生成占桩订单 2023-08-18 14:23:04 +08:00
Lemon
050d9c59e1 update 2023-08-18 14:21:12 +08:00
31c295ee90 生成占桩订单 2023-08-18 12:02:34 +08:00
Lemon
5bf5ffc3b7 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java
2023-08-18 11:42:26 +08:00
Lemon
00cfd77eeb 新增 占桩订单相关接口 2023-08-18 11:40:23 +08:00
027c7513aa 支付占桩订单 2023-08-18 11:19:58 +08:00
09f1588a99 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java
2023-08-18 11:14:21 +08:00
66fedd8127 支付占桩订单 2023-08-18 11:10:59 +08:00
Lemon
74af1bba60 新增 占桩订单相关接口 2023-08-18 10:15:56 +08:00
af2cc4b70f Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-18 09:52:21 +08:00
4af9c7a184 支付占桩订单 2023-08-18 09:52:12 +08:00
Lemon
128a2e76e3 update 小程序查询充电站列表 2023-08-18 09:27:22 +08:00
fe5389ce7a 汇付API 新增merchantKey 2023-08-17 17:14:44 +08:00
91cb64a4d9 汇付API 新增merchantKey 2023-08-17 17:12:17 +08:00
aeeeb96bec 查询汇付会员 新增merchantKey 2023-08-17 16:42:49 +08:00
da4750cddb 订单详情页新增重试退款按钮 2023-08-17 16:38:48 +08:00
3b1e984042 订单详情页新增重试退款按钮 2023-08-17 16:37:03 +08:00
f25b51f739 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-17 16:10:38 +08:00
4766740427 订单详情页新增退款信息 2023-08-17 16:10:31 +08:00
Lemon
f651383a87 第三方小程序查询站点列表添加查询运营商id校验 2023-08-17 15:42:38 +08:00
ba69c3ab96 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-17 15:05:38 +08:00
fb3588c565 update 重试订单退款接口 2023-08-17 15:05:01 +08:00
Lemon
faf35acf57 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-17 14:53:42 +08:00