Commit Graph

1495 Commits

Author SHA1 Message Date
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
3a76fc63a3 加注释 2023-08-11 17:44:01 +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
bb132a013b update 站点订单列表统计 2023-08-11 16:18:19 +08:00
70dff61eef 查询时间段内订单总金额和总用电量V2 2023-08-11 15:59:26 +08:00
BOOL\25024
de21084aec 修改样式 2023-08-11 15:09:12 +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
Lemon
b27402a7fb update 修改鉴权卡校验规则 2023-08-11 11:39:36 +08:00
7e1117f873 update 优化请求汇付API 2023-08-11 11:29:43 +08:00
6a2ea94ba4 计算余额扣除金额 2023-08-11 11:04:28 +08:00
Lemon
23c7b63a89 后管站点管理页面新增查询地锁列表二维码 2023-08-11 10:56:12 +08:00
Lemon
34e2033e0c update 修改车位号后删除缓存 2023-08-11 09:32:18 +08:00
Lemon
0e0b199fea 新增 小程序查询站点计费模板列表接口 2023-08-10 18:48:50 +08:00
174c1a7ce8 计算余额扣除金额 2023-08-10 17:05:12 +08:00
275962f201 余额支付订单 进行分账处理 2023-08-10 17:03:20 +08:00
Lemon
cd8d934d8f 新增 批量退款临时接口 2023-08-10 15:19:45 +08:00
df776b0466 加剩余金额字段 2023-08-10 15:13:19 +08:00
aa11800f59 支付订单也加入memberId数据;汇付支付成功回调保存member_adapay_record 2023-08-10 14:41:23 +08:00
043f525da4 update 手动结算接口 2023-08-10 13:50:17 +08:00
eefb3a836d update 2023-08-10 10:28:00 +08:00
abfd431a76 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-10 10:22:13 +08:00
bef65b361c update 2023-08-10 10:22:06 +08:00
Lemon
f974c7a63d Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-10 09:40:46 +08:00
Lemon
29806b7bb2 地锁返回控制指令 解析 2023-08-10 09:40:20 +08:00
70def00bde 结算订单逻辑优化 2023-08-09 17:00:00 +08:00
2c3ef69e7e 结算订单逻辑优化 2023-08-09 16:58:50 +08:00
d42097429a 会员汇付支付记录表 2023-08-09 16:55:22 +08:00
ecc95ceee5 update 关闭余额充值功能 2023-08-09 16:37:37 +08:00
d40e0d42fd update 关闭余额充值功能 2023-08-09 16:27:09 +08:00
BOOL\25024
ad87591274 修改element样式 2023-08-09 15:16:18 +08:00
Lemon
a1b6797de1 联联平台 枪口信息添加 车位号字段 2023-08-09 11:49:18 +08:00
Lemon
b8312c6f27 后管站点充电接口页面新增 车位号字段 2023-08-09 11:45:25 +08:00
Lemon
4da4a76899 枪口信息表添加 车位号 字段 2023-08-09 10:28:15 +08:00
Lemon
ef49f16785 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-09 09:30:09 +08:00
Lemon
0b15319e4a 联联平台添加停车场库编号字段 2023-08-09 09:29:55 +08:00
2282877415 手动执行订单分账 2023-08-09 09:22:24 +08:00
2ff37b957b Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-09 08:36:57 +08:00
82d6607586 打印日志 2023-08-09 08:36:51 +08:00
Lemon
2e175466b0 update 2023-08-08 16:57:32 +08:00
Lemon
a6d45d1c4f Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-08 16:56:41 +08:00