Commit Graph

367 Commits

Author SHA1 Message Date
a6fb166e09 Merge branch 'dev' into HuiFu
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
#	jsowell-admin/src/test/java/SpringBootTestController.java
2023-05-17 16:43:07 +08:00
2bace785c1 update 新增回调地址 2023-05-17 16:25:54 +08:00
cf64370cef update 新增回调地址 2023-05-17 15:59:16 +08:00
6ff244fa24 update 添加汇付支付回调接口 2023-05-17 10:46:18 +08:00
22a54aab7f 添加汇付支付回调接口 2023-05-17 10:14:15 +08:00
4298e62ced 汇付 支付回调接口 2023-05-17 09:40:00 +08:00
a4e271eabb 汇付 支付回调接口 2023-05-17 09:37:51 +08:00
cf8b303478 update huifu 2023-05-16 17:14:21 +08:00
6ae3530907 update huifu 2023-05-16 16:31:23 +08:00
eef6af1c6c update huifu 2023-05-16 16:24:26 +08:00
Lemon
7b2a3fe20e add 推送联联平台设备状态变更接口 2023-05-16 15:04:08 +08:00
87666032b2 Merge branch 'dev' into HuiFu 2023-05-16 14:22:34 +08:00
d465afbc1e update 申请开票 2023-05-16 14:11:12 +08:00
d17b4ffa5d update 申请开票 2023-05-16 14:09:58 +08:00
d80b84af58 update huifu 2023-05-16 14:01:34 +08:00
Lemon
c2cc46d668 update 联联平台接口 2023-05-16 10:10:34 +08:00
JS-LM
7cf38df2a3 未使用以及恢复首页原有样式 2023-05-16 09:21:39 +08:00
41cb7dda4c update huifu 2023-05-15 14:55:33 +08:00
Lemon
27003fb208 update 调用联联平台接口 2023-05-15 14:54:43 +08:00
Lemon
77a6abf224 update 2023-05-15 14:53:54 +08:00
Lemon
dd6396e9c9 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
# Conflicts:
#	jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java
2023-05-15 10:30:53 +08:00
Lemon
fb260eb68d update 联联平台接口 2023-05-15 10:30:16 +08:00
ea6be0da90 Merge branch 'dev' into HuiFu 2023-05-15 08:22:10 +08:00
dd59ce9348 update 查询首页数据 2023-05-13 17:51:16 +08:00
42d206e446 update 查询首页数据 2023-05-13 17:41:05 +08:00
3f8405d3d2 update 加日志 2023-05-13 17:19:10 +08:00
70839dcc5b update 加日志 2023-05-13 17:13:24 +08:00
375f364fb2 update 加日志 2023-05-13 17:10:52 +08:00
65429a44f0 update 汇付 2023-05-13 17:09:11 +08:00
9d9b9e1c8c update 开票记录页面优化 2023-05-12 15:57:29 +08:00
3e902a42c1 优化登录认证逻辑 2023-05-12 15:45:44 +08:00
738c9fde3d update 开票详情页面 2023-05-12 15:31:06 +08:00
8713d82961 update 优化订单金额展示 2023-05-12 15:03:29 +08:00
93f48823ab update 开票详情页面 2023-05-12 11:37:45 +08:00
92b595b324 update 开票详情页面 2023-05-12 11:21:13 +08:00
JS-LM
f56beeb292 开票订单详情 2023-05-12 11:20:13 +08:00
93bfdf0184 update 开票详情页面 2023-05-12 10:30:18 +08:00
162e6c1d3b update huifu 2023-05-11 16:45:44 +08:00
54d0f728c4 update huifu 2023-05-11 16:37:41 +08:00
61c6d1b486 update huifu 2023-05-11 15:39:15 +08:00
2ef229e50c Merge branch 'dev' into HuiFu
# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java
#	jsowell-pile/pom.xml
2023-05-11 15:00:36 +08:00
e50be067ae update订单实时数据保存到数据库 2023-05-10 16:39:55 +08:00
4738a7b0ce 订单实时数据保存到数据库 2023-05-10 16:34:56 +08:00
5c1c3777a7 update 2023-05-10 16:06:53 +08:00
4a753f7656 订单实时数据保存到数据库 2023-05-10 16:03:11 +08:00
11240e08dc 订单实时数据保存到数据库 2023-05-10 15:38:24 +08:00
92610695b2 update 2023-05-10 15:19:34 +08:00
9f2537f82d update 订单实时记录 2023-05-10 15:13:07 +08:00
fb768cd7a2 update 订单实时记录 2023-05-10 15:02:43 +08:00
daa178b87a 订单实时记录 2023-05-10 15:01:29 +08:00