Guoqs
|
d5c815b1c5
|
Merge branch 'dev-new-rabbitmq' into dev
|
2025-01-03 11:44:14 +08:00 |
|
Guoqs
|
1e04a56448
|
Merge branch 'dev-new' into dev-new-rabbitmq
|
2025-01-03 11:43:14 +08:00 |
|
BOOL\25024
|
7f85ce4a79
|
update 新增的时候判断当前是否已经添加过此分润人
|
2025-01-03 11:25:06 +08:00 |
|
Guoqs
|
f9799bc884
|
Merge branch 'dev-new' into dev
|
2025-01-03 11:14:24 +08:00 |
|
BOOL\25024
|
ef0d47e542
|
分润配置
|
2025-01-03 10:37:16 +08:00 |
|
Guoqs
|
2d13282391
|
Merge branch 'dev-new' into dev-new-rabbitmq
|
2025-01-03 09:45:08 +08:00 |
|
BOOL\25024
|
deb3a05f6d
|
删除废弃代码
|
2025-01-02 17:04:49 +08:00 |
|
BOOL\25024
|
194b2723bc
|
分润配置
|
2025-01-02 17:04:02 +08:00 |
|
Guoqs
|
97f33a3c84
|
Merge branch 'dev-new' into dev-new-rabbitmq
# Conflicts:
# jsowell-admin/src/test/java/SpringBootTestController.java
|
2025-01-02 16:59:01 +08:00 |
|
Guoqs
|
bd98e8e197
|
update 测试方法
|
2025-01-02 16:57:47 +08:00 |
|
Guoqs
|
98cb3b2e23
|
update 分润配置
|
2025-01-02 16:51:34 +08:00 |
|
Guoqs
|
f4157ba3e3
|
Merge branch 'dev-new' into dev-new-rabbitmq
|
2025-01-02 14:56:12 +08:00 |
|
Guoqs
|
236afdda33
|
update 分润配置页面
|
2025-01-02 14:54:57 +08:00 |
|
Guoqs
|
a93e987fd4
|
Merge branch 'dev-new' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev-new
|
2025-01-02 14:22:42 +08:00 |
|
Guoqs
|
74885955c4
|
update 分润配置页面
|
2025-01-02 14:22:10 +08:00 |
|
Lemon
|
4ca5af7f17
|
Merge branch 'dev-new' into dev-new-rabbitmq
|
2025-01-02 14:09:27 +08:00 |
|
Lemon
|
7842eea074
|
Merge branch 'dev-new' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev-new
|
2025-01-02 14:07:56 +08:00 |
|
Lemon
|
a97b65b66c
|
update 广西平台Service
|
2025-01-02 14:07:24 +08:00 |
|
Guoqs
|
65fcdb2041
|
update 放出分润配置页面
|
2025-01-02 14:05:12 +08:00 |
|
Guoqs
|
c053410b44
|
Merge branch 'dev-new' into dev-new-rabbitmq
|
2025-01-02 13:49:14 +08:00 |
|
Lemon
|
2bb574ebec
|
update 请求令牌方法
|
2025-01-02 13:48:36 +08:00 |
|
Guoqs
|
d260ee8351
|
Merge branch 'dev-new' into dev-new-rabbitmq
|
2025-01-02 10:13:31 +08:00 |
|
Guoqs
|
913d2f5409
|
update
|
2025-01-02 10:11:56 +08:00 |
|
Guoqs
|
aa428f6aed
|
Merge branch 'dev-new' into dev-new-rabbitmq
|
2025-01-02 09:34:51 +08:00 |
|
Lemon
|
24528b8699
|
update 第三方平台获取token接口将token存入缓存
|
2025-01-02 09:33:33 +08:00 |
|
Lemon
|
05212f6ad9
|
update 第三方平台获取token接口将token存入缓存
|
2025-01-02 09:11:01 +08:00 |
|
Guoqs
|
ab7e573bee
|
update 新分账方法
|
2024-12-31 16:38:08 +08:00 |
|
Guoqs
|
b0bbba3085
|
update 新分账方法
|
2024-12-31 16:27:25 +08:00 |
|
Guoqs
|
1784e0f314
|
update 新分账方法
|
2024-12-31 16:17:37 +08:00 |
|
Guoqs
|
3b8224abb0
|
Merge branch 'dev-new' into dev-new-rabbitmq
|
2024-12-31 11:39:26 +08:00 |
|
Guoqs
|
a5a14c9e99
|
远程停止充电 校验交易流水号
|
2024-12-31 10:30:07 +08:00 |
|
Guoqs
|
ba6a82fd2a
|
临时接口, 关闭未支付订单
|
2024-12-31 09:47:45 +08:00 |
|
Guoqs
|
a9cea45710
|
添加方法 根据时间范围查询 未支付订单
|
2024-12-31 08:59:34 +08:00 |
|
Guoqs
|
ee62fe754e
|
添加方法 根据时间范围查询 未支付订单
|
2024-12-30 17:03:03 +08:00 |
|
Guoqs
|
8e58808c68
|
添加方法 根据时间范围查询 未支付订单
|
2024-12-30 17:00:59 +08:00 |
|
Guoqs
|
d4af121ee0
|
update 打印日志
|
2024-12-30 16:48:21 +08:00 |
|
Guoqs
|
b0e6cd6219
|
不在新分账逻辑站点列表中的, 可以走退款逻辑
|
2024-12-30 14:46:49 +08:00 |
|
Guoqs
|
1f9554b814
|
订单实时监测记录, 电流为0的不保存到数据库中
|
2024-12-30 14:37:03 +08:00 |
|
Guoqs
|
3e3ebe3dad
|
update
|
2024-12-30 14:33:27 +08:00 |
|
Guoqs
|
729c47cc0c
|
Merge branch 'dev-new' into dev-new-rabbitmq
# Conflicts:
# jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
|
2024-12-30 13:58:40 +08:00 |
|
Lemon
|
eff073a4ce
|
update 广西平台Service
|
2024-12-30 11:47:32 +08:00 |
|
Guoqs
|
e8e85af444
|
希晓余额支付bug修复
|
2024-12-30 11:41:03 +08:00 |
|
Guoqs
|
25d0daa116
|
Merge branch 'dev-new' into dev-new-rabbitmq
|
2024-12-30 10:12:15 +08:00 |
|
Guoqs
|
a0d8122ef2
|
update 友电netty不用主动释放内存
|
2024-12-30 09:16:05 +08:00 |
|
Guoqs
|
981b6f8872
|
友电netty不用主动释放内存
|
2024-12-29 17:24:19 +08:00 |
|
Guoqs
|
a4d553c6ef
|
Revert "手动释放对象"
This reverts commit 458c216a6d.
|
2024-12-29 12:54:05 +08:00 |
|
Guoqs
|
874388b405
|
update
|
2024-12-29 12:53:44 +08:00 |
|
Guoqs
|
1780865f9f
|
update 电单车netty使用内存池
|
2024-12-29 11:24:50 +08:00 |
|
Guoqs
|
4e85f4cc05
|
update
|
2024-12-29 11:18:42 +08:00 |
|
Guoqs
|
665efe290b
|
Merge branch 'dev-new' into dev-new-rabbitmq
# Conflicts:
# jsowell-admin/src/test/java/SpringBootTestController.java
# jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
# jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
|
2024-12-28 15:15:15 +08:00 |
|