Commit Graph

1757 Commits

Author SHA1 Message Date
f8e2ee3c65 update 2023-08-31 15:16:45 +08:00
8034a73b63 update 重试退款接口 2023-08-31 14:55:30 +08:00
58fb45e6dd update 打印日志 2023-08-31 14:18:36 +08:00
6b658e5594 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-31 14:06:35 +08:00
6e2b769dbb update 生成订单,校验小程序所属运营商 2023-08-31 14:06:25 +08:00
Lemon
16be76995e update 2023-08-31 13:17:31 +08:00
Lemon
789b9d729f Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-31 11:21:48 +08:00
Lemon
f31dc8dfe7 update 添加字段 2023-08-31 11:21:41 +08:00
acff945822 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-31 10:30:12 +08:00
2138eeaad0 订单支付记录 给默认值 2023-08-31 10:30:05 +08:00
Lemon
73b203dd44 update 后管订单详情页面中 实时订单数据添加字段 2023-08-31 10:29:17 +08:00
Lemon
8bfd87232c bugfix 修复余额支付订单数据类型转换异常 2023-08-31 09:59:30 +08:00
cea0fb2821 update 打印日志 2023-08-31 09:15:20 +08:00
fd9aa59077 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-31 08:52:46 +08:00
40c3d7cc86 update 创建对公账户 2023-08-31 08:52:40 +08:00
Lemon
da1e767120 update 2023-08-30 16:23:02 +08:00
6dabf90018 update手动执行退款接口 2023-08-30 16:00:24 +08:00
Lemon
2728ce36b1 update 2023-08-30 15:49:37 +08:00
818177baf8 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-30 15:11:37 +08:00
4027affc6d 手动执行退款接口 2023-08-30 15:11:13 +08:00
admin-lmm
1729ace91d 修改站点详情页面 2023-08-30 15:07:33 +08:00
admin-lmm
e41e37be27 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-30 15:04:12 +08:00
admin-lmm
ca21baa343 修改站点详情订单页面 2023-08-30 15:02:00 +08:00
be29c2423d 手动执行退款接口 2023-08-30 15:01:26 +08:00
Lemon
9ca633dcaf update 2023-08-30 14:51:38 +08:00
5bb0b73e38 手动执行退款接口 2023-08-30 14:50:11 +08:00
79fea56097 手动执行退款接口 2023-08-30 14:39:39 +08:00
Lemon
a5efd1e690 update 2023-08-30 14:30:16 +08:00
Lemon
0bcec90e91 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-30 14:29:46 +08:00
Lemon
41861273ca update 生成占桩订单草稿单时无需支付 2023-08-30 14:29:35 +08:00
7726384036 手动执行退款接口 2023-08-30 14:18:34 +08:00
b3c8b5b1a5 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-30 14:05:40 +08:00
5c415e42d4 update 获取支付delay模式 2023-08-30 14:05:34 +08:00
Lemon
fb7494ac06 update 2023-08-30 14:01:22 +08:00
Lemon
2fa13dbeeb update 根据银行编码获取银行名称 2023-08-30 13:56:50 +08:00
Lemon
6a865fce8a update 规范城市银行代码文件名 2023-08-30 13:50:30 +08:00
Lemon
6eafd11c3a update 运营商运营报表按时间倒序排序 2023-08-30 13:14:04 +08:00
admin-lmm
7aef470fd5 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-30 11:55:40 +08:00
admin-lmm
80a67f92fa 添加加载状态 2023-08-30 11:55:30 +08:00
a9c50fb19c update 交易确认接口 2023-08-30 11:40:31 +08:00
1a4e8d638e update 提取公共方法 2023-08-30 11:39:55 +08:00
cc31572b0f 打印日志 2023-08-30 11:34:45 +08:00
903aa47ab8 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-30 11:22:25 +08:00
admin-lmm
056cee5e33 修改运营商,以及财务中心页面 2023-08-30 11:21:45 +08:00
c284445ce1 Merge branch 'adapay' into merge_adapay
# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java
2023-08-30 11:19:54 +08:00
e76e1109f6 Merge branch 'adapay' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into adapay 2023-08-30 11:18:58 +08:00
Lemon
39087d9b10 单元测试 在线支付订单、退款 2023-08-30 11:02:18 +08:00
7b468d11fe 非延时分账商户 逻辑 2023-08-30 10:18:09 +08:00
Lemon
6ae0503956 Merge branch 'adapay' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into adapay 2023-08-30 10:14:03 +08:00
Lemon
cdf00d4c67 新增 订单流程测试方法 2023-08-30 10:13:56 +08:00