Commit Graph

1861 Commits

Author SHA1 Message Date
BOOL\25024
0187f81fa5 手动结算不能重复操作 2023-09-13 09:09:51 +08:00
cd7a4a0636 update 打印日志 2023-09-12 16:08:56 +08:00
e921406d95 update 解析扣款记录bug 2023-09-12 15:35:45 +08:00
7fd344f194 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-09-12 15:31:20 +08:00
c994fa6eff update 打印日志 2023-09-12 09:22:07 +08:00
BOOL\25024
9066fa1831 修改充电订单详情不显示bug 2023-09-12 09:19:06 +08:00
403a407f0f update 退款失败 2023-09-12 09:05:26 +08:00
409227bbb1 update 打印日志 2023-09-12 08:48:58 +08:00
919db803f1 update 打印日志 2023-09-12 08:33:45 +08:00
d9bbc35840 update 打印日志 2023-09-12 08:27:29 +08:00
84ad3c900d Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-09-11 16:43:34 +08:00
054b0e9e7d update 2023-09-11 16:43:26 +08:00
Lemon
52aba7f812 小程序端接口添加停车费率描述字段 2023-09-11 11:17:40 +08:00
5766581afb update merchantId 2023-09-11 11:16:55 +08:00
23819f605f Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-09-11 10:54:47 +08:00
2066c9948b update 2023-09-11 10:54:41 +08:00
Lemon
c8fc02ce0a bugfix 修改sim卡信息报错 2023-09-11 10:19:10 +08:00
Lemon
6d736cb2f2 占桩订单列表页 排序 2023-09-11 10:12:28 +08:00
Lemon
daf8642162 update 2023-09-11 10:10:22 +08:00
Lemon
0764ebbc43 update 后管占桩订单页面 2023-09-11 09:21:55 +08:00
Lemon
660e666f93 站点新增 停车费率描述字段 2023-09-11 08:58:33 +08:00
Lemon
ed1699b9ab 站点信息添加 停车费率描述字段 2023-09-11 08:38:55 +08:00
Lemon
3b5ac96f1c 中电联接口 2023-09-11 08:29:15 +08:00
5b6f1c24ad update 地锁逻辑修改 2023-09-09 15:53:49 +08:00
BOOL\25024
594a56e03f 占桩订单 2023-09-09 15:16:22 +08:00
1726ecb480 update 地锁逻辑修改 2023-09-09 15:13:56 +08:00
c3c072d2a7 update 地锁逻辑修改 2023-09-09 15:05:37 +08:00
Lemon
147a5df11b update 修改费率页面回显占桩费率 2023-09-09 10:45:14 +08:00
Lemon
a28f274eec 中电联 查询站、桩、枪口信息接口、统计信息接口 2023-09-09 09:14:18 +08:00
7ec68cdb26 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-09-08 16:00:25 +08:00
Lemon
632a8dfcdb Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-09-08 15:51:23 +08:00
Lemon
a89d7e7ec0 update 使占桩订单免费/修改订单金额 2023-09-08 15:51:16 +08:00
1d88617168 Merge branch 'adapay' into merge_adapay
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
2023-09-08 15:50:51 +08:00
aa345ee629 Merge branch 'dev' into merge_adapay
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
#	jsowell-admin/src/main/resources/application-dev.yml
2023-09-08 15:48:57 +08:00
cc1fd3fafd update 地锁逻辑修改 2023-09-08 15:48:07 +08:00
9b7a5897a4 update 2023-09-08 14:26:13 +08:00
Lemon
43364537d3 update 2023-09-08 09:42:16 +08:00
Lemon
a36243ef78 update 中电联service 2023-09-08 09:31:03 +08:00
Lemon
557fa69811 新增占桩订单后管页面 2023-09-08 09:30:43 +08:00
Lemon
72699df4dc update 新增日志 2023-09-07 14:01:10 +08:00
Lemon
2f929d465b Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-09-06 14:55:21 +08:00
Lemon
cae981e390 新增 修改站点运营商时,将订单列表中的运营商id也进行修改 2023-09-06 14:55:14 +08:00
f23efa6069 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-09-06 14:30:12 +08:00
262cf27d8f update 2023-09-06 14:30:06 +08:00
Lemon
e1fa596818 后管平台测试员按钮添加权限校验 2023-09-06 11:18:38 +08:00
Lemon
36e7e025ab 添加字段 2023-09-06 10:35:17 +08:00
Lemon
98c92256f7 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-09-06 09:35:46 +08:00
Lemon
ad018e22f4 update 2023-09-06 09:35:39 +08:00
8befe2d745 update 2023-09-05 16:42:33 +08:00
Lemon
f1947e859f update 新增中电联相关实体 2023-09-05 15:53:16 +08:00