Commit Graph

1642 Commits

Author SHA1 Message Date
Lemon
0c76d906b3 update 后管页面新增独立报桩字段 2025-04-28 16:38:35 +08:00
Lemon
297c251274 新增 根据分账id撤销已分帐订单 2025-04-28 09:41:47 +08:00
Guoqs
50a5f46671 查询正在使用中的计费模板方法, 添加过滤条件, 状态为1启用状态 2025-04-25 17:44:02 +08:00
Lemon
f8743bb430 update 内蒙古平台添加、修改字段 2025-04-25 10:19:32 +08:00
Lemon
76e9e19d3e add 新增 根据订单号查询订单分账信息接口 2025-04-23 14:57:01 +08:00
Guoqs
2d3a2b265a PRE环境, 修改逻辑 2025-04-23 11:43:57 +08:00
Guoqs
2b6fd1ac36 退款时, 已退款金额判断移动到具体方法中 2025-04-23 10:18:26 +08:00
Guoqs
6203e957a9 PRE环境不执行 2025-04-23 09:36:35 +08:00
Guoqs
df03c5e584 重试分账接口 2025-04-22 17:01:00 +08:00
Guoqs
b0de317525 打印日志 2025-04-22 14:50:32 +08:00
Guoqs
3cb2d4376a update 添加会员接口 2025-04-22 14:31:52 +08:00
Guoqs
66a5790d1e update 添加会员接口 2025-04-22 14:11:05 +08:00
Guoqs
4b7279ef26 PRE环境不执行 2025-04-22 08:49:23 +08:00
Guoqs
9da6aa1aad Merge branch 'dev' into dev-g 2025-04-21 16:38:51 +08:00
Lemon
6e8ccb131d update 电池算法应用Service 2025-04-21 10:07:42 +08:00
Guoqs
b7f04d2159 定时任务处理未分帐订单 2025-04-16 15:50:26 +08:00
Guoqs
42f828a812 获取订单待分账信息 2025-04-16 14:39:55 +08:00
Guoqs
f629b083d1 获取订单待分账信息 2025-04-16 14:15:38 +08:00
Guoqs
c2821c11d9 校验分账金额方法 2025-04-16 14:10:36 +08:00
Guoqs
a2348afae6 update 2025-04-16 13:12:03 +08:00
Guoqs
6e8cd51cb4 update 2025-04-16 11:49:26 +08:00
Lemon
1b2d17fae8 update 电池算法应用Service 2025-04-16 10:17:48 +08:00
Lemon
91c08e4b0a update 2025-04-16 09:16:18 +08:00
Lemon
9c3eac914c update 2025-04-15 10:17:43 +08:00
Lemon
2ec926c0e7 Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
#	jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java
#	jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml
2025-04-15 10:01:48 +08:00
Lemon
dfb46e0fe0 新增 后管根据汇付会员id查询分账汇总数据 接口 2025-04-15 09:53:36 +08:00
YAS\29473
4ea7ae3549 Merge remote-tracking branch 'origin/dev' into dev-zzx 2025-04-14 17:02:17 +08:00
YAS\29473
247185202e 新增 根据汇付会员id查询分账汇总数据接口 2025-04-14 17:02:09 +08:00
Lemon
cba009bcf2 bugfix 查询分账列表如果没订单会报错 2025-04-14 14:01:59 +08:00
YAS\29473
bc7fa82f71 update 2025-04-14 12:14:15 +08:00
YAS\29473
2a02aeabb0 update 2025-04-14 11:01:09 +08:00
Lemon
e7cba4eefd update 2025-04-12 16:07:50 +08:00
Lemon
0ec76dd08b update 订单分账记录 将当前登录用户的分账信息置顶 2025-04-12 16:04:19 +08:00
Lemon
ef596a6fc7 新增 充电订单电池算法报告实体类、Service 2025-04-12 15:39:23 +08:00
Lemon
4fe641de1b bugfix 2025-04-11 16:50:23 +08:00
Lemon
dc3efa717d update 添加分页参数 2025-04-11 16:22:53 +08:00
Guoqs
162911acd9 UPDATE 修改用户余额方法 2025-04-11 16:08:20 +08:00
Lemon
c9b8938cbb update 添加分页参数 2025-04-11 15:56:43 +08:00
Lemon
c997ca502c update 后管查询订单分账详情页面新增字段 2025-04-11 15:29:52 +08:00
Lemon
a3d285784c Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev 2025-04-11 15:00:19 +08:00
Lemon
beced664ec 新增 后管查询订单分账数据接口 2025-04-11 14:59:46 +08:00
Guoqs
686ab4ec7b 折扣金额为空时默认0 2025-04-11 14:52:55 +08:00
Guoqs
aef1dcade4 重试分账接口 2025-04-11 14:39:00 +08:00
Lemon
3f26010b7d Merge branch 'dev-zza' into dev 2025-04-11 13:57:55 +08:00
Lemon
7a0ec7e4e3 update 2025-04-11 13:57:22 +08:00
Guoqs
5700485306 修改用户余额, 余额为空直接返回 2025-04-10 16:06:17 +08:00
Guoqs
ee8d677d04 修改用户余额, 余额为空直接返回 2025-04-10 16:03:03 +08:00
YAS\29473
90177f55a6 根据汇付会员id查询配置分账的站点列表 2025-04-09 19:53:33 +08:00
YAS\29473
5bc268c922 增加字段 2025-04-08 08:51:20 +08:00
Lemon
9c278b05d1 update 查询用户常去站点方法 2025-04-07 15:01:16 +08:00