Commit Graph

879 Commits

Author SHA1 Message Date
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
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
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
Lemon
2f1116d016 小程序查询枪口列表接口添加 故障原因字段 2023-08-12 16:56:11 +08:00
3f15daee24 加注释 2023-08-11 17:18:21 +08:00
94c20bbc68 批量会员余额退款 2023-08-11 17:13:43 +08:00
7d4a3540e6 update 统计订单数据 2023-08-11 17:02:07 +08:00
70dff61eef 查询时间段内订单总金额和总用电量V2 2023-08-11 15:59:26 +08:00
Lemon
74e4eb3c37 update 查询地锁列表接口 2023-08-11 14:45:07 +08:00
0382fe1edd 优化订单退款逻辑 2023-08-11 14:20:00 +08:00
Lemon
4026f068de update 修改鉴权卡校验规则 2023-08-11 11:56:09 +08:00
cd1d2f6747 优化订单退款逻辑 2023-08-11 11:44:55 +08:00
7e1117f873 update 优化请求汇付API 2023-08-11 11:29:43 +08:00