Commit Graph

175 Commits

Author SHA1 Message Date
de76a5d456 记录支付机构 2023-05-22 13:57:12 +08:00
a21fb4f736 会员发票抬头设置默认 2023-05-20 16:25:24 +08:00
Lemon
d325f641b0 add 联联平台推送充电订单信息 接口 2023-05-20 15:26:28 +08:00
Lemon
28783dbc65 add 联联平台推送停止充电结果 接口 2023-05-20 13:55:00 +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
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
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
d80b84af58 update huifu 2023-05-16 14:01:34 +08:00
41cb7dda4c update huifu 2023-05-15 14:55:33 +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
65429a44f0 update 汇付 2023-05-13 17:09:11 +08:00
8713d82961 update 优化订单金额展示 2023-05-12 15:03:29 +08:00
92b595b324 update 开票详情页面 2023-05-12 11:21:13 +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
4a753f7656 订单实时数据保存到数据库 2023-05-10 16:03:11 +08:00
Lemon
d2eed9ad3a add 联联平台相关工具类 2023-05-10 08:49:01 +08:00
a045fe9315 update 2023-05-10 08:19:44 +08:00
4b81a9b28c Merge branch 'dev' into HuiFu 2023-05-09 11:34:41 +08:00
97db024485 update 2023-05-08 13:57:39 +08:00
Lemon
01413c81e4 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-05-08 10:38:11 +08:00
Lemon
ff389a69d7 update 2023-05-08 10:38:02 +08:00
911205aef2 update 空指针异常bugfix 2023-05-08 09:38:24 +08:00
e2d7c984c4 update 查询会员sql 2023-05-06 17:05:20 +08:00
4e97caf912 update 防止会员id重复 2023-05-06 16:02:25 +08:00
7b55dc7e76 update 订单详情 new收费明细 2023-05-06 15:28:16 +08:00
c2e5784caa update 订单详情 new收费明细 2023-05-05 16:46:43 +08:00
5c40257dcb update 图片上传 2023-05-04 09:35:10 +08:00
2a9d56cad2 update 图片上传 2023-05-04 09:28:06 +08:00
Lemon
b4f852fe03 update 2023-04-29 13:40:15 +08:00