Commit Graph

760 Commits

Author SHA1 Message Date
ed9e316e53 update 分账逻辑 2023-09-20 14:57:59 +08:00
a35ca2e74a update 打印日志 2023-09-20 14:01:21 +08:00
9d77f5bd98 修改基础url前缀 2023-09-20 09:30:08 +08:00
b7102b7950 修改基础url前缀 2023-09-20 09:22:27 +08:00
79e0dcb259 update 打印日志 2023-09-19 10:38:48 +08:00
428ebe2209 修改测试服务器redis 2023-09-16 16:48:52 +08:00
937bc4fa14 修改测试服务器redis 2023-09-16 16:32:53 +08:00
837381b4b4 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-09-16 14:46:53 +08:00
4e8c75a9f3 修改测试服务器mysql地址 2023-09-16 14:46:45 +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
Lemon
595a03d0cc update 修改/新增鉴权卡新增运营商字段 2023-09-15 10:46:45 +08:00
74cf20b8a5 update 计算退款金额 2023-09-14 17:36:45 +08:00
Lemon
392979186d 新增 中电联controller 2023-09-14 16:02:49 +08:00
727baadce3 update 添加启用注解 2023-09-14 14:32:57 +08:00
fcbfff7d52 update 更新系统用户信息 2023-09-14 14:03:52 +08:00
Lemon
9dd3835ad5 新增 中电联推送站点信息数据接口 2023-09-14 10:13:50 +08:00
Lemon
11246b0496 扫描枪口二维码判断枪口状态是否插枪 2023-09-14 08:40:51 +08:00
Lemon
226edbbbb9 update 2023-09-13 15:47:15 +08:00
Lemon
3551a38841 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-09-13 15:23:15 +08:00
Lemon
318f7a35ac 修复 联联推送订单bug 2023-09-13 15:23:01 +08:00
ea71b3d01b 打印日志 2023-09-13 15:15:44 +08:00
Lemon
53686f2b93 小程序扫二维码时判断桩、枪口状态并返回对应的信息 2023-09-13 14:15:19 +08:00
919db803f1 update 打印日志 2023-09-12 08:33:45 +08:00
054b0e9e7d update 2023-09-11 16:43:26 +08:00
2066c9948b update 2023-09-11 10:54:41 +08:00
Lemon
0764ebbc43 update 后管占桩订单页面 2023-09-11 09:21:55 +08:00
5b6f1c24ad update 地锁逻辑修改 2023-09-09 15:53:49 +08:00
c3c072d2a7 update 地锁逻辑修改 2023-09-09 15:05:37 +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
9b7a5897a4 update 2023-09-08 14:26:13 +08:00
Lemon
557fa69811 新增占桩订单后管页面 2023-09-08 09:30:43 +08:00
Lemon
72699df4dc update 新增日志 2023-09-07 14:01:10 +08:00
262cf27d8f update 2023-09-06 14:30:06 +08:00
8befe2d745 update 2023-09-05 16:42:33 +08:00
Lemon
f1947e859f update 新增中电联相关实体 2023-09-05 15:53:16 +08:00
37bc31a6f6 update
(cherry picked from commit de3fe081f8)
2023-09-05 15:50:25 +08:00
de3fe081f8 update 2023-09-05 15:44:25 +08:00
9a47834e7f update 2023-09-05 08:42:05 +08:00
64b2122d1a update订单逻辑改造工厂模式 2023-09-04 16:25:59 +08:00
f6621a9a22 update订单逻辑改造工厂模式 2023-09-04 15:37:43 +08:00
b82ae004bb update订单逻辑改造工厂模式 2023-09-04 11:43:22 +08:00
24b6e757d1 update 修改测试数据库地址 2023-09-02 16:38:02 +08:00
0677ba321b update 修改测试数据库地址 2023-09-02 16:26:32 +08:00
1a490c3b75 update 修改测试数据库地址 2023-09-02 15:55:56 +08:00