autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,591 Commits 5 Branches 0 Tags
fd4287bdf2bbf850b08d9fdd4939c80f1ab4fc40
Commit Graph

4591 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guoqs
fd4287bdf2 Merge branch 'dev' into dev-g 2025-04-16 13:12:23 +08:00
Guoqs
a2348afae6 update 2025-04-16 13:12:03 +08:00
Guoqs
21772ca796 update 2025-04-16 11:57:59 +08:00
Guoqs
6e8cd51cb4 update 2025-04-16 11:49:26 +08:00
Lemon
9d2e018d99 bugfix 电池算法应用平台Service 2025-04-16 10:56:26 +08:00
Lemon
95de34a976 bugfix 电池算法应用平台Service 2025-04-16 10:35:45 +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
Guoqs
a0209c71d7 排除adapayMemberAccounts中amount为0的元素 2025-04-16 09:03:43 +08:00
Guoqs
f540468f33 批量分账 2025-04-15 17:04:17 +08:00
Guoqs
14fe3961a1 update 2025-04-15 11:48:03 +08:00
Lemon
eab7ab2cfa update 2025-04-15 11:21:53 +08:00
Lemon
ad5089e74b update 2025-04-15 10:55:50 +08:00
Lemon
4a4b1e9672 update 2025-04-15 10:46:39 +08:00
Lemon
f9334d0be4 新增 推送订单电池充电报告方法至0x3b中 2025-04-15 10:31:01 +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
Guoqs
e9eb50a0c2 新增通用验证码 2025-04-14 15:11:20 +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
d2c8b560af update 河南省平台站点建设场所信息做对应 2025-04-14 09:21:51 +08:00
Lemon
12ec92c872 Merge branch 'dev-zza' into dev 2025-04-12 16:09:37 +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
Guoqs
ed604022a1 如果总耗电量大于0, 并且各个时段耗电量总和为0, 则优惠后金额等于优惠前金额 2025-04-11 16:54:47 +08:00
Lemon
4fe641de1b bugfix 2025-04-11 16:50:23 +08:00
Lemon
729d30e8ea update 2025-04-11 16:32:28 +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
4156df68c0 update 2025-04-11 15:49:34 +08:00
Lemon
4e872123a1 Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev 2025-04-11 15:30:22 +08:00
Lemon
c997ca502c update 后管查询订单分账详情页面新增字段 2025-04-11 15:29:52 +08:00
Guoqs
62c9bfc3ba 重试分账接口 2025-04-11 15:28:38 +08:00
Lemon
cc8c4f6255 update 2025-04-11 15:01:43 +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
9be4a65e03 判断耗电量大于0 2025-04-11 11:28:15 +08:00
Guoqs
05d35978cc 折扣后电费不能大于原始电费金额, 折扣后服务费不能大于原始服务费金额 2025-04-11 11:17:09 +08:00
Guoqs
a84d5dcd9a 折扣后电费不能大于原始电费金额, 折扣后服务费不能大于原始服务费金额 2025-04-11 10:31:17 +08:00
Guoqs
8b917f0285 电费折扣金额和服务费折扣金额 应该大于等于0, 如小于0, 则设置为0 2025-04-11 10:14:39 +08:00