|
|
cadfa31c98
|
update 订单退款明细
|
2023-09-15 14:00:45 +08:00 |
|
|
|
727baadce3
|
update 添加启用注解
|
2023-09-14 14:32:57 +08:00 |
|
|
|
919db803f1
|
update 打印日志
|
2023-09-12 08:33:45 +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 |
|
|
|
37bc31a6f6
|
update
(cherry picked from commit de3fe081f8)
|
2023-09-05 15:50:25 +08:00 |
|
|
|
45af011278
|
update 订单逻辑改造工厂模式
|
2023-09-01 17:29:59 +08:00 |
|
|
|
fbe64887f5
|
update 订单逻辑改造工厂模式
|
2023-09-01 15:45:04 +08:00 |
|
|
|
0ce2746a24
|
update订单逻辑改造工厂模式
|
2023-09-01 14:51:39 +08:00 |
|
|
|
545badd38b
|
update订单逻辑改造工厂模式
|
2023-09-01 11:41:37 +08:00 |
|
|
|
b53aedb423
|
update订单逻辑改造工厂模式
|
2023-09-01 11:36:31 +08:00 |
|
|
|
f8e2ee3c65
|
update
|
2023-08-31 15:16:45 +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 |
|
|
|
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 |
|
|
|
d00686d6e8
|
交易分账 重构
|
2023-08-28 19:53:43 +08:00 |
|
|
|
d31531b09b
|
交易分账 重构
|
2023-08-28 17:31:43 +08:00 |
|
|
|
c0a1b10b2e
|
交易分账 重构
|
2023-08-28 17:30:13 +08:00 |
|
|
|
d1b0d40e24
|
交易分账 重构
|
2023-08-28 17:27:57 +08:00 |
|
|
|
e4d3d481da
|
交易分账 重构
|
2023-08-28 15:30:24 +08:00 |
|
|
|
b89e3dca20
|
交易分账 重构
|
2023-08-28 15:10:38 +08:00 |
|
|
|
517b88f6a2
|
交易分账 重构
|
2023-08-28 15:05:24 +08:00 |
|
|
|
7a9361af9d
|
交易分账 重构
|
2023-08-28 14:53:02 +08:00 |
|
|
|
01025fb40b
|
更新会员交易记录的冻结金额
|
2023-08-28 11:17:06 +08:00 |
|
|
|
2b6ded7b75
|
update
|
2023-08-23 16:46:07 +08:00 |
|
|
|
c5a8b808c6
|
update
|
2023-08-23 16:26:02 +08:00 |
|
|
|
4339a9be9a
|
余额退款逻辑优化
|
2023-08-23 11:50:29 +08:00 |
|
|
|
1790bd9b37
|
订单详情页update
|
2023-08-22 15:57:39 +08:00 |
|
|
|
36fe313a82
|
查询站点订单日报详情
|
2023-08-22 09:42:30 +08:00 |
|
|
|
61359ed9b7
|
update 加运营商id字段
|
2023-08-18 15:11:53 +08:00 |
|
|
|
4af9c7a184
|
支付占桩订单
|
2023-08-18 09:52:12 +08:00 |
|
|
|
4766740427
|
订单详情页新增退款信息
|
2023-08-17 16:10:31 +08:00 |
|
|
|
077090f77c
|
update 退余额
|
2023-08-17 12:44:36 +08:00 |
|
|
|
0845883051
|
update 支付撤销失败回调日志
|
2023-08-17 12:16:15 +08:00 |
|
|
|
28e2e4608e
|
update 创建撤销请求，放入扩展字段
|
2023-08-17 12:13:46 +08:00 |
|
|
|
ae5f0d8faf
|
update 支付时获取对应的支付配置
|
2023-08-17 11:55:14 +08:00 |
|
|
|
fd5420dc78
|
update 记录scenarioType
|
2023-08-14 13:57:58 +08:00 |
|
|
|
df776b0466
|
加剩余金额字段
|
2023-08-10 15:13:19 +08:00 |
|
|
|
aa11800f59
|
支付订单也加入memberId数据；汇付支付成功回调保存member_adapay_record
|
2023-08-10 14:41:23 +08:00 |
|
|
|
eefb3a836d
|
update
|
2023-08-10 10:28:00 +08:00 |
|
|
|
bef65b361c
|
update
|
2023-08-10 10:22:06 +08:00 |
|
|
|
2634b8b3c7
|
update 提现记录表
|
2023-08-08 14:36:49 +08:00 |
|
|
|
c0edb0aee9
|
update 提现记录表
|
2023-08-08 14:35:18 +08:00 |
|
|
|
7ca9ecd514
|
update 取现失败支付回调
|
2023-08-08 14:24:04 +08:00 |
|
|
|
ce92d1ccdf
|
update 取现成功支付回调
|
2023-08-08 14:16:05 +08:00 |
|
|
|
bf1fa80497
|
update 默认分隔符
|
2023-08-04 13:55:36 +08:00 |
|
