Commit Graph

4288 Commits

Author SHA1 Message Date
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
Guoqs
c9bfa8ace8 手动释放对象 2024-12-28 13:44:57 +08:00
Guoqs
458c216a6d 手动释放对象 2024-12-28 11:36:35 +08:00
Guoqs
2ff36a6ed7 手动释放对象 2024-12-28 11:35:14 +08:00
Guoqs
05a3e20cd2 update 添加判空逻辑 2024-12-28 09:46:02 +08:00
Guoqs
466462c7d3 判断该订单是否需要下发优惠券 2024-12-27 14:34:31 +08:00
Lemon
e21ad42118 update 广西平台Service 2024-12-27 14:03:48 +08:00
Lemon
17693372e8 新增 广西平台枚举 2024-12-27 08:31:08 +08:00
Guoqs
d0be55940b update 加注释 and 特定站点id走新的分账逻辑 2024-12-26 16:29:00 +08:00
Guoqs
9b1c2df87a update 添加新的分账方法返回值 2024-12-26 16:18:55 +08:00
Guoqs
b89c839c51 update 添加新的分账方法返回值 2024-12-26 16:14:06 +08:00
Guoqs
7ed2c66592 update 2024-12-26 15:43:58 +08:00
Lemon
bdc6fd4693 新增 广西平台controller 2024-12-26 13:18:59 +08:00
Guoqs
0cc0e17b8a Merge branch 'dev-new' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev-new 2024-12-26 10:04:45 +08:00
Guoqs
df90509fc6 update 2024-12-26 10:04:39 +08:00
Lemon
302d359783 新增 广西平台Service相关方法 2024-12-25 14:40:57 +08:00
Lemon
330d4b3a99 update 心跳包不再打印日志 2024-12-24 10:32:09 +08:00
Lemon
1e8daa2373 Merge branch 'dev-new' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev-new 2024-12-20 15:51:26 +08:00
Lemon
87eb7a3977 新增 区划代码信息实体类、Service 2024-12-20 15:50:57 +08:00
BOOL\25024
fe35055fd5 运营商vip开卡 选择运营商添加搜索 2024-12-20 15:10:53 +08:00
Lemon
bd59654994 update 订单记录停止原因码 2024-12-20 13:25:22 +08:00
Lemon
5869e8d5f3 update 贵州省平台Service 2024-12-20 09:11:48 +08:00
Guoqs
d96060da9a 校验分账金额测试方法 2024-12-19 16:47:40 +08:00
Guoqs
9b08105c5f 显示SOC 2024-12-19 16:40:09 +08:00
Guoqs
a64710dbeb 订单详情页显示设备型号名称 2024-12-19 16:29:50 +08:00
Guoqs
08b44e6da3 修改查询sql 过滤逻辑删除的数据 2024-12-19 16:19:37 +08:00
Guoqs
c2f5f15557 Merge branch 'dev-new' into dev-new-rabbitmq 2024-12-19 15:22:45 +08:00
Lemon
1eea5b1bdc update 贵州省平台 2024-12-19 13:52:41 +08:00
Guoqs
fdad5e218c Merge branch 'dev-new' into dev-new-rabbitmq
# Conflicts:
#	jsowell-admin/src/test/java/PaymentTestController.java
2024-12-19 13:30:11 +08:00
Guoqs
f0f0482ffd 分账方法 2024-12-18 15:13:32 +08:00
BOOL\25024
a0943c8b8f 注释分润配置页面 2024-12-18 14:26:46 +08:00
Guoqs
df455c25c0 分账方法 2024-12-18 14:05:18 +08:00