|
|
4027affc6d
|
手动执行退款接口
|
2023-08-30 15:11:13 +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 |
|
|
|
5dcf60ea8a
|
Merge branch 'adapay' into merge_adapay
|
2023-08-30 10:08:31 +08:00 |
|
|
|
1f80d4e479
|
update
|
2023-08-30 09:54:39 +08:00 |
|
|
|
c35e05ba96
|
update
|
2023-08-29 17:05:36 +08:00 |
|
|
|
90539edf60
|
Merge branch 'dev' into merge_adapay
# Conflicts:
# jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java
# jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
|
2023-08-29 17:03:24 +08:00 |
|
Lemon
|
a90fc4f9f3
|
update 支付回调新增占桩逻辑处理、 后管运营商订单报表新增字段
|
2023-08-29 16:40:20 +08:00 |
|
|
|
ae578eada7
|
交易分账 重构
|
2023-08-29 16:03:43 +08:00 |
|
|
|
fd5e13ef1e
|
交易分账 重构
|
2023-08-29 15:53:21 +08:00 |
|
|
|
683c8794d3
|
交易分账 重构
|
2023-08-29 15:06:59 +08:00 |
|
|
|
1a40e284b7
|
交易分账 重构
|
2023-08-29 14:54:41 +08:00 |
|
|
|
f836ddddd2
|
交易分账 重构
|
2023-08-29 08:39:14 +08:00 |
|
|
|
f27bbdd9ff
|
交易分账 重构
|
2023-08-28 19:55:56 +08:00 |
|
|
|
d00686d6e8
|
交易分账 重构
|
2023-08-28 19:53:43 +08:00 |
|
|
|
2a5651a42e
|
交易分账 重构
|
2023-08-28 19:48:46 +08:00 |
|
|
|
5ff4336830
|
交易分账 重构
|
2023-08-28 19:44:39 +08:00 |
|
|
|
9c69160164
|
交易分账 重构
|
2023-08-28 19:41:47 +08:00 |
|
|
|
d742ef1ff1
|
交易分账 重构
|
2023-08-28 19:27:54 +08:00 |
|
|
|
462462a79d
|
交易分账 重构
|
2023-08-28 19:21:41 +08:00 |
|
|
|
6c973bff6f
|
交易分账 重构
|
2023-08-28 19:13:43 +08:00 |
|
|
|
d373d52224
|
交易分账 重构
|
2023-08-28 19:12:04 +08:00 |
|
|
|
2551a9844b
|
update 操作member_adapay_record
|
2023-08-28 19:01:25 +08:00 |
|
