Commit Graph

401 Commits

Author SHA1 Message Date
cb8ee1276e update 日志保留60天;历史日志压缩处理 2023-05-22 14:57:36 +08:00
c2431a7456 记录支付机构 2023-05-22 14:27:11 +08:00
210de7cabf Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-05-22 13:57:24 +08:00
de76a5d456 记录支付机构 2023-05-22 13:57:12 +08:00
ae07c614d0 新增支付机构字段 2023-05-22 13:51:46 +08:00
Lemon
c384186097 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-05-22 13:50:42 +08:00
Lemon
7ff3db1141 add 联联平台 推送订单结算信息、查询订单结算信息 接口 2023-05-22 13:50:19 +08:00
71329f7461 新增支付机构字段 2023-05-22 13:50:01 +08:00
a8cc05b588 新增工具类 2023-05-22 11:57:33 +08:00
10567b53dd update 会员发票抬头默认标识 2023-05-22 11:10:51 +08:00
744af029a2 update 2023-05-22 10:06:15 +08:00
a15b61eabe 会员发票抬头设置默认 2023-05-20 17:06:13 +08:00
a010dc05b2 会员发票抬头设置默认 2023-05-20 16:42:50 +08:00
a21fb4f736 会员发票抬头设置默认 2023-05-20 16:25:24 +08:00
1fe9641297 申请开票 添加接收发票联系方式 2023-05-20 16:05:08 +08:00
Lemon
d325f641b0 add 联联平台推送充电订单信息 接口 2023-05-20 15:26:28 +08:00
Lemon
28783dbc65 add 联联平台推送停止充电结果 接口 2023-05-20 13:55:00 +08:00
ae9dae20c3 保存汇付支付回调信息 2023-05-20 11:42:08 +08:00
cd3565bd80 保存汇付支付回调信息 2023-05-20 11:36:46 +08:00
f764d4274a 保存汇付支付回调信息 2023-05-20 11:35:01 +08:00
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