|
|
c3c072d2a7
|
update 地锁逻辑修改
|
2023-09-09 15:05:37 +08:00 |
|
|
|
7ec68cdb26
|
Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
|
2023-09-08 16:00:25 +08:00 |
|
Lemon
|
632a8dfcdb
|
Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
|
2023-09-08 15:51:23 +08:00 |
|
Lemon
|
a89d7e7ec0
|
update 使占桩订单免费/修改订单金额
|
2023-09-08 15:51:16 +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 |
|
Lemon
|
557fa69811
|
新增占桩订单后管页面
|
2023-09-08 09:30:43 +08:00 |
|
Lemon
|
72699df4dc
|
update 新增日志
|
2023-09-07 14:01:10 +08:00 |
|
|
|
262cf27d8f
|
update
|
2023-09-06 14:30:06 +08:00 |
|
|
|
8befe2d745
|
update
|
2023-09-05 16:42:33 +08:00 |
|
Lemon
|
f1947e859f
|
update 新增中电联相关实体
|
2023-09-05 15:53:16 +08:00 |
|
|
|
37bc31a6f6
|
update
(cherry picked from commit de3fe081f8)
|
2023-09-05 15:50:25 +08:00 |
|
|
|
de3fe081f8
|
update
|
2023-09-05 15:44:25 +08:00 |
|
|
|
9a47834e7f
|
update
|
2023-09-05 08:42:05 +08:00 |
|
|
|
64b2122d1a
|
update订单逻辑改造工厂模式
|
2023-09-04 16:25:59 +08:00 |
|
|
|
f6621a9a22
|
update订单逻辑改造工厂模式
|
2023-09-04 15:37:43 +08:00 |
|
|
|
b82ae004bb
|
update订单逻辑改造工厂模式
|
2023-09-04 11:43:22 +08:00 |
|
|
|
24b6e757d1
|
update 修改测试数据库地址
|
2023-09-02 16:38:02 +08:00 |
|
|
|
0677ba321b
|
update 修改测试数据库地址
|
2023-09-02 16:26:32 +08:00 |
|
|
|
1a490c3b75
|
update 修改测试数据库地址
|
2023-09-02 15:55:56 +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 |
|
|
|
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 |
|
