|
|
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 |
|
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 |
|
