Commit Graph

799 Commits

Author SHA1 Message Date
Lemon
c0deb56964 修复 后管订单列表页创建时间为空时报错 2023-08-19 14:56:15 +08:00
Lemon
b9da264581 新增 查询占桩订单费用相关接口 2023-08-19 14:07:42 +08:00
Lemon
85a5ee66d8 新增 查询占桩订单详情接口 2023-08-19 10:17:09 +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
c42d0c1f81 update 加运营商id字段 2023-08-18 15:11:17 +08:00
Lemon
4945f8ac45 update 修复空指针异常bug 2023-08-18 14:45:10 +08:00
432daba37a 生成占桩订单 2023-08-18 14:23:04 +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
4766740427 订单详情页新增退款信息 2023-08-17 16:10:31 +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
Lemon
08db31dc67 update 订单汇总数据接口格式化日期 2023-08-17 14:53:34 +08:00
205cdce2be update 重试订单退款接口 2023-08-17 14:50:59 +08:00
786ea36304 update 重试订单退款接口 2023-08-17 14:31:00 +08:00
999b7a704c update 重试订单退款接口 2023-08-17 14:25:45 +08:00
Lemon
9a9f0b9d16 后管会员页面新增memberId字段 2023-08-17 14:02:52 +08:00
077090f77c update 退余额 2023-08-17 12:44:36 +08:00
8caab85abe update 创建撤销请求,放入扩展字段 2023-08-17 12:05:21 +08:00
ae5f0d8faf update 支付时获取对应的支付配置 2023-08-17 11:55:14 +08:00
70a16ae804 update 汇付退款添加merchantKey 2023-08-17 11:16:32 +08:00
705a495bc1 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-17 10:07:35 +08:00
3df559d438 update 汇付余额退款 2023-08-17 10:07:28 +08:00
Lemon
3c0d3ca095 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-16 14:44:10 +08:00
Lemon
b2fe5fcc99 update 充值余额接口获取openid通过数据库获取 2023-08-16 14:44:03 +08:00
804853024b 多商户配置 2023-08-15 17:04:56 +08:00
d4adac696e 多商户配置
(cherry picked from commit 312b37f5bb)
2023-08-15 16:49:56 +08:00
7898bf8b45 多商户配置 2023-08-15 16:38:26 +08:00
253a527b7b 多商户配置 2023-08-15 15:53:37 +08:00
935f45938c 多商户配置 2023-08-15 15:42:39 +08:00
32156a0ad4 多商户配置 2023-08-15 15:29:05 +08:00
9965c66432 多商户配置 2023-08-15 14:32:49 +08:00
7c640f13fb 多商户配置 2023-08-15 11:02:02 +08:00