Commit Graph

615 Commits

Author SHA1 Message Date
3893afaa06 汇付基础响应 2023-08-21 13:20:17 +08:00
Lemon
42df5649e1 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-21 08:54:41 +08:00
Lemon
74f46fbbde bugfix 后管会员列表页无法查询下一页 2023-08-21 08:54:27 +08:00
3035fdb08f 查询支付确认对象列表 2023-08-21 08:52:32 +08:00
Lemon
b9da264581 新增 查询占桩订单费用相关接口 2023-08-19 14:07:42 +08:00
Lemon
008ea84b92 update 2023-08-19 10:20:59 +08:00
Lemon
85a5ee66d8 新增 查询占桩订单详情接口 2023-08-19 10:17:09 +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
03f84c3a11 新增 占桩订单相关接口 2023-08-18 16:17:28 +08:00
61359ed9b7 update 加运营商id字段 2023-08-18 15:11:53 +08:00
c900eab070 配置文件 2023-08-18 14:58:03 +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
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
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
91cb64a4d9 汇付API 新增merchantKey 2023-08-17 17:12:17 +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
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
0845883051 update 支付撤销失败回调日志 2023-08-17 12:16:15 +08:00
28e2e4608e update 创建撤销请求,放入扩展字段 2023-08-17 12:13:46 +08:00
8caab85abe update 创建撤销请求,放入扩展字段 2023-08-17 12:05:21 +08:00
ae5f0d8faf update 支付时获取对应的支付配置 2023-08-17 11:55:14 +08:00
85d49e3be8 update汇付充值余额,延时分账 2023-08-17 11:29:44 +08:00
c818f8445e update 汇付支付添加merchantKey 2023-08-17 11:19:04 +08:00
70a16ae804 update 汇付退款添加merchantKey 2023-08-17 11:16:32 +08:00
81e3bde38e update 配置文件 2023-08-17 10:41:27 +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
253a527b7b 多商户配置 2023-08-15 15:53:37 +08:00
a64b2e56fe 多商户配置 2023-08-15 15:43:18 +08:00
935f45938c 多商户配置 2023-08-15 15:42:39 +08:00
bc9c5620f7 多商户配置 2023-08-15 15:25:00 +08:00
932f99b763 多商户配置 2023-08-15 15:22:43 +08:00
7c640f13fb 多商户配置 2023-08-15 11:02:02 +08:00
cc9598187f 支付占桩订单 2023-08-15 09:34:59 +08:00