Commit Graph

381 Commits

Author SHA1 Message Date
cd4d2b7cc0 修改为15天内可开发票 2023-05-20 11:14:33 +08:00
f16ebacda9 保存汇付支付回调信息 2023-05-20 10:53:49 +08:00
4d9135869e add 汇付支付回调表 2023-05-20 10:21:04 +08:00
0dcb78d3a3 add 汇付支付回调表 2023-05-20 10:19:20 +08:00
c8da3c3ba6 Merge branch 'HuiFu' into dev
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
2023-05-20 10:16:32 +08:00
Lemon
5004a3fb31 add 联联平台推送充电状态接口 2023-05-19 15:24:53 +08:00
Lemon
26983a58c5 add 联联平台推送启动充电结果接口 2023-05-19 15:03:26 +08:00
a3f096ab80 update 查询未开发票站点列表 2023-05-18 17:24:13 +08:00
d0dc2e64c2 update 查询未开发票订单,新增站点id条件 2023-05-18 17:07:02 +08:00
f04d92af37 update 汇付 2023-05-18 16:31:47 +08:00
1cd9c7d770 update 汇付 充值会员余额 2023-05-18 16:25:48 +08:00
eb5a39c7dc update 汇付 充值会员余额 2023-05-18 16:01:13 +08:00
27bec35c7c Merge branch 'dev' into HuiFu 2023-05-18 15:35:56 +08:00
Lemon
37ddfc0593 add 联联平台 推送订单信息接口 2023-05-17 17:25:35 +08:00
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