|
|
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 |
|
|
|
7babd6b9ef
|
update 订单分账逻辑
|
2023-08-26 09:48:00 +08:00 |
|
Lemon
|
871dbe4882
|
update 新增桩时判断编号
|
2023-08-26 09:46:46 +08:00 |
|
|
|
cb3cd4f5c6
|
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/impl/OrderBasicInfoServiceImpl.java
|
2023-08-25 17:23:35 +08:00 |
|
Lemon
|
543a23e597
|
update
|
2023-08-25 17:13:34 +08:00 |
|
|
|
033ddb40e7
|
update 实时分账
|
2023-08-25 16:07:15 +08:00 |
|
Lemon
|
c08c4f4a95
|
后管页面新增 停车平台配置
|
2023-08-25 15:50:23 +08:00 |
|
Lemon
|
9c3c80ca3f
|
新增 绑定停车平台接口
|
2023-08-25 14:23:35 +08:00 |
|
Lemon
|
454022c553
|
update 会员区分运营商
|
2023-08-25 13:17:30 +08:00 |
|
Lemon
|
914380b3ea
|
新增 后管开票页面新增运营商字段并校验
|
2023-08-25 10:45:39 +08:00 |
|
|
|
9b9fbf4de1
|
余额支付订单分账工具
|
2023-08-25 09:52:03 +08:00 |
|
|
|
867c8240c5
|
余额支付订单分账工具
|
2023-08-24 17:23:33 +08:00 |
|
Lemon
|
3ced5a36b8
|
update 订单列表添加车牌号字段
|
2023-08-24 16:06:10 +08:00 |
|
|
|
7a16e474c8
|
update 查询用户是否有未支付的占桩订单
|
2023-08-24 10:46:24 +08:00 |
|
Lemon
|
318f46123e
|
新增 路通云停平台 给车辆绑定优惠券接口
|
2023-08-24 10:33:26 +08:00 |
|
|
|
2b6ded7b75
|
update
|
2023-08-23 16:46:07 +08:00 |
|
|
|
c5a8b808c6
|
update
|
2023-08-23 16:26:02 +08:00 |
|
Lemon
|
930486c5ff
|
update
|
2023-08-23 15:36:14 +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 |
|
