Commit Graph

187 Commits

Author SHA1 Message Date
59ef031100 update 2023-10-26 11:48:03 +08:00
95851c9d4e update 校验支付单 2023-10-24 16:56:44 +08:00
a4352ebc64 update 校验支付单 2023-10-24 14:49:49 +08:00
7dabdf73ec update 校验支付单 2023-10-24 13:14:33 +08:00
Lemon
bd0a9d6dac update 江苏省平台接口 2023-10-19 11:21:02 +08:00
3f4652882f update 2023-10-13 14:57:28 +08:00
aef44dcce9 update 修改校验分账的方法 2023-10-11 17:01:23 +08:00
e25f6b1b9a update 2023-10-08 16:42:56 +08:00
1bb9efc745 优化余额支付订单 2023-09-28 16:48:24 +08:00
8153b60610 update 2023-09-28 09:16:44 +08:00
2ea1fa0063 update 2023-09-27 11:25:01 +08:00
530e1d11d7 update 2023-09-26 15:41:05 +08:00
c82bf916c2 update 2023-09-25 16:08:30 +08:00
dac7296ac3 update 2023-09-25 15:50:16 +08:00
2a6abe7341 update 2023-09-25 15:05:12 +08:00
ed9e316e53 update 分账逻辑 2023-09-20 14:57:59 +08:00
74cf20b8a5 update 计算退款金额 2023-09-14 17:36:45 +08:00
054b0e9e7d update 2023-09-11 16:43:26 +08:00
c3c072d2a7 update 地锁逻辑修改 2023-09-09 15:05:37 +08:00
1d88617168 Merge branch 'adapay' into merge_adapay
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
2023-09-08 15:50:51 +08:00
aa345ee629 Merge branch 'dev' into merge_adapay
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
#	jsowell-admin/src/main/resources/application-dev.yml
2023-09-08 15:48:57 +08:00
9b7a5897a4 update 2023-09-08 14:26:13 +08:00
262cf27d8f update 2023-09-06 14:30:06 +08:00
9a47834e7f update 2023-09-05 08:42:05 +08:00
fbe64887f5 update 订单逻辑改造工厂模式 2023-09-01 15:45:04 +08:00
02929edd8b update 计算解冻金额逻辑 2023-08-31 18:35:16 +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
6dabf90018 update手动执行退款接口 2023-08-30 16:00:24 +08:00
Lemon
39087d9b10 单元测试 在线支付订单、退款 2023-08-30 11:02:18 +08:00
Lemon
cdf00d4c67 新增 订单流程测试方法 2023-08-30 10:13:56 +08:00
ae578eada7 交易分账 重构 2023-08-29 16:03:43 +08:00
1a40e284b7 交易分账 重构 2023-08-29 14:54:41 +08:00
2551a9844b update 操作member_adapay_record 2023-08-28 19:01:25 +08:00
2f1900e65b 交易分账 重构 2023-08-28 16:49:48 +08:00
8a2326f300 订单分账逻辑 2023-08-26 14:09:04 +08:00
7babd6b9ef update 订单分账逻辑 2023-08-26 09:48:00 +08:00
033ddb40e7 update 实时分账 2023-08-25 16:07:15 +08:00
867c8240c5 余额支付订单分账工具 2023-08-24 17:23:33 +08:00
Lemon
318f46123e 新增 路通云停平台 给车辆绑定优惠券接口 2023-08-24 10:33:26 +08:00
f70a26e714 Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev 2023-08-23 14:31:51 +08:00
763022ef49 update 新增会员id字段 2023-08-23 14:31:45 +08:00
Lemon
7bcab6a65a 新增 路通云停系统获取令牌接口 2023-08-23 14:13:11 +08:00
295d11ea62 查询支付确认对象列表 2023-08-21 16:19:33 +08:00
ed2f57214a 手动变更银行卡信息 2023-08-21 15:37:00 +08:00
3f5d0f4283 手动创建结算账户 2023-08-21 14:49:22 +08:00
3893afaa06 汇付基础响应 2023-08-21 13:20:17 +08:00
3035fdb08f 查询支付确认对象列表 2023-08-21 08:52:32 +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