|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
aca94df6a5
|
Merge branch 'adapay' into dev
# Conflicts:
# jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
|
2023-08-17 10:13:22 +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 |
|
|
|
312b37f5bb
|
多商户配置
|
2023-08-15 16:49:41 +08:00 |
|
|
|
7898bf8b45
|
多商户配置
|
2023-08-15 16:38:26 +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 |
|
|
|
32156a0ad4
|
多商户配置
|
2023-08-15 15:29:05 +08:00 |
|
|
|
bc9c5620f7
|
多商户配置
|
2023-08-15 15:25:00 +08:00 |
|
|
|
932f99b763
|
多商户配置
|
2023-08-15 15:22:43 +08:00 |
|
|
|
9965c66432
|
多商户配置
|
2023-08-15 14:32:49 +08:00 |
|
|
|
7c640f13fb
|
多商户配置
|
2023-08-15 11:02:02 +08:00 |
|
|
|
713e057769
|
Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
|
2023-08-15 09:35:05 +08:00 |
|
|
|
cc9598187f
|
支付占桩订单
|
2023-08-15 09:34:59 +08:00 |
|
Lemon
|
a8eebfe3b5
|
新增 查询用户挂起状态占桩订单
|
2023-08-14 17:09:06 +08:00 |
|
|
|
fdb304c264
|
占桩订单逻辑
|
2023-08-14 16:55:42 +08:00 |
|
|
|
d537e1d995
|
占桩订单逻辑
|
2023-08-14 16:44:39 +08:00 |
|
BOOL\25024
|
e4b04c4462
|
Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
|
2023-08-14 15:44:42 +08:00 |
|
BOOL\25024
|
08da5ea9f8
|
添加单位
|
2023-08-14 15:44:35 +08:00 |
|
Lemon
|
29bc57f228
|
修改 后管充电桩详情页面样式
|
2023-08-14 15:39:23 +08:00 |
|
Lemon
|
a25cd5b993
|
update 订单汇总接口
|
2023-08-14 15:26:03 +08:00 |
|
|
|
fd5420dc78
|
update 记录scenarioType
|
2023-08-14 13:57:58 +08:00 |
|
Lemon
|
d4663a78ae
|
Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
|
2023-08-14 11:41:29 +08:00 |
|
Lemon
|
acef56864e
|
新增 桩实时数据 故障原因字段
|
2023-08-14 11:41:23 +08:00 |
|
|
|
1acf05432f
|
Merge branch 'adapay' into dev
# Conflicts:
# jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
|
2023-08-14 11:31:03 +08:00 |
|
Lemon
|
4edaef6661
|
查询站点地锁列表接口添加过滤条件
|
2023-08-14 11:07:04 +08:00 |
|
