Commit Graph

285 Commits

Author SHA1 Message Date
Lemon
22e2cd2f02 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-22 17:15:43 +08:00
Lemon
eaf23c2253 update 2023-08-22 17:15:35 +08:00
1797066dd6 update 2023-08-22 17:14:52 +08:00
b211475239 update 2023-08-22 17:12:46 +08:00
b03c196109 update 2023-08-22 17:12:15 +08:00
43f26cd860 查询未分账订单 2023-08-22 15:06:13 +08:00
0c251260ad 查询未分账订单 2023-08-22 14:01:17 +08:00
Lemon
f7eed5ed50 update 2023-08-22 11:12:29 +08:00
Lemon
5ea2ec624b update 占桩订单列表页实现分页 2023-08-21 17:12:53 +08:00
Lemon
bfb9717912 update 后管计费模板页面 2023-08-21 14:38:30 +08:00
Lemon
b9da264581 新增 查询占桩订单费用相关接口 2023-08-19 14:07:42 +08:00
Lemon
85a5ee66d8 新增 查询占桩订单详情接口 2023-08-19 10:17:09 +08:00
739964eb03 update 打印日志 2023-08-18 17:02:10 +08:00
1717dc5e2f 打印日志 2023-08-18 17:01:10 +08:00
acf5c8bd31 打印日志 2023-08-18 16:56:53 +08:00
Lemon
03f84c3a11 新增 占桩订单相关接口 2023-08-18 16:17:28 +08:00
31c295ee90 生成占桩订单 2023-08-18 12:02:34 +08:00
Lemon
5bf5ffc3b7 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java
2023-08-18 11:42:26 +08:00
Lemon
00cfd77eeb 新增 占桩订单相关接口 2023-08-18 11:40:23 +08:00
09f1588a99 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java
2023-08-18 11:14:21 +08:00
Lemon
74af1bba60 新增 占桩订单相关接口 2023-08-18 10:15:56 +08:00
af2cc4b70f Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-18 09:52:21 +08:00
4af9c7a184 支付占桩订单 2023-08-18 09:52:12 +08:00
Lemon
128a2e76e3 update 小程序查询充电站列表 2023-08-18 09:27:22 +08:00
91cb64a4d9 汇付API 新增merchantKey 2023-08-17 17:12:17 +08:00
Lemon
f651383a87 第三方小程序查询站点列表添加查询运营商id校验 2023-08-17 15:42:38 +08:00
999b7a704c update 重试订单退款接口 2023-08-17 14:25:45 +08:00
8caab85abe update 创建撤销请求,放入扩展字段 2023-08-17 12:05:21 +08:00
ae5f0d8faf update 支付时获取对应的支付配置 2023-08-17 11:55:14 +08:00
c818f8445e update 汇付支付添加merchantKey 2023-08-17 11:19:04 +08:00
70a16ae804 update 汇付退款添加merchantKey 2023-08-17 11:16:32 +08:00
705a495bc1 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-17 10:07:35 +08:00
3df559d438 update 汇付余额退款 2023-08-17 10:07:28 +08:00
Lemon
b2fe5fcc99 update 充值余额接口获取openid通过数据库获取 2023-08-16 14:44:03 +08:00
253a527b7b 多商户配置 2023-08-15 15:53:37 +08:00
935f45938c 多商户配置 2023-08-15 15:42:39 +08:00
cc9598187f 支付占桩订单 2023-08-15 09:34:59 +08:00
1acf05432f Merge branch 'adapay' into dev
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
2023-08-14 11:31:03 +08:00
3a76fc63a3 加注释 2023-08-11 17:44:01 +08:00
94c20bbc68 批量会员余额退款 2023-08-11 17:13:43 +08:00
7e1117f873 update 优化请求汇付API 2023-08-11 11:29:43 +08:00
Lemon
23c7b63a89 后管站点管理页面新增查询地锁列表二维码 2023-08-11 10:56:12 +08:00
Lemon
0e0b199fea 新增 小程序查询站点计费模板列表接口 2023-08-10 18:48:50 +08:00
Lemon
cd8d934d8f 新增 批量退款临时接口 2023-08-10 15:19:45 +08:00
ecc95ceee5 update 关闭余额充值功能 2023-08-09 16:37:37 +08:00
d40e0d42fd update 关闭余额充值功能 2023-08-09 16:27:09 +08:00
4ddcece893 打印日志 2023-08-08 16:47:45 +08:00
ae05198fdb 手动执行订单分账 2023-08-08 15:50:22 +08:00
cb534520b3 update 2023-08-05 16:15:20 +08:00
Lemon
385c2c9781 新增 根据站点id查询地锁信息接口 2023-08-05 13:15:02 +08:00