Commit Graph

775 Commits

Author SHA1 Message Date
b790782f9c update 后管订单列表新增字段 2023-05-24 11:52:30 +08:00
3db605c559 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-05-24 11:20:43 +08:00
5f08a316b6 update 后管订单列表新增字段 2023-05-24 11:19:16 +08:00
Lemon
2f2107fc89 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-05-24 10:56:02 +08:00
Lemon
57fc7e2d98 新增 用户解绑鉴权卡接口 2023-05-24 10:55:55 +08:00
dd3692ce1b update 新增虚拟金额和结算金额字段 2023-05-24 10:52:18 +08:00
b3bf3ae11d Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-05-24 10:25:18 +08:00
9565d465fa 订单主表新增虚拟金额和结算金额字段 2023-05-24 10:25:10 +08:00
Lemon
6d7a390e39 新增 用户绑定鉴权卡 2023-05-24 09:58:01 +08:00
5fdd80a36d 删除发票抬头信息 2023-05-24 09:06:10 +08:00
Lemon
50c26169e9 add 小程序查询用户鉴权卡列表接口 2023-05-24 08:46:20 +08:00
45cf7d84f6 修改发票抬头信息 2023-05-23 10:59:16 +08:00
7ca2854b2d update 申请开票 2023-05-23 10:52:58 +08:00
fcdd9134ff update 会员发票抬头 新增电子邮箱字段 2023-05-23 09:02:58 +08:00
Lemon
4890717e17 update 支付方式 2023-05-22 16:18:47 +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
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
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
ae9dae20c3 保存汇付支付回调信息 2023-05-20 11:42:08 +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
a3f096ab80 update 查询未开发票站点列表 2023-05-18 17:24:13 +08:00
d0dc2e64c2 update 查询未开发票订单,新增站点id条件 2023-05-18 17:07:02 +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
22a54aab7f 添加汇付支付回调接口 2023-05-17 10:14:15 +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
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
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