|
|
48d7a35ecb
|
update 计算解冻金额逻辑
|
2023-08-31 18:54:55 +08:00 |
|
|
|
02929edd8b
|
update 计算解冻金额逻辑
|
2023-08-31 18:35:16 +08:00 |
|
|
|
083f078069
|
update 查询订单支付信息
|
2023-08-31 17:46:14 +08:00 |
|
|
|
fa5ecb02dd
|
update 批量订单退款接口
|
2023-08-31 17:31:19 +08:00 |
|
|
|
7fe676efdb
|
Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
|
2023-08-31 16:48:25 +08:00 |
|
|
|
d8f16ac471
|
update 重新计算分账扣除金额
|
2023-08-31 16:47:18 +08:00 |
|
Lemon
|
05b3aa2664
|
Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
|
2023-08-31 16:42:55 +08:00 |
|
Lemon
|
21e41a9e88
|
update
|
2023-08-31 16:42:48 +08:00 |
|
|
|
82e6a5b42a
|
update
|
2023-08-31 16:31:00 +08:00 |
|
|
|
16fa707f32
|
update
|
2023-08-31 16:06:49 +08:00 |
|
|
|
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
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
5c415e42d4
|
update 获取支付delay模式
|
2023-08-30 14:05:34 +08:00 |
|
|
|
1a4e8d638e
|
update 提取公共方法
|
2023-08-30 11:39:55 +08:00 |
|
|
|
cc31572b0f
|
打印日志
|
2023-08-30 11:34: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 |
|
|
|
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 |
|
