Commit Graph

1090 Commits

Author SHA1 Message Date
Lemon
40e374a81b update 财务管理页面添加筛选参数 2023-09-16 16:09:46 +08:00
Lemon
e524a81493 update 财务中心查询接口新增字段、增加搜索 2023-09-16 13:45:22 +08:00
2fe34b5bf7 update 后管订单详情页查询退款信息 2023-09-15 14:25:51 +08:00
cadfa31c98 update 订单退款明细 2023-09-15 14:00:45 +08:00
923aaa3537 update 添加注释 2023-09-15 11:30:30 +08:00
Lemon
dfe202777b update 桩登录时更新sim卡信息方法 2023-09-15 10:55:14 +08:00
baadc30727 update 登录更新sim卡信息 2023-09-15 10:02:20 +08:00
Lemon
93ce2f3759 新增 更新sim卡信息V2 2023-09-15 09:39:41 +08:00
28e5a51d88 update 计算退款金额 2023-09-14 17:41:14 +08:00
74cf20b8a5 update 计算退款金额 2023-09-14 17:36:45 +08:00
95692dee45 update 计算退款金额 2023-09-14 15:44:13 +08:00
727baadce3 update 添加启用注解 2023-09-14 14:32:57 +08:00
Lemon
9dd3835ad5 新增 中电联推送站点信息数据接口 2023-09-14 10:13:50 +08:00
Lemon
6dc6e8ab05 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-09-13 14:15:26 +08:00
Lemon
53686f2b93 小程序扫二维码时判断桩、枪口状态并返回对应的信息 2023-09-13 14:15:19 +08:00
00414e2bec 修改缓存时间 2023-09-13 14:09:12 +08:00
063dd155d2 update 2023-09-13 09:11:15 +08:00
cd7a4a0636 update 打印日志 2023-09-12 16:08:56 +08:00
e921406d95 update 解析扣款记录bug 2023-09-12 15:35:45 +08:00
403a407f0f update 退款失败 2023-09-12 09:05:26 +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
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
5b6f1c24ad update 地锁逻辑修改 2023-09-09 15:53:49 +08:00
c3c072d2a7 update 地锁逻辑修改 2023-09-09 15:05:37 +08:00
Lemon
147a5df11b update 修改费率页面回显占桩费率 2023-09-09 10:45:14 +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
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
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
39e0463d35 地锁列表新增车位号字段 2023-09-05 09:43:19 +08:00