Lemon
|
625a577aeb
|
Merge branch 'dev-zza' into dev
# Conflicts:
# jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
|
2025-09-23 10:46:38 +08:00 |
|
Lemon
|
f099c480ed
|
bugfix 支付回调逻辑
|
2025-09-16 09:25:52 +08:00 |
|
YAS\29473
|
1d790d7761
|
第三方推送还原为原来的版本代码,测试改到dev-zzx1分支
|
2025-09-15 09:28:46 +08:00 |
|
YAS\29473
|
9156fe16dc
|
update
|
2025-09-12 14:48:38 +08:00 |
|
YAS\29473
|
e0ce612bf5
|
update 注释掉CommonService的使用,改为使用mq
|
2025-09-12 09:07:13 +08:00 |
|
Lemon
|
dc36a9b4e2
|
bugfix 初始化充电金额
|
2025-09-10 13:45:40 +08:00 |
|
Lemon
|
5da6c5c2bb
|
update
|
2025-09-05 15:07:20 +08:00 |
|
Lemon
|
66add9fecf
|
update 支付回调中判断订单是否购买保险,如果购买,将启动充电金额减去保险金额
|
2025-09-05 15:06:36 +08:00 |
|
Lemon
|
0dcfb04420
|
update 后管订单详情接口新增 车牌号码字段
|
2025-07-29 09:58:27 +08:00 |
|
Guoqs
|
7b71191daa
|
引入第三方平台任务线程池
|
2025-07-22 16:48:54 +08:00 |
|
Lemon
|
60cbbc5436
|
update 人工结算订单接口
|
2025-07-10 13:32:17 +08:00 |
|
Lemon
|
d080b70373
|
add 新增 查询充电优免订单接口
|
2025-06-11 08:52:30 +08:00 |
|
Guoqs
|
0e7e1d9373
|
充电桩启动失败, 发送停止充电指令
|
2025-04-01 11:58:33 +08:00 |
|
Guoqs
|
63f8a2f561
|
对公账户创建成功时, 清除运营商汇付会员缓存
|
2025-03-28 15:58:14 +08:00 |
|
Lemon
|
b1ba4d444f
|
update 蓝牙小程序订单将停止原因码存入数据库
|
2025-02-26 15:16:25 +08:00 |
|
Guoqs
|
5e3180b810
|
打印日志
|
2025-02-19 16:21:59 +08:00 |
|
Guoqs
|
9c9d4632e0
|
手动结算电单车订单逻辑update
|
2025-02-19 09:05:32 +08:00 |
|
Lemon
|
95fda5694c
|
后管接口、小程序接口新增停止原因代码字段
|
2024-12-05 16:57:47 +08:00 |
|
Guoqs
|
8bb6b3530b
|
展示订单消费金额
|
2024-11-29 10:52:44 +08:00 |
|
Guoqs
|
0171908069
|
保存蓝牙充电记录
(cherry picked from commit 8a163bb292)
|
2024-11-22 16:06:09 +08:00 |
|
Guoqs
|
164f9d2fa1
|
保存蓝牙充电记录
|
2024-11-22 11:06:07 +08:00 |
|
Guoqs
|
11056a6a7f
|
保存蓝牙充电记录
|
2024-11-22 10:57:30 +08:00 |
|
Guoqs
|
46696b6a09
|
保存蓝牙充电记录
|
2024-11-22 10:14:44 +08:00 |
|
Guoqs
|
54d9a4e91e
|
保存蓝牙充电记录
|
2024-11-19 16:20:10 +08:00 |
|
Lemon
|
101b167994
|
Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
|
2024-09-28 10:17:24 +08:00 |
|
Lemon
|
949eb10b60
|
update 苏州市平台
|
2024-09-28 10:17:14 +08:00 |
|
Guoqs
|
a5c1b45261
|
update 分成功能
|
2024-09-27 17:52:12 +08:00 |
|
Guoqs
|
e0f6b927ed
|
开启余额充电
|
2024-09-27 14:01:42 +08:00 |
|
Guoqs
|
76753037b7
|
开启余额充电
|
2024-09-27 09:50:49 +08:00 |
|
Guoqs
|
16630437fb
|
update 电单车
|
2024-09-23 11:41:19 +08:00 |
|
Guoqs
|
dbc037727e
|
update 电单车
|
2024-09-20 13:57:41 +08:00 |
|
Guoqs
|
9a2af549d8
|
update 电单车协议
|
2024-09-20 08:39:45 +08:00 |
|
Guoqs
|
0ca737e195
|
update 后管操作停止充电接口
|
2024-09-18 17:08:49 +08:00 |
|
Guoqs
|
b0da86ca70
|
update 电单车协议
|
2024-09-18 17:05:49 +08:00 |
|
Guoqs
|
1b97605bb4
|
payMode赠金支付
|
2024-09-12 13:24:04 +08:00 |
|
Guoqs
|
5e9beaf83a
|
使用自定义线程池
|
2024-09-10 12:03:53 +08:00 |
|
Guoqs
|
274b2695b4
|
支付时间
|
2024-09-09 15:19:43 +08:00 |
|
Guoqs
|
c0e26358a4
|
汇付回调添加事务控制
|
2024-09-03 17:03:52 +08:00 |
|
Guoqs
|
f7f1d76083
|
支付回调
|
2024-09-03 14:23:00 +08:00 |
|
Lemon
|
eb3283722c
|
后管订单详情页面新增vin码字段
|
2024-08-28 09:47:24 +08:00 |
|
Guoqs
|
b031ea4583
|
移除微信支付相关
|
2024-08-13 14:05:48 +08:00 |
|
Guoqs
|
155e67ef85
|
update 订单详情接口
|
2024-08-06 17:04:28 +08:00 |
|
Guoqs
|
c87e612ab5
|
update 汇付协议
|
2024-08-06 15:46:43 +08:00 |
|
Guoqs
|
f5d5e3c6eb
|
update 汇付协议
|
2024-08-06 14:39:09 +08:00 |
|
Guoqs
|
7d77bdbc4f
|
异步执行 redis数据存到表中
|
2024-07-31 09:56:04 +08:00 |
|
Guoqs
|
8503a29edd
|
update 打印日志
|
2024-07-26 15:39:21 +08:00 |
|
Guoqs
|
5a58d6e22c
|
update
|
2024-07-24 13:57:13 +08:00 |
|
Guoqs
|
67f973ac9b
|
订单充电中, 异步发送获取实时数据指令
|
2024-07-24 13:55:55 +08:00 |
|
Guoqs
|
0f81da5bd3
|
update
|
2024-07-23 15:16:12 +08:00 |
|
Lemon
|
2a3886486e
|
update 调整代码结构
|
2024-07-16 14:07:06 +08:00 |
|