|
|
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 |
|
|
|
02929edd8b
|
update 计算解冻金额逻辑
|
2023-08-31 18:35:16 +08:00 |
|
|
|
1edcf36fa5
|
update 批量订单退款接口
|
2023-08-31 17:31:47 +08:00 |
|
|
|
fa5ecb02dd
|
update 批量订单退款接口
|
2023-08-31 17:31:19 +08:00 |
|
|
|
2fd204a6be
|
打印日志
|
2023-08-31 16:27:40 +08:00 |
|
|
|
f8e2ee3c65
|
update
|
2023-08-31 15:16:45 +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 |
|
|
|
cea0fb2821
|
update 打印日志
|
2023-08-31 09:15:20 +08:00 |
|
|
|
6dabf90018
|
update手动执行退款接口
|
2023-08-30 16:00:24 +08:00 |
|
|
|
7726384036
|
手动执行退款接口
|
2023-08-30 14:18:34 +08:00 |
|
|
|
a9c50fb19c
|
update 交易确认接口
|
2023-08-30 11:40:31 +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 |
|
Lemon
|
39087d9b10
|
单元测试 在线支付订单、退款
|
2023-08-30 11:02:18 +08:00 |
|
Lemon
|
cdf00d4c67
|
新增 订单流程测试方法
|
2023-08-30 10:13:56 +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 |
|
|
|
1a40e284b7
|
交易分账 重构
|
2023-08-29 14:54:41 +08:00 |
|
|
|
d00686d6e8
|
交易分账 重构
|
2023-08-28 19:53:43 +08:00 |
|
|
|
2551a9844b
|
update 操作member_adapay_record
|
2023-08-28 19:01:25 +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 |
|
|
|
2f1900e65b
|
交易分账 重构
|
2023-08-28 16:49:48 +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 |
|
Lemon
|
282194b761
|
新增 后管查询运营商订单报表V2 接口
|
2023-08-28 14:58:34 +08:00 |
|
|
|
7a9361af9d
|
交易分账 重构
|
2023-08-28 14:53:02 +08:00 |
|
|
|
994370f323
|
交易分账 重构
|
2023-08-28 14:39:16 +08:00 |
|
|
|
01025fb40b
|
更新会员交易记录的冻结金额
|
2023-08-28 11:17:06 +08:00 |
|
|
|
2dc33f0870
|
update TempController
|
2023-08-26 19:31:36 +08:00 |
|
|
|
7529dd80b2
|
update
|
2023-08-26 18:19:23 +08:00 |
|
|
|
ef8cd011e4
|
update
|
2023-08-26 18:01:25 +08:00 |
|
|
|
85ae33240f
|
update
|
2023-08-26 16:42:10 +08:00 |
|
Lemon
|
8b6b3b7d65
|
update 生成桩号缓存
|
2023-08-26 15:47:10 +08:00 |
|
|
|
0f6b0958e4
|
update 更新支付的消费退款
|
2023-08-26 15:46:12 +08:00 |
|
|
|
8a2326f300
|
订单分账逻辑
|
2023-08-26 14:09:04 +08:00 |
|
|
|
4997669ca7
|
Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
|
2023-08-26 09:48:06 +08:00 |
|